merge lp:~mvo/apt/ubuntu-mirror-method-improvements

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index ad58dee0aae7b76b5337ee2ff77d50036df174b7..3123a7f466e220fa000384e973284ce215591a31 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -19,8 +19,10 @@
 #include <iostream>
 #include <vector>
 #include <map>
 #include <iostream>
 #include <vector>
 #include <map>

+#include <set>

 
 #include "cachedb.h"
 
 #include "cachedb.h"

+#include "multicompress.h"

 #include "override.h"
 #include "apt-ftparchive.h"
 
 #include "override.h"
 #include "apt-ftparchive.h"
 


@@ -34,8 +36,8 @@ class FTWScanner
 {
    protected:
    vector<string> Patterns;
 {
    protected:
    vector<string> Patterns;

+   string Arch;

    const char *OriginalPath;
    const char *OriginalPath;

-   char *RealPath;

    bool ErrorPrinted;
    
    // Stuff for the delinker
    bool ErrorPrinted;
    
    // Stuff for the delinker


@@ -69,8 +71,25 @@ class FTWScanner
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
    bool SetExts(string const &Vals);
       
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
    bool SetExts(string const &Vals);
       

-   FTWScanner();
-   virtual ~FTWScanner() {delete [] RealPath;};
+   FTWScanner(string const &Arch = string());
+};
+
+class TranslationWriter
+{
+   MultiCompress *Comp;
+   FILE *Output;
+   std::set<string> Included;
+   unsigned short RefCounter;
+
+   public:
+   void IncreaseRefCounter() { ++RefCounter; };
+   unsigned short DecreaseRefCounter() { return (RefCounter == 0) ? 0 : --RefCounter; };
+   unsigned short GetRefCounter() const { return RefCounter; };
+   bool DoPackage(string const &Pkg, string const &Desc, string const &MD5);
+
+   TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions);
+   TranslationWriter() : Comp(NULL), Output(NULL), RefCounter(0) {};
+   ~TranslationWriter();

 };
 
 class PackagesWriter : public FTWScanner
 };
 
 class PackagesWriter : public FTWScanner


@@ -94,7 +113,7 @@ class PackagesWriter : public FTWScanner
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;

-   string Arch;
+   TranslationWriter *TransWriter;

 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 
 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 


@@ -127,7 +146,7 @@ class ContentsWriter : public FTWScanner
    void Finish() {Gen.Print(Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
    
    void Finish() {Gen.Print(Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
    

-   ContentsWriter(string const &DB);
+   ContentsWriter(string const &DB, string const &Arch = string());

    virtual ~ContentsWriter() {};
 };
 
    virtual ~ContentsWriter() {};
 };