merged previous bzr commit

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index e18aaff3e6ddd32ef9e7cb0b51efbbf2619ef211..4fc3d39285b727b58518d6a539a12e086d1ebe40 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,17 +1,18 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
-#include<apt-pkg/init.h>
 #include<string>
 #include<vector>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdrom.h"
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/init.h>
+using namespace std;
 #endif
 
-using namespace std;
+class Configuration;
+class OpProgress;
 
-class pkgCdromStatus
+class pkgCdromStatus                                                   /*{{{*/
 {
  protected:
    int totalSteps;
@@ -23,17 +24,17 @@ class pkgCdromStatus
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
    // update steps, will be called regularly as a "pulse"
-   virtual void Update(string text="", int current=0) = 0;
+   virtual void Update(std::string text="", int current=0) = 0;
    
    // ask for cdrom insert
    virtual bool ChangeCdrom() = 0;
    // ask for cdrom name
-   virtual bool AskCdromName(string &Name) = 0;
+   virtual bool AskCdromName(std::string &Name) = 0;
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
-
-class pkgCdrom 
+                                                                       /*}}}*/
+class pkgCdrom                                                         /*{{{*/
 {
  protected:
    enum {
@@ -50,25 +51,68 @@ class pkgCdrom
    };
 
 
-   bool FindPackages(string CD,
-                    vector<string> &List,
-                    vector<string> &SList, 
-                    vector<string> &SigList,
-                    vector<string> &TransList,
-                    string &InfoDir, pkgCdromStatus *log,
+   bool FindPackages(std::string CD,
+                    std::vector<std::string> &List,
+                    std::vector<std::string> &SList, 
+                    std::vector<std::string> &SigList,
+                    std::vector<std::string> &TransList,
+                    std::string &InfoDir, pkgCdromStatus *log,
                     unsigned int Depth = 0);
-   bool DropBinaryArch(vector<string> &List);
-   bool DropRepeats(vector<string> &List,const char *Name);
-   void ReduceSourcelist(string CD,vector<string> &List);
+   bool DropBinaryArch(std::vector<std::string> &List);
+   bool DropRepeats(std::vector<std::string> &List,const char *Name);
+   bool DropTranslation(std::vector<std::string> &List);
+   void ReduceSourcelist(std::string CD,std::vector<std::string> &List);
    bool WriteDatabase(Configuration &Cnf);
-   bool WriteSourceList(string Name,vector<string> &List,bool Source);
-   int Score(string Path);
+   bool WriteSourceList(std::string Name,std::vector<std::string> &List,bool Source);
+   int Score(std::string Path);
 
  public:
-   bool Ident(string &ident, pkgCdromStatus *log);
+   bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
+                                                                       /*}}}*/
 
 
+// class that uses libudev to find cdrom/removable devices dynamically
+struct CdromDevice                                                     /*{{{*/
+{
+   std::string DeviceName;
+   bool Mounted;
+   std::string MountPath;
+};
+                                                                       /*}}}*/
+class pkgUdevCdromDevices                                              /*{{{*/
+{
+ protected:
+   // libudev dlopen stucture
+   void *libudev_handle;
+   struct udev* (*udev_new)(void);
+   int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+   int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
+   struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
+   struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
+   struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enumerate);
+   const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_devnode)(struct udev_device *udev_device);
+   struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
+   struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
+   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+   // end libudev dlopen
+   
+ public:
+   pkgUdevCdromDevices();
+   virtual ~pkgUdevCdromDevices();
+
+   // try to open 
+   bool Dlopen();
+
+   // convenience interface, this will just call ScanForRemovable
+   // with "APT::cdrom::CdromOnly"
+   std::vector<CdromDevice> Scan();
+
+   std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+};
+                                                                       /*}}}*/
 
 #endif