fixed proxy support, downloadCheck function

3 files changed, 13 insertions, 14 deletions

diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 3712bb8d5..4d3a2a566 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -47,15 +47,20 @@ class MegauploadCom(Hoster):
     __name__ = "MegauploadCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?(megaupload)\.com/.*?(\?|&)d=[0-9A-Za-z]+"
-    __version__ = "0.1"
+    __version__ = "0.2"
     __description__ = """Megaupload.com Download Hoster"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
 
     def setup(self):
         self.html = [None, None]
-        self.multiDL = False
+        if self.account:
+            self.multiDL = True
+            self.req.canContinue = True
+        else:
+            self.multiDL = False
         self.api = {}
+
         
     def process(self, pyfile):
         self.pyfile = pyfile
@@ -117,19 +122,14 @@ class MegauploadCom(Hoster):
         post = {"id0": id}
 
         api = self.load(url, {}, post)
+        self.log.debug("MU API: %s" % api)
         api = [x.split("&") for x in re.split(r"&?(?=id[\d]+=)", api)]
 
         for data in api:
             if data[0].startswith("id"):
                 tmp = [x.split("=") for x in data]
-                if tmp[2][1] == "3":
-                    status = 3
-                elif tmp[0][1] == "0":
-                    status = 2
-                elif tmp[0][1] == "1":
+                if tmp[0][1] == "1":
                     self.offline()
-                else:
-                    status = 3
 
                 name = tmp[3][1]
                 #size = tmp[1][1]
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 8461482ad..ce7697943 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -19,7 +19,7 @@ class OneFichierCom(Hoster):
         self.multiDL = False
 
     def process(self, pyfile):
-        self.pyfile = pyfile      
+
         self.download_html()
 
         if not self.file_exists():
@@ -30,7 +30,6 @@ class OneFichierCom(Hoster):
         pyfile.size = self.get_file_size()
         
         url = self.get_file_url()
-        self.pyfile.setStatus("downloading")
         self.download(url)
 
     def download_html(self):
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index ab99a97f0..f7ee287bc 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -47,14 +47,14 @@ class RapidshareCom(Hoster):
     __name__ = "RapidshareCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>.+)|#!download\|(?:\d+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
-    __version__ = "1.3"
+    __version__ = "1.31"
     __description__ = """Rapidshare.com Download Hoster"""
     __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]] 
     __author_name__ = ("spoob", "RaNaN", "mkaay")
     __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
 
     def setup(self):
-        self.html = [None, None]
+        self.html = None
         self.no_download = True
         self.api_data = None
         self.multiDL = False
@@ -190,7 +190,7 @@ class RapidshareCom(Hoster):
     def freeWait(self):
         """downloads html with the important informations
         """
-        self.html[1] = self.load(self.pyfile.url,ref=False)
+        self.html = self.load("http://rapidshare.com/files/%s/%s" % (self.id, self.name),ref=False)
 
         sleep(1)