file checkers

diff --git a/devel/devel.dmacvicar/testbed.cc b/devel/devel.dmacvicar/testbed.cc
index bf613a2..24d5997 100644 (file)
--- a/devel/devel.dmacvicar/testbed.cc
+++ b/devel/devel.dmacvicar/testbed.cc
@@ -25,24 +25,22 @@
 #include "zypp/KeyRing.h"
 #include "zypp/PublicKey.h"
 
-#include "zypp/cache/KnownSourcesCache.h"
+#include "zypp/MediaSetAccess.h"
 
 using namespace zypp::detail;
 
 using namespace std;
 using namespace zypp;
-
+using namespace zypp::source;
 //using namespace DbXml;
 
 int main()
 {
-  cache::KnownSourcesCache cache("/");
+  MediaSetAccess ma( Url("cd:///"), Pathname("/"));
+  MIL << "done 1" << srd::endl;
+  Pathname local = ma.provideFile("content", 1);
+  MIL << local << std::endl;
   
-  source::SourceInfoList srcs = cache.knownSources();
-  for ( source::SourceInfoList::const_iterator it = srcs.begin(); it != srcs.end(); ++it)
-  {
-    cout << *it << endl;
-  }
 }
 
 

diff --git a/zypp/Makefile.am b/zypp/Makefile.am
index 5e0fe30..b2c38cf 100644 (file)
--- a/zypp/Makefile.am
+++ b/zypp/Makefile.am
@@ -88,7 +88,8 @@ pkginclude_HEADERS = NeedAType.h \
        ZYppCallbacks.h \
        SilentCallbacks.h \
        PublicKey.h \
-       KeyRing.h
+       KeyRing.h \
+       MediaSetAccess.h
 
 ## ##################################################
 
@@ -163,7 +164,8 @@ lib@PACKAGE@_la_SOURCES = \
        TranslatedText.cc \
        ZYppFactory.cc \
        PublicKey.cc \
-       KeyRing.cc
+       KeyRing.cc \
+       MediaSetAccess.cc
 
 
 lib@PACKAGE@_la_LDFLAGS =      @LIBZYPP_VERSION_INFO@

diff --git a/zypp/source/SourceMediaAccess.cc b/zypp/MediaSetAccess.cc
similarity index 77%
rename from zypp/source/SourceMediaAccess.cc
rename to zypp/MediaSetAccess.cc
index 1a9a436..fb753f6 100644 (file)
--- a/zypp/source/SourceMediaAccess.cc
+++ b/zypp/MediaSetAccess.cc
@@ -6,16 +6,14 @@
 |                         /_____||_| |_| |_|                           |
 |                                                                      |
 \---------------------------------------------------------------------*/
-/** \file      zypp/source/SourceMediaAccess.cc
- *
-*/
+
 #include <iostream>
 #include <fstream>
 
 #include "zypp/base/LogTools.h"
 #include "zypp/ZYppCallbacks.h"
-#include "zypp/source/SourceMediaAccess.h"
-//#include "zypp/source/SourceMediaAccessReportReceivers.h"
+#include "zypp/MediaSetAccess.h"
+//#include "zypp/source/MediaSetAccessReportReceivers.h"
 
 using std::endl;
 
@@ -23,33 +21,50 @@ using std::endl;
 namespace zypp
 { /////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
-namespace source
-{ /////////////////////////////////////////////////////////////////
-
 
-  SourceMediaAccess::SourceMediaAccess(  const Url &url, const Pathname &path )
+  MediaSetAccess::MediaSetAccess(  const Url &url, const Pathname &path )
       : _url(url),
         _path(path)
   {
-    std::vector<media::MediaVerifierRef> single_media;
-    single_media[0] = media::MediaVerifierRef(new media::NoVerifier());
-    _verifiers = single_media;
+    MIL << "initializing.." << std::endl;
+    //std::vector<media::MediaVerifierRef> single_media;
+    //single_media[0] = media::MediaVerifierRef(new media::NoVerifier());
+    //_verifiers = single_media;
   }
   
-  SourceMediaAccess::~SourceMediaAccess()
+  MediaSetAccess::~MediaSetAccess()
   {
   }
 
-  void SourceMediaAccess::setVerifiers( const std::vector<media::MediaVerifierRef> &verifiers )
+  void MediaSetAccess::setVerifiers( const std::vector<media::MediaVerifierRef> &verifiers )
   {
     _verifiers = verifiers;
   }
 
-  const Pathname SourceMediaAccess::provideFile(const Pathname & file, const unsigned media_nr )
+//       callback::SendReport<source::DownloadFileReport> report;
+//       DownloadProgressFileReceiver download_report( report );
+//       SourceFactory source_factory;
+//       Url file_url( url().asString() + file_r.asString() );
+//       report->start( source_factory.createFrom(this), file_url );
+//       callback::TempConnect<media::DownloadProgressReport> tmp_download( download_report );
+//       Pathname file = provideJustFile( file_r, media_nr, cached, checkonly );
+//       report->finish( file_url, source::DownloadFileReport::NO_ERROR, "" );
+//       return file;
+
+  const Pathname MediaSetAccess::provideFile(const Pathname & file, const unsigned media_nr )
+  {
+    return provideFileInternal( file, media_nr, false, false);
+  }
+
+  const Pathname MediaSetAccess::tryToProvideFile(const Pathname & file, const unsigned media_nr )
+  {
+    return provideFileInternal( file, media_nr, false, false);
+  }
+
+  const Pathname MediaSetAccess::provideFileInternal(const Pathname & file, const unsigned media_nr, bool cached, bool checkonly )
   {
     callback::SendReport<media::MediaChangeReport> report;
     media::MediaManager media_mgr;
-    bool checkonly = false;
     // get the mediaId, but don't try to attach it here
     media::MediaAccessId media = getMediaAccessId( media_nr);
       
@@ -124,7 +139,7 @@ namespace source
           else if ( user == media::MediaChangeReport::IGNORE )
           {
             DBG << "Skipping" << endl;
-            ZYPP_THROW ( SkipRequestedException("User-requested skipping of a file") );
+            ZYPP_THROW ( source::SkipRequestedException("User-requested skipping of a file") );
           }
           else if ( user == media::MediaChangeReport::EJECT )
           {
@@ -165,7 +180,7 @@ namespace source
     return media_mgr.localPath( media, file );
   }
 
-  media::MediaAccessId SourceMediaAccess::getMediaAccessId (media::MediaNr medianr)
+  media::MediaAccessId MediaSetAccess::getMediaAccessId (media::MediaNr medianr)
   {
     media::MediaManager media_mgr;
 
@@ -197,7 +212,7 @@ namespace source
     return id;
   }
 
-  Url SourceMediaAccess::rewriteUrl (const Url & url_r, const media::MediaNr medianr)
+  Url MediaSetAccess::rewriteUrl (const Url & url_r, const media::MediaNr medianr)
   {
     std::string scheme = url_r.getScheme();
     if (scheme == "cd" || scheme == "dvd")
@@ -236,21 +251,21 @@ namespace source
     return url_r;
   }
 
-  std::ostream & SourceMediaAccess::dumpOn( std::ostream & str ) const
+  std::ostream & MediaSetAccess::dumpOn( std::ostream & str ) const
   {
     return str;
   }
 
-//     media::MediaVerifierRef SourceMediaAccess::verifier(unsigned media_nr)
+//     media::MediaVerifierRef MediaSetAccess::verifier(unsigned media_nr)
 //     { return media::MediaVerifierRef(new media::NoVerifier()); }
 
-  SourceMediaVerifier::SourceMediaVerifier(const std::string & vendor_r, const std::string & id_r, const media::MediaNr media_nr)
+  MediaVerifier::MediaVerifier(const std::string & vendor_r, const std::string & id_r, const media::MediaNr media_nr)
     : _media_vendor(vendor_r)
       , _media_id(id_r)
       , _media_nr(media_nr)
   {}
 
-  bool SourceMediaVerifier::isDesiredMedia(const media::MediaAccessRef &ref)
+  bool MediaVerifier::isDesiredMedia(const media::MediaAccessRef &ref)
   {
     if (_media_vendor.empty() || _media_id.empty())
       return true;
@@ -273,6 +288,3 @@ namespace source
 /////////////////////////////////////////////////////////////////
 } // namespace source
 ///////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/source/SourceMediaAccess.h b/zypp/MediaSetAccess.h
similarity index 67%
rename from zypp/source/SourceMediaAccess.h
rename to zypp/MediaSetAccess.h
index 709703f..2d01d68 100644 (file)
--- a/zypp/source/SourceMediaAccess.h
+++ b/zypp/MediaSetAccess.h
@@ -7,8 +7,8 @@
 |                                                                      |
 \---------------------------------------------------------------------*/
 
-#ifndef ZYPP_SourceMediaAccess_H
-#define ZYPP_SourceMediaAccess_H
+#ifndef ZYPP_MediaSetAccess_H
+#define ZYPP_MediaSetAccess_H
 
 #include <iosfwd>
 #include <string>
@@ -19,22 +19,20 @@
 #include "zypp/base/PtrTypes.h"
 #include "zypp/media/MediaManager.h"
 #include "zypp/Pathname.h"
+#include "zypp/CheckSum.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////
-  namespace source
-  { /////////////////////////////////////////////////////////////////
 
-    DEFINE_PTR_TYPE(SourceMediaAccess);
+    DEFINE_PTR_TYPE(MediaSetAccess);
 
 
-    class SourceMediaVerifier : public zypp::media::MediaVerifierBase
+    class MediaVerifier : public zypp::media::MediaVerifierBase
     {
       public:
       /** ctor */
-      SourceMediaVerifier(const std::string & vendor_r, const std::string & id_r, const media::MediaNr media_nr = 1);
+      MediaVerifier(const std::string & vendor_r, const std::string & id_r, const media::MediaNr media_nr = 1);
       /**
        * Check if the specified attached media contains
        * the desired media number (e.g. SLES10 CD1).
@@ -46,28 +44,56 @@ namespace zypp
         media::MediaNr _media_nr;
     };
 
+    class OnMediaLocation
+    {
+      public:
+      OnMediaLocation()
+      {};
+      private:
+      
+    };
+
+    typedef boost::function<bool ( const Pathname &file )> FileChecker;
+
+    class NullFileChecker
+    {
+      public:
+      bool operator()( const Pathname &file )
+      { return true; }
+    };
+
+    class ChecksumFileChecker
+    {
+      public:
+      ChecksumFileChecker( const CheckSum &checksum )
+      {}
+      bool operator()( const Pathname &file)
+      { return true; }
+    };
+
     ///////////////////////////////////////////////////////////////////
     //
     // CLASS NAME : SourceCache
     //
-    class SourceMediaAccess : public base::ReferenceCounted, private base::NonCopyable
+    class MediaSetAccess : public base::ReferenceCounted, private base::NonCopyable
     {
-      friend std::ostream & operator<<( std::ostream & str, const SourceMediaAccess & obj );
+      friend std::ostream & operator<<( std::ostream & str, const MediaSetAccess & obj );
 
     public:
       /**
        * creates a callback enabled media access  for \param url and \param path.
        * with only  media no verified
        */
-      SourceMediaAccess( const Url &url, const Pathname &path );
-      ~SourceMediaAccess();
+      MediaSetAccess( const Url &url, const Pathname &path );
+      ~MediaSetAccess();
       /**
        * the media change callbacks depend on the verifiers given for each media.
        */
       void setVerifiers( const std::vector<media::MediaVerifierRef> &verifiers );
       const Pathname provideFile(const Pathname & file, const unsigned media_nr = 1 );
-      
+      const Pathname tryToProvideFile(const Pathname & file, const unsigned media_nr = 1 );
     protected:
+      const Pathname provideFileInternal(const Pathname & file, const unsigned media_nr, bool checkonly, bool cached);
       Url rewriteUrl (const Url & url_r, const media::MediaNr medianr);
       media::MediaAccessId getMediaAccessId (media::MediaNr medianr);
       virtual std::ostream & dumpOn( std::ostream & str ) const;
@@ -81,15 +107,11 @@ namespace zypp
     };
     ///////////////////////////////////////////////////////////////////
 
-    /** \relates SourceMediaAccess Stream output */
-    inline std::ostream & operator<<( std::ostream & str, const SourceMediaAccess & obj )
+    /** \relates MediaSetAccess Stream output */
+    inline std::ostream & operator<<( std::ostream & str, const MediaSetAccess & obj )
     { return obj.dumpOn( str ); }
 
 
-    /////////////////////////////////////////////////////////////////
-  } // namespace source
-  ///////////////////////////////////////////////////////////////////
-  /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
-#endif // ZYPP_SOURCE_SourceMediaAccess_H
+#endif // ZYPP_SOURCE_MediaSetAccess_H

diff --git a/zypp/source/Makefile.am b/zypp/source/Makefile.am
index adfc528..d2e7c67 100644 (file)
--- a/zypp/source/Makefile.am
+++ b/zypp/source/Makefile.am
@@ -15,8 +15,7 @@ sourceinclude_HEADERS =       \
        Builtin.h       \
        PackageDelta.h  \
        MediaSet.h \
-       SourceInfo.h \
-       SourceMediaAccess.h
+       SourceInfo.h
 
 noinst_LTLIBRARIES =   lib@PACKAGE@_source.la
 
@@ -26,8 +25,8 @@ lib@PACKAGE@_source_la_SOURCES = \
        SourceImpl.cc   \
        PackageDelta.cc \
        MediaSet.cc \
-       SourceInfo.cc \
-       SourceMediaAccess.cc
+       SourceInfo.cc
+       
 
 
 lib@PACKAGE@_source_la_LIBADD = \