From ff91b58bf9ee65aaeb048426295af6ad122b119e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 5 Oct 2014 22:14:53 +0200 Subject: Spare code cosmetics --- module/plugins/crypter/DevhostStFolder.py | 2 +- module/plugins/crypter/EasybytezComFolder.py | 2 +- module/plugins/hoster/AlldebridCom.py | 4 ++-- module/plugins/hoster/CzshareCom.py | 4 ++-- module/plugins/hoster/DevhostSt.py | 4 ++-- module/plugins/hoster/DropboxCom.py | 4 ++-- module/plugins/hoster/FastshareCz.py | 5 ++--- module/plugins/hoster/FilepupNet.py | 2 +- module/plugins/hoster/KingfilesNet.py | 4 ++-- module/plugins/hoster/SpeedyshareCom.py | 4 ++-- 10 files changed, 17 insertions(+), 18 deletions(-) (limited to 'module') diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 0d9c032cb..1986f9fd0 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -17,7 +17,7 @@ class DevhostStFolder(SimpleCrypter): __pattern__ = r'http://(?:www\.)?d-h\.st/users/\w+/\?fld_id=\d+' - __description__ = """d-h.st decrypter plugin""" + __description__ = """d-h.st folder decrypter plugin""" __author_name_ = "zapp-brannigan" __author_mail_ = "fuerst.reinje@web.de" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 500f12278..be85a3798 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -10,7 +10,7 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' - __description__ = """Easybytez.com decrypter plugin""" + __description__ = """Easybytez.com folder decrypter plugin""" __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index b1513bbac..44d709b1d 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -78,8 +78,8 @@ class AlldebridCom(Hoster): self.download(new_url, disposition=True) - check = self.checkDownload({"error": "An error occured while processing your request", - "empty": re.compile(r"^$")}) + check = self.checkDownload({'error': "An error occured while processing your request", + 'empty': re.compile(r"^$")}) if check == "error": self.retry(wait_time=60, reason="An error occured while generating link.") diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index df8cfea9e..f7fb119ac 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -128,13 +128,13 @@ class CzshareCom(SimpleHoster): def checkDownloadedFile(self): # check download check = self.checkDownload({ - "tempoffline": re.compile(r"^Soubor je do.*asn.* nedostupn.*$"), + "temp_offline": re.compile(r"^Soubor je do.*asn.* nedostupn.*$"), "credit": re.compile(r"^Nem.*te dostate.*n.* kredit.$"), "multi_dl": re.compile(self.MULTIDL_PATTERN), "captcha_err": "
  • Zadaný ověřovací kód nesouhlasí!
  • " }) - if check == "tempoffline": + if check == "temp_offline": self.fail("File not available - try later") if check == "credit": self.resetAccount() diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py index 088ace93a..b50257238 100644 --- a/module/plugins/hoster/DevhostSt.py +++ b/module/plugins/hoster/DevhostSt.py @@ -41,8 +41,8 @@ class DevhostSt(SimpleHoster): self.logDebug("Download URL = " + dl_url) self.download(dl_url, disposition=True) - check = self.checkDownload({'is_html': re.compile("html")}) - if check == "is_html": + check = self.checkDownload({'html': re.compile("html")}) + if check == "html": self.parseError("Downloaded file is an html file") diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py index 07e251946..e5de6823d 100644 --- a/module/plugins/hoster/DropboxCom.py +++ b/module/plugins/hoster/DropboxCom.py @@ -34,8 +34,8 @@ class DropboxCom(SimpleHoster): def handleFree(self): self.download(self.pyfile.url, get={'dl': "1"}) - check = self.checkDownload({'is_html': re.compile("html")}) - if check == "is_html": + check = self.checkDownload({'html': re.compile("html")}) + if check == "html": self.parseError("Downloaded file is an html file") diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 5a6773af6..7a70baf93 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -48,9 +48,8 @@ class FastshareCz(SimpleHoster): self.download(urljoin(baseurl, action), post={"code": captcha, "btn.x": 77, "btn.y": 18}) check = self.checkDownload({ - "paralell_dl": - "FastShare.cz|