summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
Diffstat (limited to 'methods')
-rw-r--r--methods/mirror.cc72
-rw-r--r--methods/mirror.h15
2 files changed, 69 insertions, 18 deletions
diff --git a/methods/mirror.cc b/methods/mirror.cc
index fad076e91..c4d911a3c 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -17,6 +17,8 @@
#include <fstream>
#include <iostream>
+#include <stdarg.h>
+
using namespace std;
#include "mirror.h"
@@ -25,31 +27,50 @@ using namespace std;
/*}}}*/
MirrorMethod::MirrorMethod()
- : pkgAcqMethod("1.2",Pipeline | SendConfig), HasMirrorFile(false)
+ : HttpMethod(), HasMirrorFile(false)
{
#if 0
HasMirrorFile=true;
- BaseUri="http://people.ubuntu.com/~mvo/mirror/mirrors///";
+ BaseUri="mirror://people.ubuntu.com/~mvo/mirror/mirrors";
+ MirrorFile="/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_mirror_mirrors";
Mirror="http://de.archive.ubuntu.com/ubuntu/";
#endif
};
+// HttpMethod::Configuration - Handle a configuration message /*{{{*/
+// ---------------------------------------------------------------------
+/* We stash the desired pipeline depth */
+bool MirrorMethod::Configuration(string Message)
+{
+ if (pkgAcqMethod::Configuration(Message) == false)
+ return false;
+ Debug = _config->FindB("Debug::Acquire::mirror",false);
+
+ return true;
+}
+ /*}}}*/
+
+
bool MirrorMethod::GetMirrorFile(string uri)
{
string Marker = _config->Find("Acquire::Mirror::MagicMarker","///");
BaseUri = uri.substr(0,uri.find(Marker));
- BaseUri.replace(0,strlen("mirror://"),"http://");
+
+ string fetch = BaseUri;
+ fetch.replace(0,strlen("mirror://"),"http://");
MirrorFile = _config->FindDir("Dir::State::lists") + URItoFileName(BaseUri);
- cerr << "base-uri: " << BaseUri << endl;
- cerr << "mirror-file: " << MirrorFile << endl;
+ if(Debug)
+ {
+ cerr << "base-uri: " << BaseUri << endl;
+ cerr << "mirror-file: " << MirrorFile << endl;
+ }
// FIXME: fetch it with curl
pkgAcquire Fetcher;
- new pkgAcqFile(&Fetcher, BaseUri, "", 0, "", "", "", MirrorFile);
+ new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
bool res = (Fetcher.Run() == pkgAcquire::Continue);
- cerr << "fetch-result: " << res << endl;
if(res)
HasMirrorFile = true;
@@ -61,7 +82,9 @@ bool MirrorMethod::SelectMirror()
{
ifstream in(MirrorFile.c_str());
getline(in, Mirror);
- cerr << "Mirror: " << Mirror << endl;
+ if(Debug)
+ cerr << "Using mirror: " << Mirror << endl;
+ return true;
}
// MirrorMethod::Fetch - Fetch an item /*{{{*/
@@ -77,21 +100,42 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
SelectMirror();
}
- // change the items in the queue
- Itm->Uri.replace(0,BaseUri.size()+_config->Find("Acquire::Mirror::MagicMarker","///").size()+2/*len("mirror")-len("http")*/,Mirror);
- cerr << "new Fetch-uri: " << Itm->Uri << endl;
+ if(Queue->Uri.find("mirror://") != string::npos)
+ Queue->Uri.replace(0,BaseUri.size(),Mirror);
- // FIXME: fetch it with!
-
+ // now run the real fetcher
+ return HttpMethod::Fetch(Itm);
};
+void MirrorMethod::Fail(string Err,bool Transient)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::Fail(Err, Transient);
+}
+
+void MirrorMethod::URIStart(FetchResult &Res)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::URIStart(Res);
+}
+
+void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::URIDone(Res, Alt);
+}
+
+
int main()
{
setlocale(LC_ALL, "");
MirrorMethod Mth;
- return Mth.Run();
+ return Mth.Loop();
}
diff --git a/methods/mirror.h b/methods/mirror.h
index ca3428830..91cf8c64f 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -20,17 +20,24 @@ using std::endl;
#include "http.h"
-class MirrorMethod : public pkgAcqMethod
+class MirrorMethod : public HttpMethod
{
FetchResult Res;
- string Mirror;
- string BaseUri;
- string MirrorFile;
+ string BaseUri; // the original mirror://... url
+ string Mirror; // the selected mirror uri (http://...)
+ string MirrorFile; //
bool HasMirrorFile;
+ bool Debug;
+
protected:
bool GetMirrorFile(string uri);
bool SelectMirror();
+ virtual void Fail(string Why, bool Transient = false);
+ virtual void URIStart(FetchResult &Res);
+ virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+ virtual bool Configuration(string Message);
+
public:
MirrorMethod();
virtual bool Fetch(FetchItem *Itm);