diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-09-14 12:53:55 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-09-14 12:53:55 +0200 |
| commit | e2d85f9ab8a4a0ea322ffd74b3d2cf756b4d943c (patch) | |
| tree | f9503e548410bb9e87f4aa2bca39d3cc64f3b7ad /module | |
| parent | better plugin config parsing (diff) | |
| download | pyload-e2d85f9ab8a4a0ea322ffd74b3d2cf756b4d943c.tar.xz | |
reverted, closed #129
Diffstat (limited to 'module')
| -rw-r--r-- | module/PluginManager.py | 7 | ||||
| -rw-r--r-- | module/plugins/hoster/DepositfilesCom.py | 8 | ||||
| -rw-r--r-- | module/plugins/hoster/RapidshareCom.py | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/module/PluginManager.py b/module/PluginManager.py index fe4a94dac..29c01ce21 100644 --- a/module/PluginManager.py +++ b/module/PluginManager.py @@ -30,7 +30,6 @@ from os.path import abspath from sys import version_info from itertools import chain -from ast import literal_eval class PluginManager(): @@ -166,11 +165,7 @@ class PluginManager(): config = self.reConfig.findall(content) if config: - config = literal_eval(config[0].strip().replace("\n", "").replace("\r", "")) - if type(config[0]) == tuple: - config = [list(x) for x in config] - else: - config = [list(config)] + config = [ [y.strip() for y in x.replace("'","").replace('"',"").replace(")","").split(",")] for x in config[0].split("(") if x.strip()] if folder == "hooks": config.append( ["load", "bool", "Load on startup", True if name not in ("XMPPInterface", "MultiHome") else False] ) diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index c0c6dddf8..2ddde5ef1 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -9,7 +9,7 @@ class DepositfilesCom(Hoster): __name__ = "DepositfilesCom" __type__ = "hoster" __pattern__ = r"http://[\w\.]*?depositfiles\.com(/\w{1,3})?/files/[\w]+" - __version__ = "0.3" + __version__ = "0.31" __description__ = """Depositfiles.com Download Hoster""" __author_name__ = ("spoob") __author_mail__ = ("spoob@pyload.org") @@ -36,15 +36,17 @@ class DepositfilesCom(Hoster): self.download(link) def handleFree(self): + tmp_url = self.pyfile.url.replace("/files/","/en/files/") if re.search(r'File is checked, please try again in a minute.', self.html) is not None: self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.") self.setWait(61) self.wait() + self.retry() if re.search(r'Such file does not exist or it has been removed for infringement of copyrights', self.html) is not None: self.offline() - self.html = self.load(self.pyfile.url, post={"gateway_result":"1"}) + self.html = self.load(tmp_url, post={"gateway_result":"1"}) m = re.search(r'Attention! You used up your limit for file downloading! Please try in\s+(\d+) minute', self.html) if m is not None: @@ -55,7 +57,7 @@ class DepositfilesCom(Hoster): #self.wantReconnect = True self.wait() - self.html = self.load(self.pyfile.url, post={"gateway_result":"1"}) + self.html = self.load(tmp_url, post={"gateway_result":"1"}) #wait_time = int(re.search(r'<span id="download_waiter_remain">(.*?)</span>', self.html).group(1)) diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py index 3d40ba9d5..cf8bc9069 100644 --- a/module/plugins/hoster/RapidshareCom.py +++ b/module/plugins/hoster/RapidshareCom.py @@ -40,7 +40,7 @@ class RapidshareCom(Hoster): __pattern__ = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)" __version__ = "1.1" __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"]] + __config__ = [ ("server", "str", "Preferred Server", "None") ] __author_name__ = ("spoob", "RaNaN", "mkaay") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de") |