add sources.list Check-Valid-Until and Valid-Until-{Max,Min} options

[apt.git] / apt-pkg / deb / debmetaindex.h

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 0e70bba87d0986da01a067fec374fdfb7f166abf..879eb3bfca827ab348bf85d14b8d4e8136a25d45 100644 (file)
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -1,4 +1,3 @@
-// ijones, walters

 #ifndef PKGLIB_DEBMETAINDEX_H
 #define PKGLIB_DEBMETAINDEX_H
 
 #ifndef PKGLIB_DEBMETAINDEX_H
 #define PKGLIB_DEBMETAINDEX_H
 


@@ -19,79 +18,88 @@
 class pkgAcquire;
 class pkgIndexFile;
 class debDebPkgFileIndex;
 class pkgAcquire;
 class pkgIndexFile;
 class debDebPkgFileIndex;

+class IndexTarget;
+class pkgCacheGenerator;
+class OpProgress;
+class debReleaseIndexPrivate;

 
 

-class debReleaseIndex : public metaIndex {
-   public:
-
-   class debSectionEntry
-   {
-      public:
-      debSectionEntry (std::string const &Section, bool const &IsSrc);
-      std::string const Section;
-      bool const IsSrc;
-   };
-
-   private:
-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-   std::map<std::string, std::vector<debSectionEntry const*> > ArchEntries;
-   enum { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;
+class APT_HIDDEN debReleaseIndex : public metaIndex
+{
+   debReleaseIndexPrivate * const d;

 
 

+   APT_HIDDEN bool parseSumData(const char *&Start, const char *End, std::string &Name,
+                    std::string &Hash, unsigned long long &Size);

    public:
 
    public:
 

+   APT_HIDDEN std::string MetaIndexInfo(const char *Type) const;
+   APT_HIDDEN std::string MetaIndexFile(const char *Types) const;
+   APT_HIDDEN std::string MetaIndexURI(const char *Type) const;
+

    debReleaseIndex(std::string const &URI, std::string const &Dist);
    debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted);
    virtual ~debReleaseIndex();
 
    virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};
    debReleaseIndex(std::string const &URI, std::string const &Dist);
    debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted);
    virtual ~debReleaseIndex();
 
    virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};

-   virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
-   std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
-   std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
+   virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false);
+   virtual std::vector<IndexTarget> GetIndexTargets() const;

 
 

-   std::string MetaIndexInfo(const char *Type) const;
-   std::string MetaIndexFile(const char *Types) const;
-   std::string MetaIndexURI(const char *Type) const;
+   virtual std::string Describe() const;
+   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const;
+   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;

 
 

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual std::string LocalFileName() const;
-#endif
+   virtual bool Load(std::string const &Filename, std::string * const ErrorText);
+   virtual metaIndex * UnloadedClone() const;

 
 

-   std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
-   std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;
-   std::string SourceIndexURI(const char *Type, const std::string &Section) const;
-   std::string SourceIndexURISuffix(const char *Type, const std::string &Section) const;
-   std::string TranslationIndexURI(const char *Type, const std::string &Section) const;
-   std::string TranslationIndexURISuffix(const char *Type, const std::string &Section) const;

    virtual std::vector <pkgIndexFile *> *GetIndexFiles();
 
    virtual std::vector <pkgIndexFile *> *GetIndexFiles();
 

-   void SetTrusted(bool const Trusted);
+   bool SetTrusted(TriState const Trusted);
+   bool SetCheckValidUntil(TriState const Trusted);
+   bool SetValidUntilMin(time_t const Valid);
+   bool SetValidUntilMax(time_t const Valid);
+

    virtual bool IsTrusted() const;
 
    virtual bool IsTrusted() const;
 

-   void PushSectionEntry(std::vector<std::string> const &Archs, const debSectionEntry *Entry);
-   void PushSectionEntry(std::string const &Arch, const debSectionEntry *Entry);
-   void PushSectionEntry(const debSectionEntry *Entry);
+   void AddComponent(bool const isSrc, std::string const &Name,
+        std::vector<std::string> const &Targets,
+        std::vector<std::string> const &Architectures,
+        std::vector<std::string> Languages);

 };
 
 };
 

-class debDebFileMetaIndex : public metaIndex
+class APT_HIDDEN debDebFileMetaIndex : public metaIndex

 {
 {

- private:
+private:
+   void * const d;

    std::string DebFile;
    debDebPkgFileIndex *DebIndex;
    std::string DebFile;
    debDebPkgFileIndex *DebIndex;

- public:
+public:

    virtual std::string ArchiveURI(std::string const& /*File*/) const {
       return DebFile;
    }
    virtual std::string ArchiveURI(std::string const& /*File*/) const {
       return DebFile;
    }

-   virtual bool GetIndexes(pkgAcquire* /*Owner*/, const bool& /*GetAll=false*/) const {
+   virtual bool GetIndexes(pkgAcquire* /*Owner*/, const bool& /*GetAll=false*/) {

       return true;
    }
       return true;
    }

+   virtual std::vector<IndexTarget> GetIndexTargets() const {
+      return std::vector<IndexTarget>();
+   }

    virtual std::vector<pkgIndexFile *> *GetIndexFiles() {
       return Indexes;
    }
    virtual bool IsTrusted() const {
       return true;
    }
    virtual std::vector<pkgIndexFile *> *GetIndexFiles() {
       return Indexes;
    }
    virtual bool IsTrusted() const {
       return true;
    }

+   virtual bool Load(std::string const &, std::string * const ErrorText)
+   {
+      LoadedSuccessfully = TRI_NO;
+      if (ErrorText != NULL)
+        strprintf(*ErrorText, "Unparseable metaindex as it represents the standalone deb file %s", DebFile.c_str());
+      return false;
+   }
+   virtual metaIndex * UnloadedClone() const
+   {
+      return NULL;
+   }

    debDebFileMetaIndex(std::string const &DebFile);
    debDebFileMetaIndex(std::string const &DebFile);

-   virtual ~debDebFileMetaIndex() {};
+   virtual ~debDebFileMetaIndex();

 
 };
 
 
 };