Allow building libzypp without HAL (limited device detection).

[platform/upstream/libzypp.git] / zypp / media / MediaCD.cc

diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc
index ff66702..53843d2 100644 (file)
--- a/zypp/media/MediaCD.cc
+++ b/zypp/media/MediaCD.cc
@@ -166,13 +166,13 @@ namespace zypp {
       cmd[1] = device_r.c_str();
       cmd[2] = NULL;
       ExternalProgram eject(cmd, ExternalProgram::Stderr_To_Stdout);
-      
+
       for(std::string out( eject.receiveLine());
           out.length(); out = eject.receiveLine())
       {
         DBG << " " << out;
       }
-      
+
       if(eject.close() != 0)
       {
         WAR << "Eject of " << device_r << " failed." << std::endl;
@@ -216,23 +216,24 @@ namespace zypp {
   //  METHOD TYPE : MediaCD::DeviceList
   //
   MediaCD::DeviceList
-  MediaCD::detectDevices(bool supportingDVD)
+  MediaCD::detectDevices(bool supportingDVD) const
   {
-    using namespace zypp::target::hal;
-
     DeviceList detected;
+
+#ifndef NO_HALa
+    using namespace zypp::target::hal;
     try
     {
       HalContext hal(true);
 
       std::vector<std::string> drv_udis;
       drv_udis = hal.findDevicesByCapability("storage.cdrom");
-      
+
       DBG << "Found " << drv_udis.size() << " cdrom drive udis" << std::endl;
       for(size_t d = 0; d < drv_udis.size(); d++)
       {
         HalDrive drv( hal.getDriveFromUDI( drv_udis[d]));
-      
+
         if( drv)
         {
           bool supportsDVD=false;
@@ -275,7 +276,25 @@ namespace zypp {
     {
       ZYPP_CAUGHT(e);
     }
-
+#else // NO_HAL
+#warning Poor CDROM devices detection without HAL
+    WAR << "Cdrom drive detection without HAL! " << std::endl;
+    PathInfo dvdinfo( "/dev/dvd" );
+    PathInfo cdrinfo( "/dev/cdrom" );
+    if ( dvdinfo.isBlk() )
+    {
+      MediaSource media( "cdrom", dvdinfo.path().asString(), dvdinfo.major(), dvdinfo.minor() );
+      DBG << "Found (NO_HAL): " << media << std::endl;
+      detected.push_back( media );
+    }
+    if ( cdrinfo.isBlk()
+         && ! ( cdrinfo.major() == dvdinfo.major() && cdrinfo.minor() == dvdinfo.minor() ) )
+    {
+      MediaSource media( "cdrom", cdrinfo.path().asString(), cdrinfo.major(), cdrinfo.minor() );
+      DBG << "Found (NO_HAL): " << media << std::endl;
+      detected.push_back( media );
+    }
+#endif
     return detected;
   }
 
@@ -544,10 +563,6 @@ namespace zypp {
     DBG << _lastdev << " " << count << endl;
   }
 
-  void MediaCD::releaseFrom( bool eject )
-  {
-    releaseFrom("");
-  }
 
   ///////////////////////////////////////////////////////////////////
   //
@@ -647,6 +662,8 @@ namespace zypp {
       DeviceList::iterator it;
       for( it = _devices.begin(); it != _devices.end(); ++it ) {
         MediaSourceRef media( new MediaSource( *it));
+        if (media->name != ejectDev)
+          continue;
 
         bool        valid=false;
         PathInfo    dinfo(media->name);
@@ -700,8 +717,8 @@ namespace zypp {
     bool is_automounted = false;
     if( media.mediaSource && !media.mediaSource->name.empty())
     {
+#ifndef NO_HAL
       using namespace zypp::target::hal;
-
       try
       {
         HalContext hal(true);
@@ -744,6 +761,12 @@ namespace zypp {
       {
         ZYPP_CAUGHT(e);
       }
+#else // NO_HAL
+#warning Can not detect automounted media without HAL
+    INT << "Can not detect automounted media without HAL!" << endl;
+    // ma@: This codepath is probably unused due to 'REUSE_FOREIGN_MOUNTS == 2'
+    // Maybe we should cleanup all this automount-specail-handling.
+#endif
     }
     DBG << "Media "        << media.mediaSource->asString()
         << " attached on " << media.attachPoint->path
@@ -832,6 +855,43 @@ namespace zypp {
     return (unsigned) _lastdev_tried < _devices.size() - 1;
   }
 
+  void
+  MediaCD::getDetectedDevices(std::vector<std::string> & devices,
+                              unsigned int & index) const
+  {
+    index = 0;
+    if (!devices.empty())
+      devices.clear();
+
+    for (DeviceList::const_iterator it = _devices.begin();
+         it != _devices.end(); ++it)
+      devices.push_back(it->name);
+
+    if (_lastdev >= 0)
+      index = _lastdev;
+
+    // try to detect again if _devices are empty (maybe this method will be
+    // called before _devices get actually filled)
+    if (devices.empty())
+    {
+      DBG << "no device list so far, trying to detect" << endl;
+
+      DeviceList detected(
+        detectDevices(_url.getScheme() == "dvd" ? true : false));
+
+      for (DeviceList::const_iterator it = detected.begin();
+           it != detected.end(); ++it)
+        devices.push_back(it->name);
+
+      // don't know which one is in use in this case
+      index = 0;
+    }
+
+    MIL << "got " << devices.size() << " detected devices, current: "
+        << (index < devices.size() ? devices[index] : "<none>")
+        << "(" << index << ")" << endl;
+  }
+
 
   } // namespace media
 } // namespace zypp