* methods/cdrom.cc:

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index c702e2dc5af565654117cd8a4fbdeadb4f3696f2..cd0d4e5120dd2d5b50d3fe05ecd6d39d7d9d0653 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.11 1999/06/09 23:06:39 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


@@ -9,24 +9,36 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/acquire-method.h>
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/acquire-method.h>

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

 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/cdromutl.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 <dlfcn.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 MountedByApt;
+ 
+   bool IsCorrectCD(URI want, string MountPath);

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

-   
+   virtual void Exit();
+      

    public:
    
    CDROMMethod();
    public:
    
    CDROMMethod();


@@ -35,11 +47,25 @@ 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), 
+                                          MountedByApt(false)

 {
 {

+
+

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

+// CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void CDROMMethod::Exit()
+{ 
+  if (MountedByApt == true)
+      UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/

 // CDROMMethod::GetID - Search the database for a matching string      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::GetID - Search the database for a matching string      /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -60,6 +86,31 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
                                                                        /*}}}*/
    return string();
 }
                                                                        /*}}}*/

+
+// CDROMMethod::IsCorrectCD                                             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+{
+   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   string NewID;
+
+   for (unsigned int Version = 2; Version != 0; Version--)
+   {
+      if (IdentCdrom(MountPath,NewID,Version) == false)
+        return false;
+      
+      if (Debug == true)
+        clog << "ID " << Version << " " << NewID << endl;
+      
+      // A hit
+      if (Database.Find("CD::" + NewID) == want.Host)
+        return true;
+   }
+   
+   return false;
+}
+                                                                       /*}}}*/

 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -77,6 +128,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;

+      Res.Filename = Itm->DestFile;

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


@@ -89,7 +141,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       if (FileExists(DFile) == true)
       {
         if (ReadConfigFile(Database,DFile) == false)
       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;
                          DFile.c_str());
       }
       DatabaseLoaded = true;


@@ -98,68 +150,95 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    // All non IMS queries for package files fail.
    if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
    {
    // 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)
    {
       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;
    }
       return true;
    }

-   
-   string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+
+   CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+
+   // auto-detect mode
+   if (CDROM == "apt-udev-auto/") 
+   {
+      pkgUdevCdromDevices udev;
+      if(udev.Dlopen())
+      {
+        vector<struct CdromDevice> v = udev.Scan();
+        for (unsigned int i=0; i < v.size(); i++)
+        {
+           if (!v[i].Mounted) 
+           {
+              if (!FileExists("/media/apt"))
+                 mkdir("/media/apt", 0755);
+              if(MountCdrom("/media/apt", v[i].DeviceName)) 
+              {
+                 if (IsCorrectCD(Get, "/media/apt"))
+                 {
+                    MountedByApt = true;
+                    CDROM = "/media/apt";
+                    break;
+                 } else {
+                    UnmountCdrom("/media/apt");
+                 }
+              }
+           } else {
+              if (IsCorrectCD(Get, v[i].MountPath))
+              {
+                 CDROM = v[i].MountPath;
+                 break;
+              }
+           }
+        }
+      }
+   }
+

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

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

    {
       bool Hit = false;
    {
       bool Hit = false;

-      for (unsigned int Version = 2; Version != 0; Version--)
-      {
-        if (IdentCdrom(CDROM,NewID,Version) == false)
-           return false;
-        
-        if (Debug == true)
-           clog << "ID " << Version << " " << NewID << endl;
+      if(!IsMounted(CDROM))
+        MountedByApt = MountCdrom(CDROM);

       
       

-        // A hit
-        if (Database.Find("CD::" + NewID) == Get.Host)
-        {
-           Hit = true;
-           break;
-        }       
-      }
-
-      if (Hit == true)
+      if (IsCorrectCD(Get, CDROM))

         break;
         
       // I suppose this should prompt somehow?
         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.",
+      if (_config->FindB("APT::CDROM::NoMount",false) == false &&
+         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";
                              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)
    }
    
    // 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.LastModified = Buf.st_mtime;

-   Res.IMSHit = true;

    Res.Size = Buf.st_size;
    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;
 }
    URIDone(Res);
    return true;
 }


@@ -167,6 +246,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

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