Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / repo / ServiceRepos.cc

diff --git a/zypp/repo/ServiceRepos.cc b/zypp/repo/ServiceRepos.cc
index e27c260..86d0dc5 100644 (file)
--- a/zypp/repo/ServiceRepos.cc
+++ b/zypp/repo/ServiceRepos.cc
@@ -12,86 +12,104 @@
 using std::stringstream;
 using std::endl;
 
-///////////////////////////////////////////////////////////////////
 namespace zypp
 {
-  ///////////////////////////////////////////////////////////////////
-  namespace repo
-  {
-    struct ServiceRepos::Impl
-    { virtual ~Impl() {} };
+namespace repo
+{
 
-    ///////////////////////////////////////////////////////////////////
+class ServiceRepos::Impl
+{
+public:
+    Impl()
+    {
+    }
 
-    struct RIMServiceRepos : public ServiceRepos::Impl
+    virtual ~Impl()
     {
-      RIMServiceRepos( const ServiceInfo & service,
-                      const ServiceRepos::ProcessRepo & callback,
-                      const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() )
-      {
-       // repoindex.xml must be fetched always without using cookies (bnc #573897)
-       Url serviceUrl( service.url() );
-       serviceUrl.setQueryParam( "cookies", "0" );
-
-       // download the repo index file
-       media::MediaManager mediamanager;
-       media::MediaAccessId mid = mediamanager.open( serviceUrl );
-       mediamanager.attach( mid );
-       mediamanager.provideFile( mid, "repo/repoindex.xml" );
-       Pathname path = mediamanager.localPath(mid, "repo/repoindex.xml" );
-       parser::RepoindexFileReader reader(path, callback);
-       service.setProbedTtl( reader.ttl() );   // hack! Modifying the const Service to set parsed TTL
-       mediamanager.release( mid );
-       mediamanager.close( mid );
-      }
-    };
+    }
+};
+
+class RIMServiceRepos : public ServiceRepos::Impl
+{
+public:
+    ServiceRepos::ProcessRepo _callback;
+
+    RIMServiceRepos(const ServiceInfo &service,
+                    const ServiceRepos::ProcessRepo & callback,
+                    const ProgressData::ReceiverFnc &progress = ProgressData::ReceiverFnc() )
+        : _callback(callback)
+    {
+      // repoindex.xml must be fetched always without using cookies (bnc #573897)
+      Url serviceUrl( service.url() );
+      serviceUrl.setQueryParam( "cookies", "0" );
+
+      // download the repo index file
+      media::MediaManager mediamanager;
+      media::MediaAccessId mid = mediamanager.open( serviceUrl );
+      mediamanager.attach( mid );
+      mediamanager.provideFile( mid, "repo/repoindex.xml" );
+      Pathname path = mediamanager.localPath(mid, "repo/repoindex.xml" );
+      parser::RepoindexFileReader reader(path, _callback);
+      mediamanager.release( mid );
+      mediamanager.close( mid );
+    }
+
+    ~RIMServiceRepos()
+    {
+
+    }
+};
 
-    ///////////////////////////////////////////////////////////////////
+class PluginServiceRepos : public ServiceRepos::Impl
+{
+public:
+    ServiceRepos::ProcessRepo _callback;
 
-    struct PluginServiceRepos : public ServiceRepos::Impl
+    PluginServiceRepos(const ServiceInfo &service,
+                      const ServiceRepos::ProcessRepo & callback,
+                      const ProgressData::ReceiverFnc &progress = ProgressData::ReceiverFnc() )
+        : _callback(callback)
     {
-      PluginServiceRepos( const ServiceInfo & service,
-                         const ServiceRepos::ProcessRepo & callback,
-                         const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() )
+      Url serviceUrl( service.url() );
+      stringstream buffer;
+
+      ExternalProgram::Arguments args;
+      args.reserve( 3 );
+      args.push_back( "/bin/sh" );
+      args.push_back( "-c" );
+      args.push_back( serviceUrl.getPathName() );
+      ExternalProgramWithStderr prog( args );
+      prog >> buffer;
+
+      if ( prog.close() != 0 )
       {
-       Url serviceUrl( service.url() );
-       stringstream buffer;
-
-       ExternalProgram::Arguments args;
-       args.reserve( 3 );
-       args.push_back( "/bin/sh" );
-       args.push_back( "-c" );
-       args.push_back( serviceUrl.getPathName() );
-       ExternalProgramWithStderr prog( args );
-       prog >> buffer;
-
-       if ( prog.close() != 0 )
-       {
-         // ServicePluginInformalException:
-         // Ignore this error but we'd like to report it somehow...
-         std::string errbuffer;
-         prog.stderrGetUpTo( errbuffer, '\0' );
-         ERR << "Capture plugin error:[" << endl << errbuffer << endl << ']' << endl;
-         ZYPP_THROW( repo::ServicePluginInformalException( service, errbuffer ) );
-       }
-       parser::RepoFileReader parser( buffer, callback );
+       // ServicePluginInformalException:
+       // Ignore this error but we'd like to report it somehow...
+       std::string errbuffer;
+       prog.stderrGetUpTo( errbuffer, '\0' );
+       ERR << "Capture plugin error:[" << endl << errbuffer << endl << ']' << endl;
+       ZYPP_THROW( repo::ServicePluginInformalException( service, errbuffer ) );
       }
-    };
 
-    ///////////////////////////////////////////////////////////////////
+      parser::RepoFileReader parser(buffer, _callback);
+    }
 
-    ServiceRepos::ServiceRepos( const ServiceInfo & service,
-                               const ServiceRepos::ProcessRepo & callback,
-                               const ProgressData::ReceiverFnc &progress )
-    : _impl( ( service.type() == ServiceType::PLUGIN )
-          ? static_cast<ServiceRepos::Impl*>( new PluginServiceRepos( service, callback, progress ) )
-           : static_cast<ServiceRepos::Impl*>( new RIMServiceRepos (service, callback, progress ) ) )
+    ~PluginServiceRepos()
     {}
+};
+
+
+ServiceRepos::ServiceRepos(const ServiceInfo &service,
+                           const ServiceRepos::ProcessRepo & callback,
+                           const ProgressData::ReceiverFnc &progress)
+    : _impl( (service.type() == ServiceType::PLUGIN) ? (ServiceRepos::Impl *)(new PluginServiceRepos(service, callback, progress)) : (ServiceRepos::Impl *)(new RIMServiceRepos(service, callback, progress)))
+{
+}
+
+ServiceRepos::~ServiceRepos()
+{
+}
 
-    ServiceRepos::~ServiceRepos()
-    {}
 
-  } // namespace repo
-  ///////////////////////////////////////////////////////////////////
-} //namespace zypp
-///////////////////////////////////////////////////////////////////
+}
+}