diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-12-14 16:16:10 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-12-27 21:20:55 +0100 |
| commit | b8387e72fd3e679db00e03ebd3e3863bfbe8584a (patch) | |
| tree | 71ae1fa66d8e0e24a4dd6d4edda118b8a673e8ef | |
| parent | [accounts] Strict comparison for numbers (diff) | |
| download | pyload-b8387e72fd3e679db00e03ebd3e3863bfbe8584a.tar.xz | |
[crypters] Remove create_getInfo + minor code cosmetics (w/ strict comparison for numbers)
86 files changed, 91 insertions, 349 deletions
diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index 959be9772..cc722fe3e 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class BitshareComFolder(SimpleCrypter): @@ -23,6 +23,3 @@ class BitshareComFolder(SimpleCrypter): LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>' NAME_PATTERN = r'View public folder "(?P<N>.+?)"</h1>' - - -getInfo = create_getInfo(BitshareComFolder) diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 867bd3455..b00fa1eae 100644 --- a/module/plugins/crypter/C1NeonCom.py +++ b/module/plugins/crypter/C1NeonCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class C1NeonCom(DeadCrypter): @@ -15,6 +15,3 @@ class C1NeonCom(DeadCrypter): __description__ = """C1neon.com decrypter plugin""" __license__ = "GPLv3" __authors__ = [("godofdream", "soilfiction@gmail.com")] - - -getInfo = create_getInfo(C1NeonCom) diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 2696339d0..b636cfaf6 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class ChipDe(Crypter): @@ -33,6 +33,3 @@ class ChipDe(Crypter): else: self.links = [f.group(1)] self.log_debug("The file URL is %s" % self.links[0]) - - -getInfo = create_getInfo(ChipDe) diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index ffe32bab2..3b74ccb06 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class CloudzillaToFolder(SimpleCrypter): @@ -38,6 +38,3 @@ class CloudzillaToFolder(SimpleCrypter): if re.search(self.PASSWORD_PATTERN, self.data): self.retry(msg="Wrong password") - - -getInfo = create_getInfo(CloudzillaToFolder) diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 49fa3582e..1c3a7bcf1 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class CrockoComFolder(SimpleCrypter): @@ -22,6 +22,3 @@ class CrockoComFolder(SimpleCrypter): LINK_PATTERN = r'<td class="last"><a href="(.+?)">download</a>' - - -getInfo = create_getInfo(CrockoComFolder) diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index a71aaadd7..c30595f29 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class CryptItCom(DeadCrypter): @@ -15,6 +15,3 @@ class CryptItCom(DeadCrypter): __description__ = """Crypt-it.com decrypter plugin""" __license__ = "GPLv3" __authors__ = [("jeix", "jeix@hasnomail.de")] - - -getInfo = create_getInfo(CryptItCom) diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index c6cf0d3a7..f69cf4d07 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): @@ -34,6 +34,3 @@ class CzshareComFolder(Crypter): self.error(_("FOLDER_PATTERN not found")) self.links.extend(re.findall(self.LINK_PATTERN, m.group(1))) - - -getInfo = create_getInfo(CzshareComFolder) diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index a2b2f0492..d31cd3e10 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -3,7 +3,7 @@ import re import urlparse -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.internal.misc import fsjoin, json @@ -104,6 +104,3 @@ class DailymotionComFolder(Crypter): p_folder = fsjoin(self.pyload.config.get("general", "download_folder"), p_owner, p_name) self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) self.packages.append((p_name, p_videos, p_folder)) #@NOTE: Folder is NOT recognized by pyload 0.4.9! - - -getInfo = create_getInfo(DailymotionComFolder) diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index 76d083d2a..148e1ce81 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class DataHuFolder(SimpleCrypter): @@ -42,6 +42,3 @@ class DataHuFolder(SimpleCrypter): if u'Hib\xe1s jelsz\xf3' in self.data: #: Wrong password self.fail(_("Wrong password")) - - -getInfo = create_getInfo(DataHuFolder) diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index 6303ea797..62751503b 100644 --- a/module/plugins/crypter/DdlstorageComFolder.py +++ b/module/plugins/crypter/DdlstorageComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class DdlstorageComFolder(DeadCrypter): @@ -16,6 +16,3 @@ class DdlstorageComFolder(DeadCrypter): __license__ = "GPLv3" __authors__ = [("godofdream", "soilfiction@gmail.com"), ("stickell", "l.stickell@yahoo.it")] - - -getInfo = create_getInfo(DdlstorageComFolder) diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 6a4d106ca..790ff23e1 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class DepositfilesComFolder(SimpleCrypter): @@ -22,6 +22,3 @@ class DepositfilesComFolder(SimpleCrypter): LINK_PATTERN = r'<div class="progressName".*?>\s*<a href="(.+?)" title=".+?" target="_blank">' - - -getInfo = create_getInfo(DepositfilesComFolder) diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index c690c71b4..e8142e9fe 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -6,7 +6,7 @@ import re import urlparse -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class DevhostStFolder(SimpleCrypter): @@ -63,6 +63,3 @@ class DevhostStFolder(SimpleCrypter): self.log_debug("File name: %s" % self.pyfile.name, "File folder: %s" % self.pyfile.name) - - -getInfo = create_getInfo(DevhostStFolder) diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index 06904d593..f9b6b1834 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -4,7 +4,7 @@ import base64 import re import time -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class DlProtectCom(SimpleCrypter): @@ -42,7 +42,7 @@ class DlProtectCom(SimpleCrypter): i = base64.b64decode(i) # Split information infos = i.split('|') - assert(len(infos) == 4) + assert(len(infos) is 4) res = infos[0] user_agent = infos[1] plugins = [x.split(';') for x in infos[2].split('&')] @@ -123,6 +123,3 @@ class DlProtectCom(SimpleCrypter): # Filters interesting urls from ads return re.findall(r'<a href="(?P<id>[^/].+?)" target="_blank">(?P=id)</a>', self.data) - - -getInfo = create_getInfo(DlProtectCom) diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 7b7a53b52..1835bbba6 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -4,7 +4,7 @@ import re import BeautifulSoup -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): @@ -60,6 +60,3 @@ class DuckCryptInfo(Crypter): self.links = [soup.find("iframe")['src']] if not self.links: self.log_info(_("No link found")) - - -getInfo = create_getInfo(DuckCryptInfo) diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index 734008602..3f96012ca 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class DuploadOrgFolder(DeadCrypter): @@ -15,6 +15,3 @@ class DuploadOrgFolder(DeadCrypter): __description__ = """Dupload.org folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("stickell", "l.stickell@yahoo.it")] - - -getInfo = create_getInfo(DuploadOrgFolder) diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index acf14ac2e..a96c4552b 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo +from module.plugins.internal.XFSCrypter import XFSCrypter class EasybytezComFolder(XFSCrypter): @@ -24,6 +24,3 @@ class EasybytezComFolder(XFSCrypter): PLUGIN_DOMAIN = "easybytez.com" LOGIN_ACCOUNT = True - - -getInfo = create_getInfo(EasybytezComFolder) diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 75b684e4e..63ba6cb21 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.network.HTTPRequest import BadHeader @@ -62,6 +62,3 @@ class EmbeduploadCom(Crypter): except BadHeader: pass return new_links - - -getInfo = create_getInfo(EmbeduploadCom) diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 7cd181cfe..ed2abf7ce 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class FilebeerInfoFolder(DeadCrypter): @@ -15,6 +15,3 @@ class FilebeerInfoFolder(DeadCrypter): __description__ = """Filebeer.info folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(FilebeerInfoFolder) diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 111fa4013..99a0cb251 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FilecloudIoFolder(SimpleCrypter): @@ -23,6 +23,3 @@ class FilecloudIoFolder(SimpleCrypter): LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title' NAME_PATTERN = r'>(?P<N>.+?) - filecloud\.io<' - - -getInfo = create_getInfo(FilecloudIoFolder) diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 7b3c633ff..4a9328593 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -9,7 +9,7 @@ import urlparse import Crypto.Cipher -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.captcha.ReCaptcha import ReCaptcha from module.plugins.captcha.SolveMedia import SolveMedia @@ -210,6 +210,3 @@ class FilecryptCc(Crypter): links = filter(bool, text.split('\n')) return links - - -getInfo = create_getInfo(FilecryptCc) diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index a4f1abc59..f3a4e234b 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FilefactoryComFolder(SimpleCrypter): @@ -30,6 +30,3 @@ class FilefactoryComFolder(SimpleCrypter): def load_page(self, page_n): return self.load(self.pyfile.url, get={'page': page_n, 'show': 100}) - - -getInfo = create_getInfo(FilefactoryComFolder) diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 70cbf3cee..3cd907c10 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -1,6 +1,6 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FilerNetFolder(SimpleCrypter): @@ -26,6 +26,3 @@ class FilerNetFolder(SimpleCrypter): NAME_PATTERN = r'<h3>(?P<N>.+?) - <small' OFFLINE_PATTERN = r'Nicht gefunden' - - -getInfo = create_getInfo(FilerNetFolder) diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 8b0de7e77..abdeac515 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): @@ -39,6 +39,3 @@ class FileserveComFolder(Crypter): if new_links: self.links = [map(lambda s: "http://fileserve.com%s" % s, new_links)] - - -getInfo = create_getInfo(FileserveComFolder) diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index 4217fa0c7..088c3ad82 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class FilesonicComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class FilesonicComFolder(DeadCrypter): __description__ = """Filesonic.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(FilesonicComFolder) diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 2841c5b5d..c11260ac9 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FilestubeCom(SimpleCrypter): @@ -23,6 +23,3 @@ class FilestubeCom(SimpleCrypter): LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)' NAME_PATTERN = r'<h1\s*> (?P<N>.+?) download\s*</h1>' - - -getInfo = create_getInfo(FilestubeCom) diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 0dbdbeffa..c90659bba 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FiletramCom(SimpleCrypter): @@ -24,6 +24,3 @@ class FiletramCom(SimpleCrypter): LINK_PATTERN = r'\s+(http://.+)' NAME_PATTERN = r'<title>(?P<N>.+?) - Free Download' - - -getInfo = create_getInfo(FiletramCom) diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 48e0494a5..b51c74845 100644 --- a/module/plugins/crypter/FiredriveComFolder.py +++ b/module/plugins/crypter/FiredriveComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class FiredriveComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class FiredriveComFolder(DeadCrypter): __description__ = """Firedrive.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - - -getInfo = create_getInfo(FiredriveComFolder) diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index e038c2778..c63800e19 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -5,7 +5,7 @@ import re import urlparse -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): @@ -29,6 +29,3 @@ class FourChanOrg(Crypter): pagehtml = self.load(pyfile.url) images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]+)', pagehtml)) self.links = [urlparse.urljoin("http://", image) for image in images] - - -getInfo = create_getInfo(FourChanOrg) diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 01c6194b6..e8b71d99b 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FreakhareComFolder(SimpleCrypter): @@ -40,6 +40,3 @@ class FreakhareComFolder(SimpleCrypter): 'entrys': '20', 'page': page_n - 1, 'order': ''}) - - -getInfo = create_getInfo(FreakhareComFolder) diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index bef9fe7e8..b2ddf8151 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FreetexthostCom(SimpleCrypter): @@ -29,6 +29,3 @@ class FreetexthostCom(SimpleCrypter): self.error(_("Unable to extract links")) links = m.group(1) return links.strip().split("<br />\r\n") - - -getInfo = create_getInfo(FreetexthostCom) diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 170f9e770..be89fac86 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FshareVnFolder(SimpleCrypter): @@ -22,6 +22,3 @@ class FshareVnFolder(SimpleCrypter): LINK_PATTERN = r'<li class="w_80pc"><a href="(.+?)" target="_blank">' - - -getInfo = create_getInfo(FshareVnFolder) diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index a21c19c33..f441c7666 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class FurLy(SimpleCrypter): @@ -25,6 +25,3 @@ class FurLy(SimpleCrypter): LINK_PATTERN = r'urls\[\d+\] = "(.+?)"' OFFLINE_PATTERN = r'var output;\s*var total' - - -getInfo = create_getInfo(FurLy) diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index 8e928789c..5d61d3a14 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -3,7 +3,7 @@ import re import urlparse -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.plugins.internal.misc import json @@ -41,7 +41,7 @@ class Go4UpCom(SimpleCrypter): if hosterslink_re: hosters = self.load(urlparse.urljoin("http://go4up.com/", hosterslink_re.group(1))) for hoster in json.loads(hosters): - if preference != 0 and preference != int(hoster["hostId"]): + if preference is not 0 and preference != int(hoster["hostId"]): continue pagelink_re = re.search(self.LINK_PATTERN, hoster["link"]) if pagelink_re: @@ -51,6 +51,3 @@ class Go4UpCom(SimpleCrypter): links.append(link_re.group(1)) return links - - -getInfo = create_getInfo(Go4UpCom) diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 1a44d461f..48abfd8f4 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.plugins.internal.misc import json @@ -33,6 +33,3 @@ class GooGl(SimpleCrypter): self.log_debug("JSON data: " + rep) rep = json.loads(rep) return [rep['longUrl']] if "longUrl" in rep else None - - -getInfo = create_getInfo(GooGl) diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index 895ec7e41..9c92de781 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -* -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class GoogledriveComFolder(SimpleCrypter): @@ -24,6 +24,3 @@ class GoogledriveComFolder(SimpleCrypter): NAME_PATTERN = r"folderName: '(?P<N>.+?)'" LINK_PATTERN = r'\[,"\w+"(?:,,".+?")?,"(.+?)"' OFFLINE_PATTERN = r'<TITLE>' - - -getInfo = create_getInfo(GoogledriveComFolder) diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 7a470b0e7..bd07f0ea8 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -4,7 +4,7 @@ import re import BeautifulSoup -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): @@ -63,6 +63,3 @@ class HoerbuchIn(Crypter): links.append(self.req.lastEffectiveURL) return links - - -getInfo = create_getInfo(HoerbuchIn) diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index bcd607967..a97fdf3f1 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/module/plugins/crypter/HotfileComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class HotfileComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class HotfileComFolder(DeadCrypter): __description__ = """Hotfile.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org")] - - -getInfo = create_getInfo(HotfileComFolder) diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index 1bd789398..e3c0c644c 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class ILoadTo(DeadCrypter): @@ -15,6 +15,3 @@ class ILoadTo(DeadCrypter): __description__ = """Iload.to decrypter plugin""" __license__ = "GPLv3" __authors__ = [("hzpz", None)] - - -getInfo = create_getInfo(ILoadTo) diff --git a/module/plugins/crypter/ImgurCom.py b/module/plugins/crypter/ImgurCom.py index 7dd922977..1920834c6 100644 --- a/module/plugins/crypter/ImgurCom.py +++ b/module/plugins/crypter/ImgurCom.py @@ -1,6 +1,6 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.plugins.internal.misc import uniqify @@ -29,6 +29,3 @@ class ImgurCom(SimpleCrypter): def get_links(self): f = lambda url: "http://" + re.sub(r'(\w{7})s\.', r'\1.', url) return uniqify(map(f, re.findall(self.LINK_PATTERN, self.data))) - - -getInfo = create_getInfo(ImgurCom) diff --git a/module/plugins/crypter/JDlist.py b/module/plugins/crypter/JDlist.py index dac75012a..c4e65dd80 100644 --- a/module/plugins/crypter/JDlist.py +++ b/module/plugins/crypter/JDlist.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class JDlist(Crypter): @@ -22,6 +22,3 @@ class JDlist(Crypter): def decrypt(self, pyfile): self.links.extend(self.info['pattern']['LIST'].decode('base64').split(',')) - - -getInfo = create_getInfo(JDlist) diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index e5c06eaca..8127e724e 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): @@ -35,6 +35,3 @@ class LetitbitNetFolder(Crypter): self.error(_("FOLDER_PATTERN not found")) self.links.extend(re.findall(self.LINK_PATTERN, folder.group(0))) - - -getInfo = create_getInfo(LetitbitNetFolder) diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 55d4e4d92..fb080eeb3 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -6,8 +6,8 @@ import re import Crypto.Cipher import pycurl -from module.plugins.internal.Crypter import Crypter, create_getInfo -from module.plugins.internal.misc import html_unescape +from module.plugins.internal.Crypter import Crypter +from module.plugins.internal.misc import html_unescape, set_cookie(cj class LinkCryptWs(Crypter): @@ -39,7 +39,7 @@ class LinkCryptWs(Crypter): #: Init self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') - self.req.cj.setCookie("linkcrypt.ws", "language", "en") + set_cookie(req.cj, "linkcrypt.ws", "language", "en") #: Request package self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko") #: Better chance to not get those key-captchas @@ -315,6 +315,3 @@ class LinkCryptWs(Crypter): self.log_debug("Package has %d links" % len(links)) return links - - -getInfo = create_getInfo(LinkCryptWs) diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 8973f1064..50c0c517f 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class LinkSaveIn(SimpleCrypter): @@ -24,6 +24,3 @@ class LinkSaveIn(SimpleCrypter): COOKIES = [("linksave.in", "Linksave_Language", "english")] OFFLINE_PATTERN = r'>(Error )?404 -' - - -getInfo = create_getInfo(LinkSaveIn) diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 8342c1e16..9f3036c11 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -3,7 +3,7 @@ import re import urlparse -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class LixIn(Crypter): @@ -61,6 +61,3 @@ class LixIn(Crypter): else: self.links = [m.group(1)] self.log_debug("Found link %s, adding to package" % self.links[0]) - - -getInfo = create_getInfo(LixIn) diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index a000087ed..16d3c0d63 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class LofCc(DeadCrypter): @@ -15,6 +15,3 @@ class LofCc(DeadCrypter): __description__ = """Lof.cc decrypter plugin""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] - - -getInfo = create_getInfo(LofCc) diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index a77f97a10..2e765b2c9 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class MBLinkInfo(DeadCrypter): @@ -16,6 +16,3 @@ class MBLinkInfo(DeadCrypter): __license__ = "GPLv3" __authors__ = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"), ("stickell", "l.stickell@yahoo.it")] - - -getInfo = create_getInfo(MBLinkInfo) diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index deb0834b1..464552c97 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.internal.misc import json @@ -89,6 +89,3 @@ class MediafireComFolder(Crypter): else: self.links.append(url) - - -getInfo = create_getInfo(MediafireComFolder) diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 7356bf83c..70d7a228d 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class MegaCoNzFolder(Crypter): @@ -30,6 +30,3 @@ class MegaCoNzFolder(Crypter): url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() self.data = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) self.links = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.data) - - -getInfo = create_getInfo(MegaCoNzFolder) diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index 831d4dcc1..3668d046c 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class MegaRapidCzFolder(SimpleCrypter): @@ -22,6 +22,3 @@ class MegaRapidCzFolder(SimpleCrypter): LINK_PATTERN = r'<td class="soubor".*?><a href="(.+?)">' - - -getInfo = create_getInfo(MegaRapidCzFolder) diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index c1ebc42d5..9161b228c 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class MegauploadComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class MegauploadComFolder(DeadCrypter): __description__ = """Megaupload.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(MegauploadComFolder) diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index e122884aa..d2b365178 100644 --- a/module/plugins/crypter/Movie2KTo.py +++ b/module/plugins/crypter/Movie2KTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class Movie2KTo(DeadCrypter): @@ -15,6 +15,3 @@ class Movie2KTo(DeadCrypter): __description__ = """Movie2k.to decrypter plugin""" __license__ = "GPLv3" __authors__ = [("4Christopher", "4Christopher@gmx.de")] - - -getInfo = create_getInfo(Movie2KTo) diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index 8f050a15e..dc6c6de38 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -3,7 +3,7 @@ import re import urlparse -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class MultiUpOrg(SimpleCrypter): @@ -40,6 +40,3 @@ class MultiUpOrg(SimpleCrypter): self.data = self.load(mirror_page) return re.findall(pattern, self.data) - - -getInfo = create_getInfo(MultiUpOrg) diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 8b90b0dea..657f101d6 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): @@ -44,6 +44,3 @@ class MultiloadCz(Crypter): if not self.links: ignored_set = set(self.config.get('ignoredHoster').split('|')) self.links.extend(x[1] for x in m if x[0] not in ignored_set) - - -getInfo = create_getInfo(MultiloadCz) diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 2c95b1f8f..662c624d0 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class MultiuploadCom(DeadCrypter): @@ -15,6 +15,3 @@ class MultiuploadCom(DeadCrypter): __description__ = """MultiUpload.com decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(MultiuploadCom) diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 176e947de..2ebdd5de8 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -5,7 +5,7 @@ import re import Crypto.Cipher -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.captcha.ReCaptcha import ReCaptcha @@ -311,6 +311,3 @@ class NCryptIn(Crypter): #: Log and return self.log_debug("Block has %d links" % len(links)) return links - - -getInfo = create_getInfo(NCryptIn) diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 38bb5d1f8..1e25ee0d1 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class NetfolderIn(DeadCrypter): @@ -16,6 +16,3 @@ class NetfolderIn(DeadCrypter): __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("fragonib", "fragonib[AT]yahoo[DOT]es")] - - -getInfo = create_getInfo(NetfolderIn) diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py index 2ab550b92..80d0e9270 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.plugins.internal.misc import json @@ -34,6 +34,3 @@ class NitroflareComFolder(SimpleCrypter): self.offline() return [link['url'] for link in res['files']] if 'files' in res else None - - -getInfo = create_getInfo(NitroflareComFolder) diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 1c7ed2b62..2b1b3c382 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class NosvideoCom(SimpleCrypter): @@ -23,6 +23,3 @@ class NosvideoCom(SimpleCrypter): LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"' NAME_PATTERN = r'<[tT]itle>Watch (?P<N>.+?)<' - - -getInfo = create_getInfo(NosvideoCom) diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 85a51f9c9..85b61f437 100644 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class OronComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class OronComFolder(DeadCrypter): __description__ = """Oron.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("DHMH", "webmaster@pcProfil.de")] - - -getInfo = create_getInfo(OronComFolder) diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index c33e962a6..5047e347b 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class PastebinCom(SimpleCrypter): @@ -25,6 +25,3 @@ class PastebinCom(SimpleCrypter): NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)"' LINK_PATTERN = r'<div class="de\d+">(.+?)<' - - -getInfo = create_getInfo(PastebinCom) diff --git a/module/plugins/crypter/PastedCo.py b/module/plugins/crypter/PastedCo.py index 9f3a9e8d4..ac55049fc 100644 --- a/module/plugins/crypter/PastedCo.py +++ b/module/plugins/crypter/PastedCo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter import re @@ -43,6 +43,3 @@ class PastedCo(Crypter): urls = urls[urls.find(PastedCo.FS_URL_PREFIX) + len(PastedCo.FS_URL_PREFIX):] urls = urls[:urls.find(PastedCo.FS_URL_SUFFIX)].splitlines() self.packages.append((package_name, urls, package_folder)) - - -getInfo = create_getInfo(PastedCo) diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 24467a9a3..e175037be 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): @@ -33,6 +33,3 @@ class QuickshareCzFolder(Crypter): if m is None: self.error(_("FOLDER_PATTERN not found")) self.links.extend(re.findall(self.LINK_PATTERN, m.group(1))) - - -getInfo = create_getInfo(QuickshareCzFolder) diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 19de79ae1..02d97b4c8 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class RSLayerCom(DeadCrypter): @@ -15,6 +15,3 @@ class RSLayerCom(DeadCrypter): __description__ = """RS-Layer.com decrypter plugin""" __license__ = "GPLv3" __authors__ = [("hzpz", None)] - - -getInfo = create_getInfo(RSLayerCom) diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index b45cfb7ab..13bb0d0b2 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -8,7 +8,7 @@ import re import Crypto.Cipher -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.internal.misc import fsjoin @@ -293,6 +293,3 @@ class RelinkUs(Crypter): #: Log and return self.log_debug("Package has %d links" % len(links)) return links - - -getInfo = create_getInfo(RelinkUs) diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index 2c86d5f30..9ec91b45a 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -5,7 +5,7 @@ import re import BeautifulSoup from module.plugins.internal.misc import json -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.captcha.SolveMedia import SolveMedia @@ -83,6 +83,3 @@ class SafelinkingNet(Crypter): self.links.append("https://safelinking.net/d/" + link['full']) else: self.links.append(link['full']) - - -getInfo = create_getInfo(SafelinkingNet) diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 7be323e62..cb219c41c 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class SecuredIn(DeadCrypter): @@ -15,6 +15,3 @@ class SecuredIn(DeadCrypter): __description__ = """Secured.in decrypter plugin""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] - - -getInfo = create_getInfo(SecuredIn) diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index b6b040321..c19f4ffd4 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): @@ -107,6 +107,3 @@ class SexuriaCom(Crypter): #: All done, return to caller return name, linklist, folder, password - - -getInfo = create_getInfo(SexuriaCom) diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 58f60bdd6..fdb40bd76 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -4,7 +4,7 @@ import re import pycurl -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class ShSt(Crypter): @@ -31,6 +31,3 @@ class ShSt(Crypter): header = self.load(self.pyfile.url, just_header = True, decode = False) target_url = header.get('location') self.links.append(target_url) - - -getInfo = create_getInfo(ShSt) diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 01f1a5167..12d647e7a 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -5,7 +5,7 @@ import re import Crypto.Cipher -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): @@ -301,6 +301,3 @@ class ShareLinksBiz(Crypter): #: Log and return self.log_debug("Block has %d links" % len(links)) return links - - -getInfo = create_getInfo(ShareLinksBiz) diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index 2423a8ae4..1b76e32fd 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class SharingmatrixComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class SharingmatrixComFolder(DeadCrypter): __description__ = """Sharingmatrix.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(SharingmatrixComFolder) diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index 8c912eea0..bda010205 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class SpeedLoadOrgFolder(DeadCrypter): @@ -15,6 +15,3 @@ class SpeedLoadOrgFolder(DeadCrypter): __description__ = """Speedload decrypter plugin""" __license__ = "GPLv3" __authors__ = [("stickell", "l.stickell@yahoo.it")] - - -getInfo = create_getInfo(SpeedLoadOrgFolder) diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index da275c823..2df6612c2 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class StealthTo(DeadCrypter): @@ -15,6 +15,3 @@ class StealthTo(DeadCrypter): __description__ = """Stealth.to decrypter plugin""" __license__ = "GPLv3" __authors__ = [("spoob", "spoob@pyload.org")] - - -getInfo = create_getInfo(StealthTo) diff --git a/module/plugins/crypter/TNTVillageScambioeticoOrg.py b/module/plugins/crypter/TNTVillageScambioeticoOrg.py index 92930b6b3..5ff48be19 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class TNTVillageScambioeticoOrg(SimpleCrypter): @@ -30,6 +30,3 @@ class TNTVillageScambioeticoOrg(SimpleCrypter): links = super(TNTVillageScambioeticoOrg, self).getLinks() if links: return links - - -getInfo = create_getInfo(TNTVillageScambioeticoOrg) diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index a270c8f2e..9575269a9 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class TinyurlCom(SimpleCrypter): @@ -24,6 +24,3 @@ class TinyurlCom(SimpleCrypter): URL_REPLACEMENTS = [(r'preview\.', r'')] OFFLINE_PATTERN = r">Error: Unable to find site's URL to redirect to" - - -getInfo = create_getInfo(TinyurlCom) diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index c75c247ff..bef7bfd32 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class TnyCz(SimpleCrypter): @@ -29,6 +29,3 @@ class TnyCz(SimpleCrypter): def get_links(self): m = re.search(r'<a id=\'save_paste\' href="(.+save\.php\?hash=.+)">', self.data) return re.findall(".+", self.load(m.group(1))) if m else None - - -getInfo = create_getInfo(TnyCz) diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 8225dfadf..66edd32df 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class TrailerzoneInfo(DeadCrypter): @@ -15,6 +15,3 @@ class TrailerzoneInfo(DeadCrypter): __description__ = """TrailerZone.info decrypter plugin""" __license__ = "GPLv3" __authors__ = [("godofdream", "soilfiction@gmail.com")] - - -getInfo = create_getInfo(TrailerzoneInfo) diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index c8e015d28..9dccf37dc 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.plugins.internal.misc import json @@ -44,6 +44,3 @@ class TurbobitNetFolder(SimpleCrypter): def get_links(self): return ["http://turbobit.net/%s.html" % id for id in self._get_links(self.info['pattern']['ID'])] - - -getInfo = create_getInfo(TurbobitNetFolder) diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 1fd41344f..f6f6dce7a 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -4,7 +4,7 @@ import math import re import urlparse -from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo +from module.plugins.internal.XFSCrypter import XFSCrypter class TusfilesNetFolder(XFSCrypter): @@ -47,6 +47,3 @@ class TusfilesNetFolder(XFSCrypter): for p in xrange(2, pages + 1): self.data = self.load_page(p) self.links.append(self.get_links()) - - -getInfo = create_getInfo(TusfilesNetFolder) diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index 1e78071e6..dd81baeda 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): @@ -48,6 +48,3 @@ class UlozToFolder(Crypter): if new_links: self.links = [map(lambda s: "http://ulozto.net/%s" % s, new_links)] - - -getInfo = create_getInfo(UlozToFolder) diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index 8f85291e7..f30c054c6 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class UploadableChFolder(SimpleCrypter): @@ -26,6 +26,3 @@ class UploadableChFolder(SimpleCrypter): NAME_PATTERN = r'<div class="folder"><span> </span>(?P<N>.+?)</div>' OFFLINE_PATTERN = r'We are sorry... The URL you entered cannot be found on the server.' TEMP_OFFLINE_PATTERN = r'<div class="icon_err">' - - -getInfo = create_getInfo(UploadableChFolder) diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index f885bbe41..71f9ac290 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo +from module.plugins.internal.SimpleCrypter import SimpleCrypter class UploadedToFolder(SimpleCrypter): @@ -28,6 +28,3 @@ class UploadedToFolder(SimpleCrypter): TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance' LINK_PATTERN = r'<h2><a href="(.+?)"' - - -getInfo = create_getInfo(UploadedToFolder) diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index e150c6e71..4c3c5f82d 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class WiiReloadedOrg(DeadCrypter): @@ -15,6 +15,3 @@ class WiiReloadedOrg(DeadCrypter): __description__ = """Wii-Reloaded.org decrypter plugin""" __license__ = "GPLv3" __authors__ = [("hzpz", None)] - - -getInfo = create_getInfo(WiiReloadedOrg) diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index 92728d3d7..738ba0fe3 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo +from module.plugins.internal.DeadCrypter import DeadCrypter class WuploadComFolder(DeadCrypter): @@ -15,6 +15,3 @@ class WuploadComFolder(DeadCrypter): __description__ = """Wupload.com folder decrypter plugin""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - - -getInfo = create_getInfo(WuploadComFolder) diff --git a/module/plugins/crypter/XFileSharingFolder.py b/module/plugins/crypter/XFileSharingFolder.py index 64db33d30..866db42e3 100644 --- a/module/plugins/crypter/XFileSharingFolder.py +++ b/module/plugins/crypter/XFileSharingFolder.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo +from module.plugins.internal.XFSCrypter import XFSCrypter class XFileSharingFolder(XFSCrypter): @@ -39,7 +39,7 @@ class XFileSharingFolder(XFSCrypter): def setup_base(self): if self.account: self.req = self.pyload.requestFactory.getRequest(self.PLUGIN_NAME, self.account.user) - self.premium = self.account.info['data']['premium'] #@NOTE: Avoid one unnecessary get_info call by `self.account.premium` here + self.premium = self.account.info['data']['premium'] #@NOTE: Don't call get_info here to reduce overhead else: self.req = self.pyload.requestFactory.getRequest(self.classname) self.premium = False @@ -53,6 +53,3 @@ class XFileSharingFolder(XFSCrypter): self.__class__.__name__ = str(self.PLUGIN_NAME) super(XFileSharingFolder, self).load_account() self.__class__.__name__ = class_name - - -getInfo = create_getInfo(XFileSharingFolder) diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index c35d64746..4e3d069ad 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter class XupPl(Crypter): @@ -26,6 +26,3 @@ class XupPl(Crypter): self.links = [header.get('location')] else: self.fail(_("Unable to find link")) - - -getInfo = create_getInfo(XupPl) diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index e0387ac24..aea4211fe 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -3,7 +3,7 @@ import re import urlparse -from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.Crypter import Crypter from module.plugins.internal.misc import fsjoin, json @@ -148,6 +148,3 @@ class YoutubeComFolder(Crypter): self.packages.append((p_name, p_urls, p_folder)) #: Folder is NOT recognized by pyload 0.4.9! addedvideos.extend(p_videos) - - -getInfo = create_getInfo(YoutubeComFolder) |