Don't download "optional" files not in Release :/.

[apt.git] / apt-pkg / cacheiterators.h

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 0647e39f16f506d27e6cef14ef7c3437bca3b935..e594f3e7df5331d10397d2b3de406db1697d671f 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -35,6 +35,9 @@
 #include<iterator>
 #include <iosfwd>
 #include <string>
 #include<iterator>
 #include <iosfwd>
 #include <string>

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+#include <apt-pkg/string_view.h>
+#endif

 
 #include<string.h>
 
 
 #include<string.h>
 


@@ -54,7 +57,7 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
        Str* OwnerPointer() const { return static_cast<Itr const*>(this)->OwnerPointer(); }
 
        protected:
        Str* OwnerPointer() const { return static_cast<Itr const*>(this)->OwnerPointer(); }
 
        protected:

-       Str *S;
+       Str *volatile S;

        pkgCache *Owner;
 
        public:
        pkgCache *Owner;
 
        public:


@@ -114,6 +117,10 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+       APT_HIDDEN PkgIterator FindPkg(APT::StringView Arch = APT::StringView("any", 3)) const;
+       APT_HIDDEN PkgIterator FindPkg(const char *Arch) const;
+#endif

        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first
        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first


@@ -168,11 +175,11 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        inline DepIterator RevDependsList() const APT_PURE;
        inline PrvIterator ProvidesList() const APT_PURE;
        OkState State() const APT_PURE;
        inline DepIterator RevDependsList() const APT_PURE;
        inline PrvIterator ProvidesList() const APT_PURE;
        OkState State() const APT_PURE;

-       const char *CandVersion() const APT_PURE;
+       APT_DEPRECATED_MSG("This method does not respect apt_preferences! Use pkgDepCache::GetCandidateVersion(Pkg)") const char *CandVersion() const APT_PURE;

        const char *CurVersion() const APT_PURE;
 
        //Nice printable representation
        const char *CurVersion() const APT_PURE;
 
        //Nice printable representation

-       friend std::ostream& operator <<(std::ostream& out, PkgIterator i);
+       APT_DEPRECATED_MSG("Use APT::PrettyPkg instead") friend std::ostream& operator <<(std::ostream& out, PkgIterator i);

        std::string FullName(bool const &Pretty = false) const;
 
        // Constructors
        std::string FullName(bool const &Pretty = false) const;
 
        // Constructors


@@ -207,6 +214,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}

+       inline const char *Display() const {return S->Display == 0?0:Owner->StrP + S->Display;}

        /** \brief source package name this version comes from
           Always contains the name, even if it is the same as the binary name */
        inline const char *SourcePkgName() const {return Owner->StrP + S->SourcePkgName;}
        /** \brief source package name this version comes from
           Always contains the name, even if it is the same as the binary name */
        inline const char *SourcePkgName() const {return Owner->StrP + S->SourcePkgName;}


@@ -224,6 +232,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        DescIterator TranslatedDescription() const;
        inline DepIterator DependsList() const;
        inline PrvIterator ProvidesList() const;
        DescIterator TranslatedDescription() const;
        inline DepIterator DependsList() const;
        inline PrvIterator ProvidesList() const;

+       inline TagIterator TagList() const;

        inline VerFileIterator FileList() const;
        bool Downloadable() const;
        inline const char *PriorityType() const {return Owner->Priority(S->Priority);}
        inline VerFileIterator FileList() const;
        bool Downloadable() const;
        inline const char *PriorityType() const {return Owner->Priority(S->Priority);}


@@ -240,6 +249,33 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        inline VerIterator() : Iterator<Version, VerIterator>() {}
 };
                                                                        /*}}}*/
        inline VerIterator() : Iterator<Version, VerIterator>() {}
 };
                                                                        /*}}}*/

+// Tag Iterator                                                                /*{{{*/
+class pkgCache::TagIterator : public Iterator<Tag, TagIterator> {
+       public:
+       inline Tag* OwnerPointer() const {
+               return (Owner != 0) ? Owner->TagP : 0;
+       }
+
+   // Iteration
+   void operator ++(int) {if (S != Owner->TagP) S = Owner->TagP + S->NextTag;};
+   inline void operator ++() {operator ++(0);};
+
+   // Comparison
+   inline bool operator ==(const TagIterator &B) const {return S == B.S;};
+   inline bool operator !=(const TagIterator &B) const {return S != B.S;};
+   int CompareTag(const TagIterator &B) const;
+
+   // Accessors
+   inline const char *Name() const {return Owner->StrP + S->Name;};
+   inline unsigned long Index() const {return S - Owner->TagP;};
+
+       inline TagIterator(pkgCache &Owner,Tag *Trg = 0) : Iterator<Tag, TagIterator>(Owner, Trg) {
+               if (S == 0)
+                       S = OwnerPointer();
+       }
+       inline TagIterator() : Iterator<Tag, TagIterator>() {}
+};
+                                                                       /*}}}*/

 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
        public:
 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
        public:


@@ -336,7 +372,7 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        }
 
        //Nice printable representation
        }
 
        //Nice printable representation

-       friend std::ostream& operator <<(std::ostream& out, DepIterator D);
+       APT_DEPRECATED_MSG("Use APT::PrettyDep instead") friend std::ostream& operator <<(std::ostream& out, DepIterator D);

 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
                Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {
 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
                Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {


@@ -508,6 +544,8 @@ inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
        {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}
 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
        {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}
        {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}
 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
        {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}

+inline pkgCache::TagIterator pkgCache::VerIterator::TagList() const
+       {return TagIterator(*Owner,Owner->TagP + S->TagList);};

 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
        {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}
 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
        {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}
 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const