merge lp:~mvo/apt/sha512-template to get fixes for the

[apt.git] / methods / mirror.h

diff --git a/methods/mirror.h b/methods/mirror.h
index 91cf8c64f5f2c97df88e257eaf776c93d0d96076..97d18144a49bfbc64440941c58fc6f3b6ea54344 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -23,16 +23,26 @@ using std::endl;
 class MirrorMethod : public HttpMethod
 {
    FetchResult Res;
 class MirrorMethod : public HttpMethod
 {
    FetchResult Res;

+   // we simply transform between BaseUri and Mirror

    string BaseUri;    // the original mirror://... url
    string Mirror;     // the selected mirror uri (http://...)
    string BaseUri;    // the original mirror://... url
    string Mirror;     // the selected mirror uri (http://...)

-   string MirrorFile; // 
-   bool HasMirrorFile;
+   vector<string> AllMirrors; // all available mirrors
+   string MirrorFile; // the file that contains the list of mirrors
+   bool DownloadedMirrorFile; // already downloaded this session
+   string Dist;       // the target distrubtion (e.g. sid, oneiric)

 
    bool Debug;
 
  protected:
 
    bool Debug;
 
  protected:

-   bool GetMirrorFile(string uri);
-   bool SelectMirror();
+   bool DownloadMirrorFile(string uri);
+   bool RandomizeMirrorFile(string file);
+   string GetMirrorFileName(string uri);
+   bool InitMirrors();
+   bool TryNextMirror();
+   void CurrentQueueUriToMirror();
+   bool Clean(string dir);
+   
+   // we need to overwrite those to transform the url back

    virtual void Fail(string Why, bool Transient = false);
    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
    virtual void Fail(string Why, bool Transient = false);
    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);