add new "Acquire::cdrom::AutoDetect" variable that enables/disables

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 0d8fdc29c67e6f78997ae04bf8b6dcd715b83894..87794b052a08b3da087ab053b424b63723c922e7 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.21 2004/01/07 20:39:38 mdz 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,13 +9,16 @@
                                                                        /*}}}*/
 // 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>
 
 #include <iostream>
 #include <apti18n.h>


@@ -26,15 +29,20 @@ using namespace std;
 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;
 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;

+   bool Debug;
+

    ::Configuration Database;
    string CurrentID;
    string CDROM;
    ::Configuration Database;
    string CurrentID;
    string CDROM;

-   bool Mounted;
-   
+   bool MountedByApt;
+   pkgUdevCdromDevices UdevCdroms;
+ 
+   bool IsCorrectCD(URI want, string MountPath, string& NewID);
+   bool AutoDetectAndMount(URI, string &NewID);

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

-   
+      

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


@@ -47,16 +55,17 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 
                                           DatabaseLoaded(false), 
                                          SendConfig | NeedsCleanup |
                                          Removable), 
                                           DatabaseLoaded(false), 

-                                          Mounted(false)
+                                          MountedByApt(false)

 {
 {

+   UdevCdroms.Dlopen();

 };
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()
 };
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()

-{
-   if (Mounted == true)
+{ 
+  if (MountedByApt == true)

       UnmountCdrom(CDROM);
 }
                                                                        /*}}}*/
       UnmountCdrom(CDROM);
 }
                                                                        /*}}}*/


@@ -80,16 +89,92 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
                                                                        /*}}}*/
    return string();
 }
                                                                        /*}}}*/

+// CDROMMethod::AutoDetectAndMount                                      /*{{{*/
+// ---------------------------------------------------------------------
+/* Modifies class varaiable CDROM to the mountpoint */
+bool CDROMMethod::AutoDetectAndMount(URI Get, string NewID)
+{
+   vector<struct CdromDevice> v = UdevCdroms.Scan();
+
+   // first check if its mounted somewhere already
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (v[i].Mounted)
+      {
+        if (Debug)
+           clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
+        if (IsCorrectCD(Get, v[i].MountPath, NewID))
+        {
+           CDROM = v[i].MountPath;
+           return true;
+        }
+      }
+   }
+
+   // we are not supposed to mount, exit
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return false;
+
+   // check if we have the mount point
+   if (!FileExists("/media/apt"))
+      mkdir("/media/apt", 0755);
+
+   // now try mounting
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (!v[i].Mounted)
+      {
+        if(MountCdrom("/media/apt", v[i].DeviceName)) 
+        {
+           if (IsCorrectCD(Get, "/media/apt", NewID))
+           {
+              MountedByApt = true;
+              CDROM = "/media/apt";
+              return true;
+           } else {
+              UnmountCdrom("/media/apt");
+           }
+        }
+      }
+   }
+
+   return false;
+}
+                                                                       /*}}}*/
+// CDROMMethod::IsCorrectCD                                             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID)
+{
+   for (unsigned int Version = 2; Version != 0; Version--)
+   {
+      if (IdentCdrom(MountPath,NewID,Version) == false)
+        return false;
+      
+      if (Debug)
+        clog << "ID " << Version << " " << NewID << endl;
+      
+      // A hit
+      if (Database.Find("CD::" + NewID) == want.Host)
+        return true;
+   }
+   
+   return false;
+}
+                                                                       /*}}}*/

 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CDROMMethod::Fetch(FetchItem *Itm)
 {
 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CDROMMethod::Fetch(FetchItem *Itm)
 {

+   FetchResult Res;
+

    URI Get = Itm->Uri;
    string File = Get.Path;
    URI Get = Itm->Uri;
    string File = Get.Path;

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

 
 

-   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   if (Debug)
+      clog << "CDROMMethod::Fetch " << Itm->Uri << endl;

 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */


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

-      Res.Filename = File;
+      Res.Filename = Itm->DestFile;

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


@@ -119,54 +204,49 @@ 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
       return true;
    }
 
    // We already have a CD inserted, but it is the wrong one

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

    {
    {

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

       return true;
    }
       return true;
    }

-   
+
+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);

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

+   if (Debug)
+      clog << "Looking for CDROM at " << CDROM << endl;
+

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

+

    string NewID;
    while (CurrentID.empty() == true)
    {
    string NewID;
    while (CurrentID.empty() == true)
    {

-      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 (AutoDetect)
+        AutoDetectAndMount(Get, NewID);

 
 

-      if (Hit == true)
+      if(!IsMounted(CDROM))
+        MountedByApt = MountCdrom(CDROM);
+      
+      if (IsCorrectCD(Get, CDROM, NewID))

         break;
         
       // I suppose this should prompt somehow?
         break;
         
       // I suppose this should prompt somehow?

-      if (UnmountCdrom(CDROM) == false)
+      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";
         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."));

       }
    }
    
       }
    }
    


@@ -180,6 +260,12 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
       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;
 }
    URIDone(Res);
    return true;
 }