* merged with ddtp

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index a4446576668b7d2de0280f45ce2b2b8c3af67c12..d6b8eae75c0dd4d6c810f0ab720b997c09dfdb76 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cdrom.cc,v 1.9 1999/05/23 05:45:13 jgg Exp $
+// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    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/hashes.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
+
+#include <iostream>
+#include <apti18n.h>
                                                                        /*}}}*/
 
+using namespace std;
+
 class CDROMMethod : public pkgAcqMethod
 {
-   Configuration Database;
    bool DatabaseLoaded;
+   ::Configuration Database;
    string CurrentID;
+   string CDROM;
+   bool Mounted;
    
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
+   virtual void Exit();
    
    public:
    
@@ -35,11 +44,23 @@ class CDROMMethod : public pkgAcqMethod
 // 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::Exit - Unmount the disc if necessary                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void CDROMMethod::Exit()
+{
+   if (Mounted == true)
+      UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/
 // CDROMMethod::GetID - Search the database for a matching string      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -68,13 +89,16 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    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;
+      Res.Filename = Itm->DestFile;
       URIDone(Res);
       return true;
    }
@@ -87,7 +111,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       if (FileExists(DFile) == true)
       {
         if (ReadConfigFile(Database,DFile) == false)
-           return _error->Error("Unable to read the cdrom database %s",
+           return _error->Error(_("Unable to read the cdrom database %s"),
                          DFile.c_str());
       }
       DatabaseLoaded = true;
@@ -96,55 +120,72 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    // All non IMS queries for package files fail.
    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
    if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
    {
-      Fail("Wrong CD",true);
+      Fail(_("Wrong CD-ROM"),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;
-   while (1)
+   while (CurrentID.empty() == true)
    {
-      if (IdentCdrom(CDROM,NewID) == false)
-        return false;
-   
-      // A hit
-      if (Database.Find("CD::" + NewID) == Get.Host)
-        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;
+      
+        // 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.",
+        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";
-        Fail("Wrong CD",true);
-        return true;
+        return _error->Error(_("Disk not found."));
       }
-      
-      MountCdrom(CDROM);
    }
    
    // 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(_("File not found"));
    
-   CurrentID = NewID;
+   if (NewID.empty() == false)
+      CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
-   Res.IMSHit = true;
    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;
 }
@@ -152,6 +193,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    CDROMMethod Mth;
    return Mth.Run();
 }