Author: dmacvicar Date: Thu Jul 19 17:07:48 2007 New Revision: 6105 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6105&view=rev Log: - Pass the media set to the Downloaders instead of having one in the object - Make Downloaders have a base class repo::Downloader this will allow to remove some code in RepoManager and interact with the downloader without knowing which type is it - Make Downloader base class inherit from fetcher, then you can set the cache directories to the downloader itself, which RepoManager will do Added: trunk/libzypp/zypp/repo/Downloader.cc trunk/libzypp/zypp/repo/Downloader.h Modified: trunk/libzypp/tests/repo/susetags/Downloader_test.cc trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/Fetcher.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/repo/susetags/Downloader.cc trunk/libzypp/zypp/repo/susetags/Downloader.h trunk/libzypp/zypp/repo/yum/Downloader.cc trunk/libzypp/zypp/repo/yum/Downloader.h Modified: trunk/libzypp/tests/repo/susetags/Downloader_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/Downloader_test.cc?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/Downloader_test.cc (original) +++ trunk/libzypp/tests/repo/susetags/Downloader_test.cc Thu Jul 19 17:07:48 2007 @@ -25,12 +25,13 @@ { Pathname p = dir + "/stable-x86-subset"; Url url("dir:" + p.asString()); - susetags::Downloader downloader(url, "/"); + MediaSetAccess media(url); + susetags::Downloader downloader("/"); filesystem::TmpDir tmp; Pathname localdir(tmp.path()); - downloader.download(localdir); + downloader.download(media,localdir); const char* files[] = { Modified: trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc (original) +++ trunk/libzypp/tests/repo/yum/YUMDownloader_test.cc Thu Jul 19 17:07:48 2007 @@ -25,12 +25,13 @@ { Pathname p = dir + "/10.2-updates-subset"; Url url("dir:" + p.asString()); - yum::Downloader yum(url, "/"); + MediaSetAccess media(url); + yum::Downloader yum("/"); filesystem::TmpDir tmp; Pathname localdir(tmp.path()); - yum.download(localdir); + yum.download(media, localdir); const char* files[] = { Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Thu Jul 19 17:07:48 2007 @@ -926,6 +926,7 @@ repo/PackageDelta.cc repo/SUSEMediaVerifier.cc repo/MediaInfoDownloader.cc + repo/Downloader.cc ) SET( zypp_repo_HEADERS @@ -939,6 +940,7 @@ repo/PackageDelta.h repo/SUSEMediaVerifier.h repo/MediaInfoDownloader.h + repo/Downloader.h ) INSTALL( FILES Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Thu Jul 19 17:07:48 2007 @@ -63,7 +63,8 @@ */ class Fetcher { - friend std::ostream & operator<<( std::ostream & str, const Fetcher & obj ); + friend std::ostream & operator<<( std::ostream & str, + const Fetcher & obj ); public: /** Implementation */ @@ -72,7 +73,7 @@ /** Default ctor */ Fetcher(); /** Dtor */ - ~Fetcher(); + virtual ~Fetcher(); public: /** @@ -80,7 +81,8 @@ * be transfered until \ref start() is called * */ - void enqueue( const OnMediaLocation &resource, const FileChecker &checker = NullFileChecker() ); + void enqueue( const OnMediaLocation &resource, + const FileChecker &checker = NullFileChecker() ); /** * Enqueue a object for transferal, they will not @@ -93,17 +95,20 @@ * * \todo FIXME implement checker == operator to avoid this. */ - void enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker = NullFileChecker() ); + void enqueueDigested( const OnMediaLocation &resource, + const FileChecker &checker = NullFileChecker() ); /** * adds a directory to the list of directories * where to look for cached files */ void addCachePath( const Pathname &cache_dir ); + /** * Reset the transfer list and cache list */ void reset(); + /** * start the transfer to a destination directory * \a dest_dir Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Thu Jul 19 17:07:48 2007 @@ -347,9 +347,10 @@ { case RepoType::RPMMD_e : { - yum::Downloader downloader( url, "/" ); + MediaSetAccess media(url); + yum::Downloader downloader(info.path()); - RepoStatus newstatus = downloader.status(); + RepoStatus newstatus = downloader.status(media); bool refresh = false; if ( oldstatus.checksum() == newstatus.checksum() ) { @@ -366,7 +367,7 @@ } if ( refresh ) - downloader.download(tmpdir.path()); + downloader.download( media, tmpdir.path()); else return; // no error @@ -374,9 +375,10 @@ break; case RepoType::YAST2_e : { - susetags::Downloader downloader( url, "/" ); + MediaSetAccess media(url); + susetags::Downloader downloader(info.path()); - RepoStatus newstatus = downloader.status(); + RepoStatus newstatus = downloader.status(media); bool refresh = false; if ( oldstatus.checksum() == newstatus.checksum() ) { @@ -393,7 +395,7 @@ } if ( refresh ) - downloader.download(tmpdir.path()); + downloader.download(media, tmpdir.path()); else return; // no error Added: trunk/libzypp/zypp/repo/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/Downloader.cc?rev=6105&view=auto ============================================================================== --- trunk/libzypp/zypp/repo/Downloader.cc (added) +++ trunk/libzypp/zypp/repo/Downloader.cc Thu Jul 19 17:07:48 2007 @@ -0,0 +1,53 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ + +#include <fstream> +#include "zypp/base/String.h" +#include "zypp/base/Logger.h" +#include "zypp/base/Function.h" + +#include "zypp/Date.h" + +#include "Downloader.h" +#include "zypp/repo/MediaInfoDownloader.h" +#include "zypp/base/UserRequestException.h" + +using namespace std; + +namespace zypp +{ +namespace repo +{ + +Downloader::Downloader() +{ +} + +Downloader::~Downloader() +{ +} + +RepoStatus Downloader::status( MediaSetAccess &media ) +{ + WAR << "Non implemented" << endl; + return RepoStatus(); +} + +void Downloader::download( MediaSetAccess &media, + const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progress ) +{ + WAR << "Non implemented" << endl; +} + +}// ns repo +} // ns zypp + + + Added: trunk/libzypp/zypp/repo/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/Downloader.h?rev=6105&view=auto ============================================================================== --- trunk/libzypp/zypp/repo/Downloader.h (added) +++ trunk/libzypp/zypp/repo/Downloader.h Thu Jul 19 17:07:48 2007 @@ -0,0 +1,60 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ + +#ifndef ZYPP_REPO_DOWNLOADER +#define ZYPP_REPO_DOWNLOADER + +#include "zypp/Url.h" +#include "zypp/Pathname.h" +#include "zypp/ProgressData.h" +#include "zypp/RepoStatus.h" +#include "zypp/MediaSetAccess.h" +#include "zypp/Fetcher.h" + +namespace zypp +{ + namespace repo + { + /** + * \short Downloader base class + * + * a Downloader encapsulates all the knowledge of + * which files have to be downloaded to the local disk. + * + */ + class Downloader : public Fetcher + { + public: + /** + * \short Constructor + */ + Downloader(); + virtual ~Downloader(); + + /** + * \short Download metadata to a local directory + * + * \param media Media access to the repository url + * \param dest_dir Local destination directory + * \param progress progress receiver + */ + virtual void download( MediaSetAccess &media, + const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + /** + * \short Status of the remote repository + */ + virtual RepoStatus status( MediaSetAccess &media ); + + }; + + } // ns repo +} // ns zypp + +#endif Modified: trunk/libzypp/zypp/repo/susetags/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downloader.cc?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.cc Thu Jul 19 17:07:48 2007 @@ -18,24 +18,22 @@ namespace susetags { -Downloader::Downloader( const Url &url, const Pathname &path ) - : _url(url), _path(path) +Downloader::Downloader(const Pathname &path ) + : _path(path) { } -RepoStatus Downloader::status() +RepoStatus Downloader::status( MediaSetAccess &media ) { - MediaSetAccess media(_url, _path); - Pathname content = media.provideFile("/content"); + Pathname content = media.provideFile( _path + "/content"); return RepoStatus(content); } -void Downloader::download( const Pathname &dest_dir, +void Downloader::download( MediaSetAccess &media, + const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress ) { - MediaSetAccess media(_url); - Fetcher fetcher; downloadMediaInfo( dest_dir, media ); SignatureFileChecker sigchecker; @@ -43,9 +41,9 @@ Pathname sig = _path + "/content.asc"; if ( media.doesFileExist(sig) ) { - fetcher.enqueue( OnMediaLocation( sig, 1 ) ); - fetcher.start( dest_dir, media ); - fetcher.reset(); + this->enqueue( OnMediaLocation( sig, 1 ) ); + this->start( dest_dir, media ); + this->reset(); sigchecker = SignatureFileChecker( dest_dir + sig ); } @@ -53,16 +51,16 @@ Pathname key = _path + "/content.key"; if ( media.doesFileExist(key) ) { - fetcher.enqueue( OnMediaLocation( key, 1 ) ); - fetcher.start( dest_dir, media ); - fetcher.reset(); + this->enqueue( OnMediaLocation( key, 1 ) ); + this->start( dest_dir, media ); + this->reset(); sigchecker.addPublicKey(dest_dir + key); } - fetcher.enqueue( OnMediaLocation( _path + "/content", 1 ), sigchecker ); - fetcher.start( dest_dir, media ); - fetcher.reset(); + this->enqueue( OnMediaLocation( _path + "/content", 1 ), sigchecker ); + this->start( dest_dir, media ); + this->reset(); std::ifstream file((dest_dir + _path + "/content").asString().c_str()); std::string buffer; @@ -93,7 +91,7 @@ } OnMediaLocation location( _path + descr_dir + words[3], 1 ); location.setChecksum( CheckSum( words[1], words[2] ) ); - fetcher.enqueueDigested(location); + this->enqueueDigested(location); } else if (buffer.substr( 0, 3 ) == "KEY") { @@ -105,11 +103,11 @@ } OnMediaLocation location( _path + words[3], 1 ); location.setChecksum( CheckSum( words[1], words[2] ) ); - fetcher.enqueueDigested(location); + this->enqueueDigested(location); } } file.close(); - fetcher.start( dest_dir, media ); + this->start( dest_dir, media ); } }// ns susetags Modified: trunk/libzypp/zypp/repo/susetags/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downloader.h?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.h (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.h Thu Jul 19 17:07:48 2007 @@ -14,6 +14,8 @@ #include "zypp/Pathname.h" #include "zypp/ProgressData.h" #include "zypp/RepoStatus.h" +#include "zypp/MediaSetAccess.h" +#include "zypp/repo/Downloader.h" namespace zypp { @@ -22,18 +24,36 @@ namespace susetags { - class Downloader + /** + * \short Downloader for SUSETags (YaST2) repositories + * Encapsulates all the knowledge of which files have + * to be downloaded to the local disk. + */ + class Downloader : public repo::Downloader { public: - Downloader( const Url &url, const Pathname &path ); - void download( const Pathname &dest_dir, + /** + * \short Constructor + * + * \param path Path to the repostory from the media + */ + Downloader( const Pathname &path ); + + /** + * \short Download metadata to a local directory + * + * \param media Media access to the repository url + * \param dest_dir Local destination directory + * \param progress progress receiver + */ + void download( MediaSetAccess &media, + const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); /** * \short Status of the remote repository */ - RepoStatus status(); + RepoStatus status( MediaSetAccess &media ); private: - Url _url; Pathname _path; }; Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader.cc?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Thu Jul 19 17:07:48 2007 @@ -19,6 +19,7 @@ #include "Downloader.h" #include "zypp/repo/MediaInfoDownloader.h" #include "zypp/base/UserRequestException.h" +#include "zypp/parser/xml/Reader.h" using namespace std; using namespace zypp::xml; @@ -31,26 +32,28 @@ namespace yum { -Downloader::Downloader( const Url &url, const Pathname &path ) - : _url(url), _path(path), _media(url, path) +Downloader::Downloader( const Pathname &path ) + : _path(path), _media_ptr(0L) { } -RepoStatus Downloader::status() +RepoStatus Downloader::status( MediaSetAccess &media ) { - Pathname repomd = _media.provideFile("/repodata/repomd.xml"); + Pathname repomd = media.provideFile( _path + "/repodata/repomd.xml"); return RepoStatus(repomd); } -bool Downloader::patches_Callback( const OnMediaLocation &loc, const string &id ) +bool Downloader::patches_Callback( const OnMediaLocation &loc, + const string &id ) { MIL << id << " : " << loc << endl; - _fetcher.enqueueDigested(loc); + this->enqueueDigested(loc); return true; } -bool Downloader::repomd_Callback( const OnMediaLocation &loc, const ResourceType &dtype ) +bool Downloader::repomd_Callback( const OnMediaLocation &loc, + const ResourceType &dtype ) { MIL << dtype << " : " << loc << endl; @@ -61,28 +64,32 @@ return true; } - _fetcher.enqueueDigested(loc); + this->enqueueDigested(loc); // We got a patches file we need to read, to add patches listed // there, so we transfer what we have in the queue, and // queue the patches in the patches callback if ( dtype == ResourceType::PATCHES ) { - _fetcher.start( _dest_dir, _media); + this->start( _dest_dir, *_media_ptr ); // now the patches.xml file must exists - PatchesFileReader( _dest_dir + loc.filename(), bind( &Downloader::patches_Callback, this, _1, _2)); + PatchesFileReader( _dest_dir + _path + loc.filename(), + bind( &Downloader::patches_Callback, this, _1, _2)); } return true; } -void Downloader::download( const Pathname &dest_dir, +void Downloader::download( MediaSetAccess &media, + const Pathname &dest_dir, const ProgressData::ReceiverFnc & progressrcv ) { - Pathname repomdpath = "/repodata/repomd.xml"; - Pathname keypath = "/repodata/repomd.xml.key"; - Pathname sigpath = "/repodata/repomd.xml.asc"; + Pathname repomdpath = _path + "/repodata/repomd.xml"; + Pathname keypath = _path + "/repodata/repomd.xml.key"; + Pathname sigpath = _path + "/repodata/repomd.xml.asc"; + _media_ptr = (&media); + ProgressData progress; progress.sendTo(progressrcv); progress.toMin(); @@ -90,13 +97,13 @@ //downloadMediaInfo( dest_dir, _media ); _dest_dir = dest_dir; - if ( _media.doesFileExist(keypath) ) - _fetcher.enqueue( OnMediaLocation(keypath,1) ); + if ( _media_ptr->doesFileExist(keypath) ) + this->enqueue( OnMediaLocation(keypath,1) ); - if ( _media.doesFileExist(sigpath) ) - _fetcher.enqueue( OnMediaLocation(sigpath,1) ); + if ( _media_ptr->doesFileExist(sigpath) ) + this->enqueue( OnMediaLocation(sigpath,1) ); - _fetcher.start( dest_dir, _media ); + this->start( dest_dir, *_media_ptr ); if ( ! progress.tick() ) ZYPP_THROW(AbortRequestException()); @@ -109,19 +116,19 @@ if ( PathInfo( dest_dir + keypath ).isExist() ) sigchecker.addPublicKey(dest_dir + keypath ); - _fetcher.enqueue( OnMediaLocation(repomdpath,1), sigchecker ); - _fetcher.start( dest_dir, _media); + this->enqueue( OnMediaLocation(repomdpath,1), sigchecker ); + this->start( dest_dir, *_media_ptr); if ( ! progress.tick() ) ZYPP_THROW(AbortRequestException()); - _fetcher.reset(); + this->reset(); - Reader reader( dest_dir + "/repodata/repomd.xml" ); - RepomdFileReader( dest_dir + "/repodata/repomd.xml", bind( &Downloader::repomd_Callback, this, _1, _2)); + Reader reader( dest_dir + _path + "/repodata/repomd.xml" ); + RepomdFileReader( dest_dir + _path + "/repodata/repomd.xml", bind( &Downloader::repomd_Callback, this, _1, _2)); // ready, go! - _fetcher.start( dest_dir, _media); + this->start( dest_dir, *_media_ptr); progress.toMax(); } Modified: trunk/libzypp/zypp/repo/yum/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader.h?rev=6105&r1=6104&r2=6105&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.h (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.h Thu Jul 19 17:07:48 2007 @@ -15,10 +15,10 @@ #include "zypp/Fetcher.h" #include "zypp/OnMediaLocation.h" #include "zypp/MediaSetAccess.h" -#include "zypp/parser/xml/Reader.h" -#include "zypp/repo/yum/ResourceType.h" #include "zypp/ProgressData.h" #include "zypp/RepoStatus.h" +#include "zypp/repo/Downloader.h" +#include "zypp/repo/yum/ResourceType.h" namespace zypp { @@ -26,44 +26,54 @@ { namespace yum { - /** - * This class allows to retrieve a YUM repository - * to a local directory + /** + * \short Downloader for YUM (rpm-nmd) repositories + * Encapsulates all the knowledge of which files have + * to be downloaded to the local disk. * * \code - * Downloader yum(url, path); - * yum.download("localdir"); + * MediaSetAccess media(url); + * Downloader yum(path); + * yum.download( media, "localdir"); * \endcode */ - class Downloader + class Downloader : public repo::Downloader { public: + /** - * Create the download object for a repository - * located in \a url with path \a path - */ - Downloader( const Url &url, const Pathname &path ); + * \short Constructor + * + * \param path Path to the repostory from the media + */ + Downloader( const Pathname &path ); + /** - * starts the download to local directory \a dest_dir - */ - void download( const Pathname &dest_dir, + * \short Download metadata to a local directory + * + * \param media Media access to the repository url + * \param dest_dir Local destination directory + * \param progress progress receiver + */ + void download( MediaSetAccess &media, + const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); /** * \short Status of the remote repository */ - RepoStatus status(); + RepoStatus status( MediaSetAccess &media ); protected: bool repomd_Callback( const OnMediaLocation &loc, const ResourceType &dtype ); bool patches_Callback( const OnMediaLocation &loc, const std::string &id ); private: - Url _url; Pathname _path; Fetcher _fetcher; Pathname _dest_dir; std::list<OnMediaLocation> _patches_files; - MediaSetAccess _media; + + MediaSetAccess *_media_ptr; }; } // ns yum -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org