Merge remote-tracking branch 'mvo/bugfix/update-progress-reporting' into debian/exper...

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

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 9692ac94cfaf4ebd1fc5aa63b811c68fa4e87c7f..d572bc5c20b5605cafc775dfb99aabad2a1771a3 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -15,45 +15,65 @@
 #define PKGLIB_DEBRECORDS_H
 
 #include <apt-pkg/pkgrecords.h>
 #define PKGLIB_DEBRECORDS_H
 
 #include <apt-pkg/pkgrecords.h>

-#include <apt-pkg/indexfile.h>

 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/tagfile.h>

+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif

 
 class debRecordParser : public pkgRecords::Parser
 {
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;
 
 class debRecordParser : public pkgRecords::Parser
 {
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;

-
+   
+ protected:

    FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;
    
    FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;
    

-   protected:
-   

    virtual bool Jump(pkgCache::VerFileIterator const &Ver);
    virtual bool Jump(pkgCache::DescFileIterator const &Desc);
    
    virtual bool Jump(pkgCache::VerFileIterator const &Ver);
    virtual bool Jump(pkgCache::DescFileIterator const &Desc);
    

-   public:
+ public:

 
    // These refer to the archive file for the Version
 
    // These refer to the archive file for the Version

-   virtual string FileName();
-   virtual string MD5Hash();
-   virtual string SHA1Hash();
-   virtual string SHA256Hash();
-   virtual string SHA512Hash();
-   virtual string SourcePkg();
-   virtual string SourceVer();
+   virtual std::string FileName();
+   virtual std::string MD5Hash();
+   virtual std::string SHA1Hash();
+   virtual std::string SHA256Hash();
+   virtual std::string SHA512Hash();
+   virtual std::string SourcePkg();
+   virtual std::string SourceVer();

    
    // These are some general stats about the package
    
    // These are some general stats about the package

-   virtual string Maintainer();
-   virtual string ShortDesc();
-   virtual string LongDesc();
-   virtual string Name();
-   virtual string Homepage();
+   virtual std::string Maintainer();
+   virtual std::string ShortDesc();
+   virtual std::string LongDesc();
+   virtual std::string Name();
+   virtual std::string Homepage();
+
+   // An arbitrary custom field
+   virtual std::string RecordField(const char *fieldName);

 
    virtual void GetRec(const char *&Start,const char *&Stop);
    
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    

-   debRecordParser(string FileName,pkgCache &Cache);
+   debRecordParser(std::string FileName,pkgCache &Cache);

    virtual ~debRecordParser() {};
 };
 
    virtual ~debRecordParser() {};
 };
 

+// custom record parser that reads deb files directly
+class debDebFileRecordParser : public debRecordParser
+{
+ public:
+   virtual std::string FileName() {
+      return File.Name();
+   }
+   debDebFileRecordParser(std::string FileName,pkgCache &Cache)
+      : debRecordParser(FileName, Cache) {};
+};
+

 #endif
 #endif