* merged with mainline

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 3049e5ba8a6010a1b97a4c0fd4d3107faa680483..d6b8eae75c0dd4d6c810f0ab720b997c09dfdb76 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.7 1998/12/22 08:20:55 jgg Exp $
+// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -13,19 +13,28 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/hashes.h>

 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <unistd.h>

+
+#include <iostream>
+#include <apti18n.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+

 class CDROMMethod : public pkgAcqMethod
 {
 class CDROMMethod : public pkgAcqMethod
 {

-   Configuration Database;

    bool DatabaseLoaded;
    bool DatabaseLoaded;

+   ::Configuration Database;

    string CurrentID;
    string CurrentID;

+   string CDROM;
+   bool Mounted;

    
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);

+   virtual void Exit();

    
    public:
    
    
    public:
    


@@ -35,45 +44,40 @@ class CDROMMethod : public pkgAcqMethod
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | 
-                                         SendConfig), DatabaseLoaded(false)
+CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+                                         SendConfig | NeedsCleanup |
+                                         Removable), 
+                                          DatabaseLoaded(false), 
+                                          Mounted(false)

 {
 };
                                                                        /*}}}*/
 {
 };
                                                                        /*}}}*/

-// CDROMMethod::GetID - Get the ID hash for                                                                    /*{{{*/
+// CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void CDROMMethod::Exit()
+{
+   if (Mounted == true)
+      UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/
+// CDROMMethod::GetID - Search the database for a matching string      /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* We search the configuration space for the name and then return the ID
-   tag associated with it. */
+/* */

 string CDROMMethod::GetID(string Name)
 {
 string CDROMMethod::GetID(string Name)
 {

-   if (DatabaseLoaded == false)
-   {
-      // Read the database
-      string DFile = _config->FindFile("Dir::State::cdroms");
-      if (FileExists(DFile) == true)
-      {
-        if (ReadConfigFile(Database,DFile) == false)
-        {
-           _error->Error("Unable to read the cdrom database %s",
-                         DFile.c_str());
-           return string();
-        }   
-      }
-      DatabaseLoaded = true;
-   }
-   
+   // Search for an ID

    const Configuration::Item *Top = Database.Tree("CD");
    if (Top != 0)
       Top = Top->Child;
    const Configuration::Item *Top = Database.Tree("CD");
    if (Top != 0)
       Top = Top->Child;

-
+   

    for (; Top != 0;)
    for (; Top != 0;)

-   {
+   {      

       if (Top->Value == Name)
         return Top->Tag;
       if (Top->Value == Name)
         return Top->Tag;

-
+      

       Top = Top->Next;
       Top = Top->Next;

-   }   
-   
+   }

    return string();
 }
                                                                        /*}}}*/
    return string();
 }
                                                                        /*}}}*/


@@ -85,82 +89,112 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;

-   
+
+   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+

    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
    if (Itm->LastModified != 0)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
    if (Itm->LastModified != 0)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;

+      Res.Filename = Itm->DestFile;

       URIDone(Res);
       return true;
    }
       URIDone(Res);
       return true;
    }

-   
-   string ID = GetID(Get.Host);
-   if (_error->PendingError() == true)
-      return false;
-   
+
+   // Load the database
+   if (DatabaseLoaded == false)
+   {
+      // Read the database
+      string DFile = _config->FindFile("Dir::State::cdroms");
+      if (FileExists(DFile) == true)
+      {
+        if (ReadConfigFile(Database,DFile) == false)
+           return _error->Error(_("Unable to read the cdrom database %s"),
+                         DFile.c_str());
+      }
+      DatabaseLoaded = true;
+   }
+       

    // All non IMS queries for package files fail.
    // All non IMS queries for package files fail.

-   if (Itm->IndexFile == true || ID.empty() == true)
+   if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)

    {
    {

-      Fail("Please use apt-cdrom to make this CD recognized by APT."
-          " apt-get update cannot be used to add new CDs");
+      Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT."
+          " apt-get update cannot be used to add new CD-ROMs"));

       return true;
    }
 
    // We already have a CD inserted, but it is the wrong one
       return true;
    }
 
    // We already have a CD inserted, but it is the wrong one

-   if (CurrentID.empty() == false && ID != CurrentID)
+   if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)

    {
    {

-      Fail("Wrong CD",true);
+      Fail(_("Wrong CD-ROM"),true);

       return true;
    }
    
       return true;
    }
    

-   string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");

    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    string NewID;
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    string NewID;

-   while (1)
+   while (CurrentID.empty() == true)

    {
    {

-      if (IdentCdrom(CDROM,NewID) == false)
-        return false;
-   
-      // A hit
-      if (NewID == ID)
-        break;
+      bool Hit = false;
+      Mounted = MountCdrom(CDROM);
+      for (unsigned int Version = 2; Version != 0; Version--)
+      {
+        if (IdentCdrom(CDROM,NewID,Version) == false)
+           return false;
+        
+        if (Debug == true)
+           clog << "ID " << Version << " " << NewID << endl;

       
       

-      UnmountCdrom(CDROM);
+        // A hit
+        if (Database.Find("CD::" + NewID) == Get.Host)
+        {
+           Hit = true;
+           break;
+        }       
+      }
+
+      if (Hit == true)
+        break;
+        
+      // I suppose this should prompt somehow?
+      if (UnmountCdrom(CDROM) == false)
+        return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."),
+                             CDROM.c_str());

       if (MediaFail(Get.Host,CDROM) == false)
       {
         CurrentID = "FAIL";
       if (MediaFail(Get.Host,CDROM) == false)
       {
         CurrentID = "FAIL";

-        Fail("Wrong CD",true);
-        return true;
+        return _error->Error(_("Disk not found."));

       }
       }

-      
-      MountCdrom(CDROM);

    }
    
    }
    

-   // ID matches
-   if (NewID == ID)
-   {
-      Res.Filename = CDROM + File;
-      struct stat Buf;
-      if (stat(Res.Filename.c_str(),&Buf) != 0)
-        return _error->Error("File not found");
-    
-      CurrentID = ID;
-      Res.LastModified = Buf.st_mtime;
-      Res.IMSHit = true;
-      Res.Size = Buf.st_size;
-      URIDone(Res);
-      return true;
-   }
+   // Found a CD
+   Res.Filename = CDROM + File;
+   struct stat Buf;
+   if (stat(Res.Filename.c_str(),&Buf) != 0)
+      return _error->Error(_("File not found"));

    
    

-   return _error->Error("CDROM not found");
+   if (NewID.empty() == false)
+      CurrentID = NewID;
+   Res.LastModified = Buf.st_mtime;
+   Res.Size = Buf.st_size;
+
+   Hashes Hash;
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
+   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Res.TakeHashes(Hash);
+
+   URIDone(Res);
+   return true;

 }
                                                                        /*}}}*/
 
 int main()
 {
 }
                                                                        /*}}}*/
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    CDROMMethod Mth;
    return Mth.Run();
 }
    CDROMMethod Mth;
    return Mth.Run();
 }