From 381c4d02a900fac224ccaa802db080cf577ed2fb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 12:17:03 +0200 Subject: Fix retry time formats Merges vuolter/pyload@498b9e3 --- module/plugins/hoster/AlldebridCom.py | 4 ++-- module/plugins/hoster/BayfilesCom.py | 4 ++-- module/plugins/hoster/DebridItaliaCom.py | 2 +- module/plugins/hoster/DepositfilesCom.py | 2 +- module/plugins/hoster/FastixRu.py | 4 ++-- module/plugins/hoster/FastshareCz.py | 4 ++-- module/plugins/hoster/FilecloudIo.py | 2 +- module/plugins/hoster/FilefactoryCom.py | 4 ++-- module/plugins/hoster/FilepostCom.py | 4 ++-- module/plugins/hoster/FilerNet.py | 2 +- module/plugins/hoster/FileserveCom.py | 6 +++--- module/plugins/hoster/FreakshareCom.py | 4 ++-- module/plugins/hoster/FshareVn.py | 4 ++-- module/plugins/hoster/Keep2shareCC.py | 2 +- module/plugins/hoster/LuckyShareNet.py | 2 +- module/plugins/hoster/MegasharesCom.py | 8 ++++---- module/plugins/hoster/Premium4Me.py | 2 +- module/plugins/hoster/QuickshareCz.py | 4 ++-- module/plugins/hoster/RealdebridCom.py | 2 +- module/plugins/hoster/ReloadCc.py | 8 ++++---- module/plugins/hoster/ShareRapidCom.py | 4 ++-- module/plugins/hoster/ShareonlineBiz.py | 6 +++--- module/plugins/hoster/SimplydebridCom.py | 2 +- module/plugins/hoster/UploadedTo.py | 2 +- module/plugins/hoster/UploadheroCom.py | 2 +- module/plugins/hoster/UploadingCom.py | 2 +- module/plugins/hoster/XFileSharingPro.py | 2 +- module/plugins/hoster/ZippyshareCom.py | 2 +- 28 files changed, 48 insertions(+), 48 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 7634c2460..13bfb018c 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -78,6 +78,6 @@ class AlldebridCom(Hoster): "empty": re.compile(r"^$")}) if check == "error": - self.retry(reason="An error occured while generating link.", wait_time=60) + self.retry(wait_time=60, reason="An error occured while generating link.") elif check == "empty": - self.retry(reason="Downloaded File was empty.", wait_time=60) + self.retry(wait_time=60, reason="Downloaded File was empty.") diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py index 849370f3f..f1b36221f 100644 --- a/module/plugins/hoster/BayfilesCom.py +++ b/module/plugins/hoster/BayfilesCom.py @@ -90,9 +90,9 @@ class BayfilesCom(SimpleHoster): "notfound": re.compile(r"404 Not Found") }) if check == "waitforfreeslots": - self.retry(30, 60 * 5, "Wait for free slot") + self.retry(30, 5 * 60, "Wait for free slot") elif check == "notfound": - self.retry(30, 60 * 5, "404 Not found") + self.retry(30, 5 * 60, "404 Not found") getInfo = create_getInfo(BayfilesCom) diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 9b8dfa383..a27e1a0ef 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -58,4 +58,4 @@ class DebridItaliaCom(Hoster): check = self.checkDownload({"empty": re.compile(r"^$")}) if check == "empty": - self.retry(5, 120, 'Empty file downloaded') + self.retry(5, 2 * 60, "Empty file downloaded") diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index 20d88f8a0..f1b3d18e5 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -103,7 +103,7 @@ class DepositfilesCom(SimpleHoster): def handlePremium(self): if '' in self.html: self.logWarning("Download limit reached") - self.retry(25, 3600, "Download limit reached") + self.retry(25, 60 * 60, "Download limit reached") elif 'onClick="show_gold_offer' in self.html: self.account.relogin(self.user) self.retry() diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 39091d769..ef8838f8e 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -61,6 +61,6 @@ class FastixRu(Hoster): "empty": re.compile(r"^$")}) if check == "error": - self.retry(reason="An error occurred while generating link.", wait_time=60) + self.retry(wait_time=60, reason="An error occurred while generating link.") elif check == "empty": - self.retry(reason="Downloaded File was empty.", wait_time=60) + self.retry(wait_time=60, reason="Downloaded File was empty.") diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 93fbad6be..4418aa29c 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -66,9 +66,9 @@ class FastshareCz(SimpleHoster): }) if check == "paralell_dl": - self.retry(6, 600, "Paralell download") + self.retry(6, 10 * 60, "Paralell download") elif check == "wrong_captcha": - self.retry(5, 1, "Wrong captcha") + self.retry(max_tries=5, reason="Wrong captcha") def handlePremium(self): header = self.load(self.pyfile.url, just_header=True) diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index 8ccef67e1..dbf925c14 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -63,7 +63,7 @@ class FilecloudIo(SimpleHoster): self.account.form_data = {"recaptcha_challenge_field": captcha_challenge, "recaptcha_response_field": captcha_response} self.account.relogin(self.user) - self.retry(max_tries=2) + self.retry(2) json_url = "http://filecloud.io/download-request.json" response = self.load(json_url, post=data) diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 8e0bd2494..97204a1a2 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -39,7 +39,7 @@ class FilefactoryCom(SimpleHoster): if "Currently only Premium Members can download files larger than" in self.html: self.fail("File too large for free download") elif "All free download slots on this server are currently in use" in self.html: - self.retry(50, 900, "All free slots are busy") + self.retry(50, 15 * 60, "All free slots are busy") m = re.search(r'data-href-direct="(http://[^"]+)"', self.html) if m: @@ -80,7 +80,7 @@ class FilefactoryCom(SimpleHoster): if check == "multiple": self.logDebug("Parallel downloads detected; waiting 15 minutes") - self.retry(wait_time=15 * 60, reason='Parallel downloads') + self.retry(wait_time=15 * 60, reason="Parallel downloads") elif check == "error": self.fail("Unknown error") diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index 1deec2c18..e18455255 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -122,8 +122,8 @@ class FilepostCom(SimpleHoster): # see the two lines commented out with "# ~?". if 'error' in json_response['js']: if json_response['js']['error'] == 'download_delay': - self.retry(json_response['js']['params']['next_download']) - # ~? self.retry(js_answer['params']['next_download']) + self.retry(wait_time=json_response['js']['params']['next_download']) + # ~? self.retry(wait_time=js_answer['params']['next_download']) elif 'Wrong file password' in json_response['js']['error']: return None elif 'You entered a wrong CAPTCHA code' in json_response['js']['error']: diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index 3a9251fb3..5eaa19785 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -55,7 +55,7 @@ class FilerNet(SimpleHoster): m = re.search(r'musst du (\d+) Sekunden warten', self.html) if m: waittime = int(m.group(1)) - self.retry(3, waittime, 'Wait between free downloads') + self.retry(3, waittime, "Wait between free downloads") self.getFileInfo() diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 6697c133f..30471d69f 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -133,9 +133,9 @@ class FileserveCom(Hoster): self.doLongWait(self.lastCheck) elif check == "limit": #download limited reached for today (not a exact time known) - self.setWait(180 * 60, True) # wait 3 hours + self.setWait(3 * 60 * 60, True) # wait 3 hours #TO-DO: resolve waittime using UnrestrictLi's secondsToMidnight self.wait() - self.retry(max_tries=0) + self.retry() self.thread.m.reconnecting.wait(3) # Ease issue with later downloads appearing to be in parallel @@ -178,7 +178,7 @@ class FileserveCom(Hoster): self.fail("Invalid captcha") def doLongWait(self, m): - wait_time = (int(m.group(1)) * {'seconds': 1, 'minutes': 60, 'hours': 3600}[m.group(2)]) if m else 720 + wait_time = (int(m.group(1)) * {'seconds': 1, 'minutes': 60, 'hours': 3600}[m.group(2)]) if m else 12 * 60 self.setWait(wait_time, True) self.wait() self.retry() diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 2dcd9ee48..f4ed4958f 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -53,7 +53,7 @@ class FreakshareCom(Hoster): self.invalidCaptcha() self.retry() elif check == "downloadserver": - self.retry(5, 900, 'No Download server') + self.retry(5, 15 * 60, "No Download server") def prepare(self): pyfile = self.pyfile @@ -123,7 +123,7 @@ class FreakshareCom(Hoster): if "Your Traffic is used up for today" in self.html: self.wantReconnect = True - return 24 * 3600 + return 24 * 60 * 60 timestring = re.search('\s*var\s(?:downloadWait|time)\s=\s(\d*)[.\d]*;', self.html) if timestring: diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 6b73f1975..34539f965 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -100,12 +100,12 @@ class FshareVn(SimpleHoster): if found: self.logInfo("Wait until %s ICT" % found.group(1)) wait_until = mktime(strptime(found.group(1), "%d/%m/%Y %H:%M")) - self.setWait(wait_until - mktime(gmtime()) - 7 * 3600, True) + self.setWait(wait_until - mktime(gmtime()) - 7 * 60 * 60, True) self.wait() self.retry() elif '