Author: dmacvicar Date: Tue Jul 24 14:44:08 2007 New Revision: 6176 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6176&view=rev Log: Merge branch 'media-verif' Conflicts: zypp/repo/RepoProvideFile.cc Modified: trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/repo/PackageProvider.cc trunk/libzypp/zypp/repo/PackageProvider.h trunk/libzypp/zypp/repo/RepoProvideFile.cc trunk/libzypp/zypp/repo/RepoProvideFile.h trunk/libzypp/zypp/repo/SUSEMediaVerifier.cc trunk/libzypp/zypp/repo/SUSEMediaVerifier.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Tue Jul 24 14:44:08 2007 @@ -54,6 +54,7 @@ std::string alias; std::string name; Pathname filepath; + Pathname metadatapath; public: private: @@ -167,6 +168,12 @@ _pimpl->filepath = filepath; return *this; } + + RepoInfo & RepoInfo::setMetadataPath( const Pathname &path ) + { + _pimpl->metadatapath = path; + return *this; + } tribool RepoInfo::enabled() const { return _pimpl->enabled; } @@ -186,6 +193,9 @@ Pathname RepoInfo::filepath() const { return _pimpl->filepath; } + Pathname RepoInfo::metadataPath() const + { return _pimpl->metadatapath; } + repo::RepoType RepoInfo::type() const { return _pimpl->type; } Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Tue Jul 24 14:44:08 2007 @@ -174,6 +174,14 @@ * infos created in memory. */ Pathname filepath() const; + + /** + * \short Path where this repo metadata was read from + * + * \note could be an empty pathname for repo + * infos created in memory. + */ + Pathname metadataPath() const; /** * \short Whether to check or not this repository with gpg @@ -260,6 +268,16 @@ * \param path File path */ RepoInfo & setFilepath( const Pathname &filename ); + + /** + * \short set the path where the local metadata is stored + * + * The path to the metadata of this repository + * was defined, or empty if nowhere. + * + * \param path directory path + */ + RepoInfo & setMetadataPath( const Pathname &path ); /** * \short Whether to check or not this repository with gpg Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Tue Jul 24 14:44:08 2007 @@ -253,7 +253,18 @@ MIL << endl; if ( PathInfo(_pimpl->options.knownReposPath).isExist() ) - return repositories_in_dir(_pimpl->options.knownReposPath); + { + RepoInfoList repos = repositories_in_dir(_pimpl->options.knownReposPath); + for ( RepoInfoList::iterator it = repos.begin(); + it != repos.end(); + ++it ) + { + // set the metadata path for the repo + Pathname metadata_path = rawcache_path_for_repoinfo(_pimpl->options, (*it)); + (*it).setMetadataPath(metadata_path); + } + return repos; + } else return std::list<RepoInfo>(); @@ -833,8 +844,7 @@ { ZYPP_THROW(RepoException("Can't delete " + todelete.filepath().asString())); } - MIL << todelete.alias() << " sucessfully deleted." << endl; - return; + MIL << todelete.alias() << " sucessfully deleted." << endl; } else { @@ -858,17 +868,19 @@ if ( (*fit).alias() != todelete.alias() ) (*fit).dumpRepoOn(file); } + } - cache::CacheStore store(_pimpl->options.repoCachePath); - - if ( store.isCached( todelete.alias() ) ) { - MIL << "repository was cached. cleaning cache" << endl; - store.cleanRepository(todelete.alias()); - } + // now delete it from cache + cache::CacheStore store(_pimpl->options.repoCachePath); - MIL << todelete.alias() << " sucessfully deleted." << endl; - return; + if ( store.isCached( todelete.alias() ) ) { + MIL << "repository was cached. cleaning cache" << endl; + store.cleanRepository(todelete.alias()); + store.commit(); } + + MIL << todelete.alias() << " sucessfully deleted." << endl; + return; } // else filepath is empty } Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvider.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Tue Jul 24 14:44:08 2007 @@ -71,13 +71,15 @@ ///////////////////////////////////////////////////////////////// } // namespace source /////////////////////////////////////////////////////////////////// - PackageProvider::PackageProvider( const Package::constPtr & package, + PackageProvider::PackageProvider( RepoMediaAccess &access, + const Package::constPtr & package, const DeltaCandidates & deltas, const PackageProviderPolicy & policy_r ) : _policy( policy_r ) , _package( package ) , _implPtr( detail::ImplConnect::resimpl( _package ) ) , _deltas(deltas) + , _access(access) {} PackageProvider::~PackageProvider() @@ -186,8 +188,7 @@ ProvideFilePolicy policy; policy.progressCB( bind( &PackageProvider::progressPackageDownload, this, _1 ) ); policy.failOnChecksumErrorCB( bind( &PackageProvider::failOnChecksumError, this ) ); - - return repo::provideFile( _package->repository(), loc, policy ); + return _access.provideFile( _package->repository(), loc, policy ); } ManagedFile PackageProvider::tryDelta( const DeltaRpm & delta_r ) const @@ -206,7 +207,7 @@ { ProvideFilePolicy policy; policy.progressCB( bind( &PackageProvider::progressDeltaDownload, this, _1 ) ); - delta = repo::provideFile( _package->repository(), delta_r.location(), policy ); + delta = _access.provideFile( _package->repository(), delta_r.location(), policy ); } catch ( const Exception & excpt ) { @@ -257,7 +258,7 @@ { ProvideFilePolicy policy; policy.progressCB( bind( &PackageProvider::progressPatchDownload, this, _1 ) ); - patch = repo::provideFile( _package->repository(), patch_r.location(), policy ); + patch = _access.provideFile( _package->repository(), patch_r.location(), policy ); } catch ( const Exception & excpt ) { Modified: trunk/libzypp/zypp/repo/PackageProvider.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvider.h?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.h (original) +++ trunk/libzypp/zypp/repo/PackageProvider.h Tue Jul 24 14:44:08 2007 @@ -20,7 +20,7 @@ #include "zypp/Repository.h" #include "zypp/Package.h" #include "zypp/ManagedFile.h" - +#include "zypp/repo/RepoProvideFile.h" #include "zypp/repo/DeltaCandidates.h" /////////////////////////////////////////////////////////////////// @@ -74,7 +74,8 @@ public: /** Ctor taking the Package to provide. */ - PackageProvider( const Package::constPtr & package, + PackageProvider( RepoMediaAccess &access, + const Package::constPtr & package, const DeltaCandidates & deltas, const PackageProviderPolicy & policy_r = PackageProviderPolicy() ); ~PackageProvider(); @@ -107,6 +108,7 @@ mutable bool _retry; mutable shared_ptr<Report> _report; DeltaCandidates _deltas; + RepoMediaAccess &_access; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/RepoProvideFile.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoProvideFile.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoProvideFile.cc (original) +++ trunk/libzypp/zypp/repo/RepoProvideFile.cc Tue Jul 24 14:44:08 2007 @@ -16,11 +16,15 @@ #include "zypp/base/Gettext.h" #include "zypp/base/Logger.h" +#include "zypp/base/String.h" #include "zypp/repo/RepoProvideFile.h" #include "zypp/ZYppCallbacks.h" #include "zypp/MediaSetAccess.h" #include "zypp/ZConfig.h" +#include "zypp/repo/SUSEMediaVerifier.h" +#include "zypp/repo/RepoException.h" + using std::endl; using std::set; @@ -47,10 +51,10 @@ */ struct DownloadFileReportHack : public callback::ReceiveReportrepo::RepoReport { - virtual bool progress( int value ) + virtual bool progress( const ProgressData &progress ) { if ( _redirect ) - return _redirect( value ); + return _redirect( progress.val() ); return true; } function _redirect; @@ -64,6 +68,126 @@ const OnMediaLocation & loc_r, const ProvideFilePolicy & policy_r ) { + RepoMediaAccess access; + return access.provideFile(repo_r, loc_r, policy_r ); + } + + class RepoMediaAccess::Impl + { + public: + Impl() + {} + + ~Impl() + { + std::map::iterator it; + for ( it = _medias.begin(); + it != _medias.end(); + ++it ) + { + it->second->release(); + } + } + + shared_ptr<MediaSetAccess> mediaAccessForUrl( const Url &url ) + { + std::map::const_iterator it; + it = _medias.find(url); + shared_ptr<MediaSetAccess> media; + if ( it != _medias.end() ) + { + media = it->second; + } + else + { + media.reset( new MediaSetAccess(url) ); + _medias[url] = media; + } + return media; + } + + void setVerifierForRepo( Repository repo, shared_ptr<MediaSetAccess> media ) + { + RepoInfo info = repo.info(); + // set a verifier if the repository has it + Pathname mediafile = info.metadataPath() + "/media.1/media"; + if ( ! mediafile.empty() ) + { + if ( PathInfo(mediafile).isExist() ) + { + std::map::const_iterator it; + it = _verifier.find(media); + if ( it != _verifier.end() ) + { + if ( it->second == repo ) + { + // this media is already using this repo verifier + return; + } + } + + std::ifstream str(mediafile.asString().c_str()); + std::string vendor; + std::string mediaid; + std::string buffer; + if ( str ) + { + getline(str, vendor); + getline(str, mediaid); + getline(str, buffer); + + unsigned media_nr = str::strtonum<unsigned>(buffer); + MIL << "Repository '" << info.alias() << "' has " << media_nr << " medias"<< endl; + + for ( int i=1; i <= media_nr; ++i ) + { + media::MediaVerifierRef verifier( new repo::SUSEMediaVerifier(vendor, + mediaid, + i)); + + media->setVerifier( i, verifier); + } + _verifier[media] = repo; + } + else + { + ZYPP_THROW(RepoMetadataException(info)); + } + } + else + { + WAR << "No media verifier for repo '" << info.alias() << endl; + } + } + else + { + MIL << "Unknown metadata path for repo '" << info.alias() << "'. Can't set media verifier."<< endl; + } + } + + std::map _verifier; + std::map _medias; + }; + + + + RepoMediaAccess::RepoMediaAccess() + : _impl( new Impl() ) + { + + } + + RepoMediaAccess::~RepoMediaAccess() + { + + } + + + + ManagedFile RepoMediaAccess::provideFile( Repository repo_r, + const OnMediaLocation & loc_r, + const ProvideFilePolicy & policy_r ) + { MIL << "provideFile " << loc_r << endl; // Arrange DownloadFileReportHack to recieve the source::DownloadFileReport // and redirect download progress triggers to call the ProvideFilePolicy @@ -78,7 +202,7 @@ set<Url> urls = info.baseUrls(); if ( urls.empty() ) ZYPP_THROW(Exception(_("No url in repository."))); - + for ( RepoInfo::urls_const_iterator it = urls.begin(); it != urls.end(); ++it ) @@ -88,9 +212,10 @@ { MIL << "Providing file of repo '" << info.alias() << "' from " << url << endl; - MediaSetAccess access(url); + shared_ptr<MediaSetAccess> access = _impl->mediaAccessForUrl(url); + _impl->setVerifierForRepo(repo_r, access); - ManagedFile ret( access.provideFile(loc_r) ); + ManagedFile ret( access->provideFile(loc_r) ); std::string scheme( url.getScheme() ); if ( scheme == "http" || scheme == "https" || scheme == "ftp" ) Modified: trunk/libzypp/zypp/repo/RepoProvideFile.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoProvideFile.h?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoProvideFile.h (original) +++ trunk/libzypp/zypp/repo/RepoProvideFile.h Tue Jul 24 14:44:08 2007 @@ -14,6 +14,7 @@ #include <iosfwd> +#include "zypp/base/PtrTypes.h" #include "zypp/base/Function.h" #include "zypp/base/Functional.h" #include "zypp/Repository.h" @@ -46,6 +47,39 @@ const OnMediaLocation & loc_r, const ProvideFilePolicy & policy_r = ProvideFilePolicy() ); + /** + * \short Provides files from different repos + * + * Class that allows to get files from repositories + * It handles automatically setting media verifiers if the + * repo is cached, and reuses media set access opened for + * repositories during its scope, so you can provide + * files from different repositories in different order + * without opening and closing medias all the time + */ + class RepoMediaAccess + { + public: + RepoMediaAccess(); + ~RepoMediaAccess(); + + /** Provide a file from a Repository. + * Let \a source_r provide the file described by \a loc_r. In case + * \a loc_r contains a checksum, the file is verified. \a policy_r + * provides callback hooks for download progress reporting and behaviour + * on failed checksum verification. + * + * \throws Exception + */ + ManagedFile provideFile( Repository repo_r, + const OnMediaLocation & loc_r, + const ProvideFilePolicy & policy_r = ProvideFilePolicy() ); + private: + class Impl; + RW_pointer<Impl> _impl; + + }; + ///////////////////////////////////////////////////////////////// } // namespace repo /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/SUSEMediaVerifier.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/SUSEMediaVerifier.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/SUSEMediaVerifier.cc (original) +++ trunk/libzypp/zypp/repo/SUSEMediaVerifier.cc Tue Jul 24 14:44:08 2007 @@ -25,7 +25,8 @@ , _media_nr(media_nr) {} -SUSEMediaVerifier::SUSEMediaVerifier( const Pathname &path_r ) +SUSEMediaVerifier::SUSEMediaVerifier( int media_nr, const Pathname &path_r ) + : _media_nr(media_nr) { std::ifstream str(path_r.asString().c_str()); std::string vendor; Modified: trunk/libzypp/zypp/repo/SUSEMediaVerifier.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/SUSEMediaVerifier.h?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/SUSEMediaVerifier.h (original) +++ trunk/libzypp/zypp/repo/SUSEMediaVerifier.h Tue Jul 24 14:44:08 2007 @@ -40,8 +40,10 @@ /** * \short creates a verifier from a media file + * + * \param path_r Path to media.1/media kind file */ - SUSEMediaVerifier( const Pathname &path_r ); + SUSEMediaVerifier( int media_nr, const Pathname &path_r ); /** * \short Check if it is the desider media Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=6176&r1=6175&r2=6176&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Tue Jul 24 14:44:08 2007 @@ -229,8 +229,10 @@ struct RepoProvidePackage { ResPool _pool; - RepoProvidePackage( ResPool pool_r ) - : _pool(pool_r) + repo::RepoMediaAccess &_access; + + RepoProvidePackage( repo::RepoMediaAccess &access, ResPool pool_r ) + : _pool(pool_r), _access(access) { } @@ -256,7 +258,7 @@ } repo::DeltaCandidates deltas(repos); - repo::PackageProvider pkgProvider( p, deltas, packageProviderPolicy ); + repo::PackageProvider pkgProvider( _access, p, deltas, packageProviderPolicy ); return pkgProvider.providePackage(); } }; @@ -487,7 +489,7 @@ const ResPool & pool_r ) { TargetImpl::PoolItemList remaining; - + repo::RepoMediaAccess access; MIL << "TargetImpl::commit(<list>" << policy_r << ")" << endl; bool abort = false; @@ -495,7 +497,7 @@ // remember the last used source (if any) Repository lastUsedRepo; - RepoProvidePackage repoProvidePackage(pool_r); + RepoProvidePackage repoProvidePackage( access, pool_r); // prepare the package cache. CommitPackageCache packageCache( items_r.begin(), items_r.end(), root() / "tmp", repoProvidePackage ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org