From 270c1ee85edcd1e9e10511833b422d93dfca192a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 16 Feb 2015 22:38:45 +0100 Subject: Revert fcead1870013b6a970eca7878a66dbe783c80ea3 --- pyload/plugin/crypter/BitshareCom.py | 16 ++++++++-------- pyload/plugin/crypter/C1NeonCom.py | 16 ++++++++-------- pyload/plugin/crypter/ChipDe.py | 16 ++++++++-------- pyload/plugin/crypter/CloudzillaTo.py | 14 +++++++------- pyload/plugin/crypter/CrockoCom.py | 16 ++++++++-------- pyload/plugin/crypter/CryptItCom.py | 16 ++++++++-------- pyload/plugin/crypter/CzshareCom.py | 16 ++++++++-------- pyload/plugin/crypter/DDLMusicOrg.py | 16 ++++++++-------- pyload/plugin/crypter/DailymotionBatch.py | 18 +++++++++--------- pyload/plugin/crypter/DataHu.py | 16 ++++++++-------- pyload/plugin/crypter/DdlstorageCom.py | 16 ++++++++-------- pyload/plugin/crypter/DepositfilesCom.py | 16 ++++++++-------- pyload/plugin/crypter/Dereferer.py | 16 ++++++++-------- pyload/plugin/crypter/DevhostSt.py | 20 ++++++++++---------- pyload/plugin/crypter/DlProtectCom.py | 16 ++++++++-------- pyload/plugin/crypter/DontKnowMe.py | 16 ++++++++-------- pyload/plugin/crypter/DuckCryptInfo.py | 20 ++++++++++---------- pyload/plugin/crypter/DuploadOrg.py | 16 ++++++++-------- pyload/plugin/crypter/EasybytezCom.py | 16 ++++++++-------- pyload/plugin/crypter/EmbeduploadCom.py | 16 ++++++++-------- pyload/plugin/crypter/FilebeerInfo.py | 16 ++++++++-------- pyload/plugin/crypter/FilecloudIo.py | 16 ++++++++-------- pyload/plugin/crypter/FilecryptCc.py | 14 +++++++------- pyload/plugin/crypter/FilefactoryCom.py | 16 ++++++++-------- pyload/plugin/crypter/FilerNet.py | 16 ++++++++-------- pyload/plugin/crypter/FileserveCom.py | 16 ++++++++-------- pyload/plugin/crypter/FilesonicCom.py | 14 +++++++------- pyload/plugin/crypter/FilestubeCom.py | 16 ++++++++-------- pyload/plugin/crypter/FiletramCom.py | 16 ++++++++-------- pyload/plugin/crypter/FiredriveCom.py | 16 ++++++++-------- pyload/plugin/crypter/FourChanOrg.py | 16 ++++++++-------- pyload/plugin/crypter/FreakhareCom.py | 16 ++++++++-------- pyload/plugin/crypter/FreetexthostCom.py | 16 ++++++++-------- pyload/plugin/crypter/FshareVn.py | 16 ++++++++-------- pyload/plugin/crypter/Go4UpCom.py | 14 +++++++------- pyload/plugin/crypter/GooGl.py | 16 ++++++++-------- pyload/plugin/crypter/HoerbuchIn.py | 16 ++++++++-------- pyload/plugin/crypter/HotfileCom.py | 16 ++++++++-------- pyload/plugin/crypter/ILoadTo.py | 16 ++++++++-------- pyload/plugin/crypter/ImgurComAlbum.py | 16 ++++++++-------- pyload/plugin/crypter/LetitbitNet.py | 16 ++++++++-------- pyload/plugin/crypter/LinkCryptWs.py | 16 ++++++++-------- pyload/plugin/crypter/LinkSaveIn.py | 16 ++++++++-------- pyload/plugin/crypter/LinkdecrypterCom.py | 16 ++++++++-------- pyload/plugin/crypter/LixIn.py | 18 +++++++++--------- pyload/plugin/crypter/LofCc.py | 16 ++++++++-------- pyload/plugin/crypter/MBLinkInfo.py | 16 ++++++++-------- pyload/plugin/crypter/MediafireCom.py | 16 ++++++++-------- pyload/plugin/crypter/MegaCoNz.py | 18 +++++++++--------- pyload/plugin/crypter/MegaRapidCz.py | 16 ++++++++-------- pyload/plugin/crypter/MegauploadCom.py | 14 +++++++------- pyload/plugin/crypter/Movie2KTo.py | 16 ++++++++-------- pyload/plugin/crypter/MultiUpOrg.py | 18 +++++++++--------- pyload/plugin/crypter/MultiloadCz.py | 18 +++++++++--------- pyload/plugin/crypter/MultiuploadCom.py | 14 +++++++------- pyload/plugin/crypter/NCryptIn.py | 18 +++++++++--------- pyload/plugin/crypter/NetfolderIn.py | 18 +++++++++--------- pyload/plugin/crypter/NosvideoCom.py | 16 ++++++++-------- pyload/plugin/crypter/OneKhDe.py | 16 ++++++++-------- pyload/plugin/crypter/OronCom.py | 16 ++++++++-------- pyload/plugin/crypter/PastebinCom.py | 16 ++++++++-------- pyload/plugin/crypter/QuickshareCz.py | 16 ++++++++-------- pyload/plugin/crypter/RSLayerCom.py | 16 ++++++++-------- pyload/plugin/crypter/RelinkUs.py | 18 +++++++++--------- pyload/plugin/crypter/SafelinkingNet.py | 18 +++++++++--------- pyload/plugin/crypter/SecuredIn.py | 16 ++++++++-------- pyload/plugin/crypter/SexuriaCom.py | 16 ++++++++-------- pyload/plugin/crypter/ShareLinksBiz.py | 20 ++++++++++---------- pyload/plugin/crypter/SharingmatrixCom.py | 14 +++++++------- pyload/plugin/crypter/SpeedLoadOrg.py | 16 ++++++++-------- pyload/plugin/crypter/StealthTo.py | 16 ++++++++-------- pyload/plugin/crypter/TnyCz.py | 16 ++++++++-------- pyload/plugin/crypter/TrailerzoneInfo.py | 16 ++++++++-------- pyload/plugin/crypter/TurbobitNet.py | 18 +++++++++--------- pyload/plugin/crypter/TusfilesNet.py | 18 +++++++++--------- pyload/plugin/crypter/UlozTo.py | 16 ++++++++-------- pyload/plugin/crypter/UploadableCh.py | 16 ++++++++-------- pyload/plugin/crypter/UploadedTo.py | 16 ++++++++-------- pyload/plugin/crypter/WiiReloadedOrg.py | 16 ++++++++-------- pyload/plugin/crypter/WuploadCom.py | 14 +++++++------- pyload/plugin/crypter/XFileSharingPro.py | 22 +++++++++++----------- pyload/plugin/crypter/XupPl.py | 16 ++++++++-------- pyload/plugin/crypter/YoutubeBatch.py | 18 +++++++++--------- 83 files changed, 677 insertions(+), 677 deletions(-) (limited to 'pyload/plugin/crypter') diff --git a/pyload/plugin/crypter/BitshareCom.py b/pyload/plugin/crypter/BitshareCom.py index 524307127..dfa7b71df 100644 --- a/pyload/plugin/crypter/BitshareCom.py +++ b/pyload/plugin/crypter/BitshareCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class BitshareCom(SimpleCrypter): - __name__ = "BitshareCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "BitshareCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?bitshare\.com/\?d=\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Bitshare.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Bitshare.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'.+' diff --git a/pyload/plugin/crypter/C1NeonCom.py b/pyload/plugin/crypter/C1NeonCom.py index dc1555b46..e0e1bda17 100644 --- a/pyload/plugin/crypter/C1NeonCom.py +++ b/pyload/plugin/crypter/C1NeonCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class C1NeonCom(DeadCrypter): - __name__ = "C1NeonCom" - __type__ = "crypter" - __version__ = "0.05" + __name = "C1NeonCom" + __type = "crypter" + __version = "0.05" - __pattern__ = r'http://(?:www\.)?c1neon\.com/.+' - __config__ = [] + __pattern = r'http://(?:www\.)?c1neon\.com/.+' + __config = [] - __description__ = """C1neon.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("godofdream", "soilfiction@gmail.com")] + __description = """C1neon.com decrypter plugin""" + __license = "GPLv3" + __authors = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/crypter/ChipDe.py b/pyload/plugin/crypter/ChipDe.py index 2f47236e8..6d4baee57 100644 --- a/pyload/plugin/crypter/ChipDe.py +++ b/pyload/plugin/crypter/ChipDe.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class ChipDe(Crypter): - __name__ = "ChipDe" - __type__ = "crypter" - __version__ = "0.10" + __name = "ChipDe" + __type = "crypter" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?chip\.de/video/.+\.html' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Chip.de decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("4Christopher", "4Christopher@gmx.de")] + __description = """Chip.de decrypter plugin""" + __license = "GPLv3" + __authors = [("4Christopher", "4Christopher@gmx.de")] def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/CloudzillaTo.py b/pyload/plugin/crypter/CloudzillaTo.py index 340892136..0990a1efd 100644 --- a/pyload/plugin/crypter/CloudzillaTo.py +++ b/pyload/plugin/crypter/CloudzillaTo.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class CloudzillaTo(SimpleHoster): - __name__ = "CloudzillaTo" - __type__ = "crypter" - __version__ = "0.02" + __name = "CloudzillaTo" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P[\w^_]+)' + __pattern = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P[\w^_]+)' - __description__ = """Cloudzilla.to folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Cloudzilla.to folder decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] INFO_PATTERN = r'download' diff --git a/pyload/plugin/crypter/CryptItCom.py b/pyload/plugin/crypter/CryptItCom.py index 0d72cba61..615626f4f 100644 --- a/pyload/plugin/crypter/CryptItCom.py +++ b/pyload/plugin/crypter/CryptItCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class CryptItCom(DeadCrypter): - __name__ = "CryptItCom" - __type__ = "crypter" - __version__ = "0.11" + __name = "CryptItCom" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+' - __config__ = [] + __pattern = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+' + __config = [] - __description__ = """Crypt-it.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("jeix", "jeix@hasnomail.de")] + __description = """Crypt-it.com decrypter plugin""" + __license = "GPLv3" + __authors = [("jeix", "jeix@hasnomail.de")] diff --git a/pyload/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py index e527d683f..4cbd182cb 100644 --- a/pyload/plugin/crypter/CzshareCom.py +++ b/pyload/plugin/crypter/CzshareCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class CzshareCom(Crypter): - __name__ = "CzshareCom" - __type__ = "crypter" - __version__ = "0.20" + __name = "CzshareCom" + __type = "crypter" + __version = "0.20" - __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Czshare.com folder decrypter plugin, now Sdilej.cz""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'\s*\s*(.*?)
' diff --git a/pyload/plugin/crypter/DDLMusicOrg.py b/pyload/plugin/crypter/DDLMusicOrg.py index 2b6738799..a24cac22d 100644 --- a/pyload/plugin/crypter/DDLMusicOrg.py +++ b/pyload/plugin/crypter/DDLMusicOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class DDLMusicOrg(Crypter): - __name__ = "DDLMusicOrg" - __type__ = "crypter" - __version__ = "0.30" + __name = "DDLMusicOrg" + __type = "crypter" + __version = "0.30" - __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Ddl-music.org decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de")] + __description = """Ddl-music.org decrypter plugin""" + __license = "GPLv3" + __authors = [("mkaay", "mkaay@mkaay.de")] def setup(self): diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py index c66c7c829..7afcccceb 100644 --- a/pyload/plugin/crypter/DailymotionBatch.py +++ b/pyload/plugin/crypter/DailymotionBatch.py @@ -10,17 +10,17 @@ from pyload.utils import safe_join class DailymotionBatch(Crypter): - __name__ = "DailymotionBatch" - __type__ = "crypter" - __version__ = "0.01" + __name = "DailymotionBatch" + __type = "crypter" + __version = "0.01" - __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?Pplaylist|user)/)?(?P[\w^_]+)(?(TYPE)|#)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?Pplaylist|user)/)?(?P[\w^_]+)(?(TYPE)|#)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Dailymotion.com channel & playlist decrypter""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Dailymotion.com channel & playlist decrypter""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] def api_response(self, ref, req=None): @@ -83,7 +83,7 @@ class DailymotionBatch(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern__, pyfile.url) + m = re.match(self.__pattern, pyfile.url) m_id = m.group('ID') m_type = m.group('TYPE') diff --git a/pyload/plugin/crypter/DataHu.py b/pyload/plugin/crypter/DataHu.py index f69d6ee3e..bc677253a 100644 --- a/pyload/plugin/crypter/DataHu.py +++ b/pyload/plugin/crypter/DataHu.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DataHu(SimpleCrypter): - __name__ = "DataHu" - __type__ = "crypter" - __version__ = "0.06" + __name = "DataHu" + __type = "crypter" + __version = "0.06" - __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?data\.hu/dir/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Data.hu folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("crash", ""), + __description = """Data.hu folder decrypter plugin""" + __license = "GPLv3" + __authors = [("crash", ""), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/DdlstorageCom.py b/pyload/plugin/crypter/DdlstorageCom.py index f3744e15d..e3e1f1956 100644 --- a/pyload/plugin/crypter/DdlstorageCom.py +++ b/pyload/plugin/crypter/DdlstorageCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class DdlstorageCom(DeadCrypter): - __name__ = "DdlstorageCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "DdlstorageCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+' - __config__ = [] + __pattern = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+' + __config = [] - __description__ = """DDLStorage.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("godofdream", "soilfiction@gmail.com"), + __description = """DDLStorage.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("godofdream", "soilfiction@gmail.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py index 24fa9134a..8ecbb6f8d 100644 --- a/pyload/plugin/crypter/DepositfilesCom.py +++ b/pyload/plugin/crypter/DepositfilesCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DepositfilesCom(SimpleCrypter): - __name__ = "DepositfilesCom" - __type__ = "crypter" - __version__ = "0.01" + __name = "DepositfilesCom" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?depositfiles\.com/folders/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Depositfiles.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Depositfiles.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'
]*>\s*' diff --git a/pyload/plugin/crypter/Dereferer.py b/pyload/plugin/crypter/Dereferer.py index 138282d02..0faebbb87 100644 --- a/pyload/plugin/crypter/Dereferer.py +++ b/pyload/plugin/crypter/Dereferer.py @@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter class Dereferer(SimpleDereferer): - __name__ = "Dereferer" - __type__ = "crypter" - __version__ = "0.11" + __name = "Dereferer" + __type = "crypter" + __version = "0.11" - __pattern__ = r'https?://([^/]+)/.*?(?P(ht|f)tps?(://|%3A%2F%2F).+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://([^/]+)/.*?(?P(ht|f)tps?(://|%3A%2F%2F).+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Crypter for dereferers""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Crypter for dereferers""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/DevhostSt.py b/pyload/plugin/crypter/DevhostSt.py index 4d1a2ae09..b6814613b 100644 --- a/pyload/plugin/crypter/DevhostSt.py +++ b/pyload/plugin/crypter/DevhostSt.py @@ -11,17 +11,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DevhostSt(SimpleCrypter): - __name__ = "DevhostSt" - __type__ = "crypter" - __version__ = "0.04" + __name = "DevhostSt" + __type = "crypter" + __version = "0.04" - __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P\w+)(/\?fld_id=(?P\d+))?' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?d-h\.st/users/(?P\w+)(/\?fld_id=(?P\d+))?' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """d-h.st folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de"), + __description = """d-h.st folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), ("Walter Purcaro", "vuolter@gmail.com")] @@ -34,7 +34,7 @@ class DevhostSt(SimpleCrypter): self.offline() try: - id = re.match(self.__pattern__, self.pyfile.url).group('ID') + id = re.match(self.__pattern, self.pyfile.url).group('ID') if id == "0": raise @@ -49,6 +49,6 @@ class DevhostSt(SimpleCrypter): except Exception, e: self.logDebug(e) - name = folder = re.match(self.__pattern__, self.pyfile.url).group('USER') + name = folder = re.match(self.__pattern, self.pyfile.url).group('USER') return {'name': name, 'folder': folder} diff --git a/pyload/plugin/crypter/DlProtectCom.py b/pyload/plugin/crypter/DlProtectCom.py index a5e104f70..7779356d6 100644 --- a/pyload/plugin/crypter/DlProtectCom.py +++ b/pyload/plugin/crypter/DlProtectCom.py @@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DlProtectCom(SimpleCrypter): - __name__ = "DlProtectCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "DlProtectCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Dl-protect.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Dl-protect.com decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] COOKIES = [("dl-protect.com", "l", "en")] diff --git a/pyload/plugin/crypter/DontKnowMe.py b/pyload/plugin/crypter/DontKnowMe.py index 1e83ab853..d247e33e4 100644 --- a/pyload/plugin/crypter/DontKnowMe.py +++ b/pyload/plugin/crypter/DontKnowMe.py @@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter class DontKnowMe(SimpleDereferer): - __name__ = "DontKnowMe" - __type__ = "crypter" - __version__ = "0.11" + __name = "DontKnowMe" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?(?P.+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?dontknow\.me/at/\?(?P.+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """DontKnow.me decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("selaux", "")] + __description = """DontKnow.me decrypter plugin""" + __license = "GPLv3" + __authors = [("selaux", "")] diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py index 55681fd5e..28f9a1505 100644 --- a/pyload/plugin/crypter/DuckCryptInfo.py +++ b/pyload/plugin/crypter/DuckCryptInfo.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class DuckCryptInfo(Crypter): - __name__ = "DuckCryptInfo" - __type__ = "crypter" - __version__ = "0.02" + __name = "DuckCryptInfo" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """DuckCrypt.info decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("godofdream", "soilfiction@gmail.com")] + __description = """DuckCrypt.info decrypter plugin""" + __license = "GPLv3" + __authors = [("godofdream", "soilfiction@gmail.com")] TIMER_PATTERN = r'(.*)' @@ -27,7 +27,7 @@ class DuckCryptInfo(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern__, url) + m = re.match(self.__pattern, url) if m is None: self.fail(_("Weird error in link")) if str(m.group(1)) == "link": @@ -38,7 +38,7 @@ class DuckCryptInfo(Crypter): def handleFolder(self, m): html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2))) - m = re.match(self.__pattern__, html) + m = re.match(self.__pattern, html) self.logDebug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup(html) diff --git a/pyload/plugin/crypter/DuploadOrg.py b/pyload/plugin/crypter/DuploadOrg.py index f92eb2ede..445318ccc 100644 --- a/pyload/plugin/crypter/DuploadOrg.py +++ b/pyload/plugin/crypter/DuploadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class DuploadOrg(DeadCrypter): - __name__ = "DuploadOrg" - __type__ = "crypter" - __version__ = "0.02" + __name = "DuploadOrg" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+' - __config__ = [] + __pattern = r'http://(?:www\.)?dupload\.org/folder/\d+' + __config = [] - __description__ = """Dupload.org folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Dupload.org folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/EasybytezCom.py b/pyload/plugin/crypter/EasybytezCom.py index c5c7b0193..6433c65b8 100644 --- a/pyload/plugin/crypter/EasybytezCom.py +++ b/pyload/plugin/crypter/EasybytezCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter class EasybytezCom(XFSCrypter): - __name__ = "EasybytezCom" - __type__ = "crypter" - __version__ = "0.10" + __name = "EasybytezCom" + __type = "crypter" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Easybytez.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Easybytez.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] LOGIN_ACCOUNT = True diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py index c94e7e106..55033ce05 100644 --- a/pyload/plugin/crypter/EmbeduploadCom.py +++ b/pyload/plugin/crypter/EmbeduploadCom.py @@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name__ = "EmbeduploadCom" - __type__ = "crypter" - __version__ = "0.02" + __name = "EmbeduploadCom" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?embedupload\.com/\?d=.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] - __description__ = """EmbedUpload.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """EmbedUpload.com decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'
]*>\s*' diff --git a/pyload/plugin/crypter/FilebeerInfo.py b/pyload/plugin/crypter/FilebeerInfo.py index e2e0e1e3c..5ec059375 100644 --- a/pyload/plugin/crypter/FilebeerInfo.py +++ b/pyload/plugin/crypter/FilebeerInfo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class FilebeerInfo(DeadCrypter): - __name__ = "FilebeerInfo" - __type__ = "crypter" - __version__ = "0.02" + __name = "FilebeerInfo" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+' - __config__ = [] + __pattern = r'http://(?:www\.)?filebeer\.info/\d*~f\w+' + __config = [] - __description__ = """Filebeer.info folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Filebeer.info folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/FilecloudIo.py b/pyload/plugin/crypter/FilecloudIo.py index f4c967a07..1926d04bb 100644 --- a/pyload/plugin/crypter/FilecloudIo.py +++ b/pyload/plugin/crypter/FilecloudIo.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilecloudIo(SimpleCrypter): - __name__ = "FilecloudIo" - __type__ = "crypter" - __version__ = "0.03" + __name = "FilecloudIo" + __type = "crypter" + __version = "0.03" - __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Filecloud.io folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Filecloud.io folder decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title' diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py index 816a2d365..6f01fbd19 100644 --- a/pyload/plugin/crypter/FilecryptCc.py +++ b/pyload/plugin/crypter/FilecryptCc.py @@ -14,15 +14,15 @@ from pyload.plugin.internal.CaptchaService import ReCaptcha class FilecryptCc(Crypter): - __name__ = "FilecryptCc" - __type__ = "crypter" - __version__ = "0.11" + __name = "FilecryptCc" + __type = "crypter" + __version = "0.11" - __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' + __pattern = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' - __description__ = """Filecrypt.cc decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de")] + __description = """Filecrypt.cc decrypter plugin""" + __license = "GPLv3" + __authors = [("zapp-brannigan", "fuerst.reinje@web.de")] # URL_REPLACEMENTS = [(r'.html$', ""), (r'$', ".html")] #@TODO: Extend SimpleCrypter diff --git a/pyload/plugin/crypter/FilefactoryCom.py b/pyload/plugin/crypter/FilefactoryCom.py index 40f4c1475..e72cc1430 100644 --- a/pyload/plugin/crypter/FilefactoryCom.py +++ b/pyload/plugin/crypter/FilefactoryCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilefactoryCom(SimpleCrypter): - __name__ = "FilefactoryCom" - __type__ = "crypter" - __version__ = "0.32" + __name = "FilefactoryCom" + __type = "crypter" + __version = "0.32" - __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Filefactory.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Filefactory.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] COOKIES = [("filefactory.com", "locale", "en_US.utf8")] diff --git a/pyload/plugin/crypter/FilerNet.py b/pyload/plugin/crypter/FilerNet.py index 45d0dd2ab..1e7e548a4 100644 --- a/pyload/plugin/crypter/FilerNet.py +++ b/pyload/plugin/crypter/FilerNet.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilerNet(SimpleCrypter): - __name__ = "FilerNet" - __type__ = "crypter" - __version__ = "0.42" + __name = "FilerNet" + __type = "crypter" + __version = "0.42" - __pattern__ = r'https?://filer\.net/folder/\w{16}' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://filer\.net/folder/\w{16}' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Filer.net decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("nath_schwarz", "nathan.notwhite@gmail.com"), + __description = """Filer.net decrypter plugin""" + __license = "GPLv3" + __authors = [("nath_schwarz", "nathan.notwhite@gmail.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py index ab0665fbd..a9f766b81 100644 --- a/pyload/plugin/crypter/FileserveCom.py +++ b/pyload/plugin/crypter/FileserveCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class FileserveCom(Crypter): - __name__ = "FileserveCom" - __type__ = "crypter" - __version__ = "0.11" + __name = "FileserveCom" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?fileserve\.com/list/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """FileServe.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("fionnc", "fionnc@gmail.com")] + __description = """FileServe.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("fionnc", "fionnc@gmail.com")] FOLDER_PATTERN = r'(.*?)
' diff --git a/pyload/plugin/crypter/FilesonicCom.py b/pyload/plugin/crypter/FilesonicCom.py index 1ffaa9c01..696053646 100644 --- a/pyload/plugin/crypter/FilesonicCom.py +++ b/pyload/plugin/crypter/FilesonicCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class FilesonicCom(DeadCrypter): - __name__ = "FilesonicCom" - __type__ = "crypter" - __version__ = "0.12" + __name = "FilesonicCom" + __type = "crypter" + __version = "0.12" - __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+' + __pattern = r'http://(?:www\.)?filesonic\.com/folder/\w+' - __description__ = """Filesonic.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Filesonic.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/FilestubeCom.py b/pyload/plugin/crypter/FilestubeCom.py index 36e4a4caf..5238899b0 100644 --- a/pyload/plugin/crypter/FilestubeCom.py +++ b/pyload/plugin/crypter/FilestubeCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilestubeCom(SimpleCrypter): - __name__ = "FilestubeCom" - __type__ = "crypter" - __version__ = "0.05" + __name = "FilestubeCom" + __type = "crypter" + __version = "0.05" - __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Filestube.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Filestube.com decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r']* href=\"(http://[^\"]+)' diff --git a/pyload/plugin/crypter/FiletramCom.py b/pyload/plugin/crypter/FiletramCom.py index 700050a4b..28e38e30e 100644 --- a/pyload/plugin/crypter/FiletramCom.py +++ b/pyload/plugin/crypter/FiletramCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FiletramCom(SimpleCrypter): - __name__ = "FiletramCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "FiletramCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?filetram\.com/[^/]+/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Filetram.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("igel", "igelkun@myopera.com"), + __description = """Filetram.com decrypter plugin""" + __license = "GPLv3" + __authors = [("igel", "igelkun@myopera.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/FiredriveCom.py b/pyload/plugin/crypter/FiredriveCom.py index e258ed42f..be3a9ebdb 100644 --- a/pyload/plugin/crypter/FiredriveCom.py +++ b/pyload/plugin/crypter/FiredriveCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class FiredriveCom(DeadCrypter): - __name__ = "FiredriveCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "FiredriveCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+' - __config__ = [] + __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+' + __config = [] - __description__ = """Firedrive.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Firedrive.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py index 62fb9d3fe..a7427a740 100644 --- a/pyload/plugin/crypter/FourChanOrg.py +++ b/pyload/plugin/crypter/FourChanOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class FourChanOrg(Crypter): - __name__ = "FourChanOrg" - __type__ = "crypter" - __version__ = "0.31" + __name = "FourChanOrg" + __type = "crypter" + __version = "0.31" - __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """4chan.org folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [] + __description = """4chan.org folder decrypter plugin""" + __license = "GPLv3" + __authors = [] def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py index cb766361c..9df8ef200 100644 --- a/pyload/plugin/crypter/FreakhareCom.py +++ b/pyload/plugin/crypter/FreakhareCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FreakhareCom(SimpleCrypter): - __name__ = "FreakhareCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "FreakhareCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?freakshare\.com/folder/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Freakhare.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Freakhare.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'' diff --git a/pyload/plugin/crypter/FreetexthostCom.py b/pyload/plugin/crypter/FreetexthostCom.py index 3b082ef7d..db97a8003 100644 --- a/pyload/plugin/crypter/FreetexthostCom.py +++ b/pyload/plugin/crypter/FreetexthostCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FreetexthostCom(SimpleCrypter): - __name__ = "FreetexthostCom" - __type__ = "crypter" - __version__ = "0.01" + __name = "FreetexthostCom" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?freetexthost\.com/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Freetexthost.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Freetexthost.com decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] def getLinks(self): diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py index 700f87ba4..5a0d94c7c 100644 --- a/pyload/plugin/crypter/FshareVn.py +++ b/pyload/plugin/crypter/FshareVn.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FshareVn(SimpleCrypter): - __name__ = "FshareVn" - __type__ = "crypter" - __version__ = "0.01" + __name = "FshareVn" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?fshare\.vn/folder/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Fshare.vn folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Fshare.vn folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'
  • ' diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py index 5bae6e93a..bac9adef2 100644 --- a/pyload/plugin/crypter/Go4UpCom.py +++ b/pyload/plugin/crypter/Go4UpCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class Go4UpCom(SimpleCrypter): - __name__ = "Go4UpCom" - __type__ = "crypter" - __version__ = "0.11" + __name = "Go4UpCom" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' + __pattern = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' - __description__ = """Go4Up.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("rlindner81", "rlindner81@gmail.com"), + __description = """Go4Up.com decrypter plugin""" + __license = "GPLv3" + __authors = [("rlindner81", "rlindner81@gmail.com"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/GooGl.py b/pyload/plugin/crypter/GooGl.py index 13ffce505..d1c47935d 100644 --- a/pyload/plugin/crypter/GooGl.py +++ b/pyload/plugin/crypter/GooGl.py @@ -5,17 +5,17 @@ from pyload.utils import json_loads class GooGl(Crypter): - __name__ = "GooGl" - __type__ = "crypter" - __version__ = "0.01" + __name = "GooGl" + __type = "crypter" + __version = "0.01" - __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?goo\.gl/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Goo.gl decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Goo.gl decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] API_URL = "https://www.googleapis.com/urlshortener/v1/url" diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py index a12d7c02a..a809e756c 100644 --- a/pyload/plugin/crypter/HoerbuchIn.py +++ b/pyload/plugin/crypter/HoerbuchIn.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class HoerbuchIn(Crypter): - __name__ = "HoerbuchIn" - __type__ = "crypter" - __version__ = "0.60" + __name = "HoerbuchIn" + __type = "crypter" + __version = "0.60" - __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Hoerbuch.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org"), + __description = """Hoerbuch.in decrypter plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org"), ("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/HotfileCom.py b/pyload/plugin/crypter/HotfileCom.py index 8085aa797..8fc10cf88 100644 --- a/pyload/plugin/crypter/HotfileCom.py +++ b/pyload/plugin/crypter/HotfileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class HotfileCom(DeadCrypter): - __name__ = "HotfileCom" - __type__ = "crypter" - __version__ = "0.30" + __name = "HotfileCom" + __type = "crypter" + __version = "0.30" - __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+' - __config__ = [] + __pattern = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+' + __config = [] - __description__ = """Hotfile.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __description = """Hotfile.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org")] diff --git a/pyload/plugin/crypter/ILoadTo.py b/pyload/plugin/crypter/ILoadTo.py index f333e262f..e00a88743 100644 --- a/pyload/plugin/crypter/ILoadTo.py +++ b/pyload/plugin/crypter/ILoadTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class ILoadTo(DeadCrypter): - __name__ = "ILoadTo" - __type__ = "crypter" - __version__ = "0.11" + __name = "ILoadTo" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/' - __config__ = [] + __pattern = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/' + __config = [] - __description__ = """Iload.to decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("hzpz", "")] + __description = """Iload.to decrypter plugin""" + __license = "GPLv3" + __authors = [("hzpz", "")] diff --git a/pyload/plugin/crypter/ImgurComAlbum.py b/pyload/plugin/crypter/ImgurComAlbum.py index d2ca38d40..e7df57cb6 100644 --- a/pyload/plugin/crypter/ImgurComAlbum.py +++ b/pyload/plugin/crypter/ImgurComAlbum.py @@ -5,17 +5,17 @@ from pyload.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name__ = "ImgurComAlbum" - __type__ = "crypter" - __version__ = "0.51" + __name = "ImgurComAlbum" + __type = "crypter" + __version = "0.51" - __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Imgur.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("nath_schwarz", "nathan.notwhite@gmail.com")] + __description = """Imgur.com decrypter plugin""" + __license = "GPLv3" + __authors = [("nath_schwarz", "nathan.notwhite@gmail.com")] NAME_PATTERN = r'(?P.+?) - Imgur' diff --git a/pyload/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py index 24bc196b3..ca787e31a 100644 --- a/pyload/plugin/crypter/LetitbitNet.py +++ b/pyload/plugin/crypter/LetitbitNet.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class LetitbitNet(Crypter): - __name__ = "LetitbitNet" - __type__ = "crypter" - __version__ = "0.10" + __name = "LetitbitNet" + __type = "crypter" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?letitbit\.net/folder/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Letitbit.net folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("DHMH", "webmaster@pcProfil.de"), + __description = """Letitbit.net folder decrypter plugin""" + __license = "GPLv3" + __authors = [("DHMH", "webmaster@pcProfil.de"), ("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py index a3eb4f179..8e5ea2a03 100644 --- a/pyload/plugin/crypter/LinkCryptWs.py +++ b/pyload/plugin/crypter/LinkCryptWs.py @@ -12,15 +12,15 @@ from pyload.utils import html_unescape class LinkCryptWs(Crypter): - __name__ = "LinkCryptWs" - __type__ = "crypter" - __version__ = "0.08" + __name = "LinkCryptWs" + __type = "crypter" + __version = "0.08" - __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' + __pattern = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' - __description__ = """LinkCrypt.ws decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"), + __description = """LinkCrypt.ws decrypter plugin""" + __license = "GPLv3" + __authors = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"), ("glukgluk", ""), ("Gummibaer", "")] @@ -37,7 +37,7 @@ class LinkCryptWs(Crypter): def prepare(self): # Init - self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') + self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/pyload/plugin/crypter/LinkSaveIn.py b/pyload/plugin/crypter/LinkSaveIn.py index b303303a0..d01ea0982 100644 --- a/pyload/plugin/crypter/LinkSaveIn.py +++ b/pyload/plugin/crypter/LinkSaveIn.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleDereferer import SimpleDereferer class LinkSaveIn(SimpleDereferer): - __name__ = "LinkSaveIn" - __type__ = "crypter" - __version__ = "2.03" + __name = "LinkSaveIn" + __type = "crypter" + __version = "2.03" - __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?linksave\.in/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """LinkSave.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """LinkSave.in decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] COOKIES = [("linksave.in", "Linksave_Language", "english")] diff --git a/pyload/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py index facec37d5..cce31f8d6 100644 --- a/pyload/plugin/crypter/LinkdecrypterCom.py +++ b/pyload/plugin/crypter/LinkdecrypterCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class LinkdecrypterCom(Crypter): - __name__ = "LinkdecrypterCom" - __type__ = "crypter" - __version__ = "0.29" + __name = "LinkdecrypterCom" + __type = "crypter" + __version = "0.29" - __pattern__ = r'^unmatchable$' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'^unmatchable$' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Linkdecrypter.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + __description = """Linkdecrypter.com decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz"), ("flowlee", "")] diff --git a/pyload/plugin/crypter/LixIn.py b/pyload/plugin/crypter/LixIn.py index 4b978723f..8cb2d7957 100644 --- a/pyload/plugin/crypter/LixIn.py +++ b/pyload/plugin/crypter/LixIn.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class LixIn(Crypter): - __name__ = "LixIn" - __type__ = "crypter" - __version__ = "0.22" + __name = "LixIn" + __type = "crypter" + __version = "0.22" - __pattern__ = r'http://(?:www\.)?lix\.in/(?P.+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?lix\.in/(?P.+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Lix.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org")] + __description = """Lix.in decrypter plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org")] CAPTCHA_PATTERN = r'[\w^_]+)!(?P[\w,\\-]+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P[\w^_]+)!(?P[\w,\\-]+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Mega.co.nz folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Mega.co.nz folder decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] def setup(self): @@ -24,7 +24,7 @@ class MegaCoNz(Crypter): def decrypt(self, pyfile): - url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() + url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern, pyfile.url).groups() self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) self.urls = re.findall(r'(https://mega.co.nz/#N!.+?)<', self.html) diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py index 79900c08a..2cedfec09 100644 --- a/pyload/plugin/crypter/MegaRapidCz.py +++ b/pyload/plugin/crypter/MegaRapidCz.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class MegaRapidCz(SimpleCrypter): - __name__ = "MegaRapidCz" - __type__ = "crypter" - __version__ = "0.02" + __name = "MegaRapidCz" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Share-Rapid.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Share-Rapid.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r']*>' diff --git a/pyload/plugin/crypter/MegauploadCom.py b/pyload/plugin/crypter/MegauploadCom.py index 72e0268dd..5a5b8252c 100644 --- a/pyload/plugin/crypter/MegauploadCom.py +++ b/pyload/plugin/crypter/MegauploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class MegauploadCom(DeadCrypter): - __name__ = "MegauploadCom" - __type__ = "crypter" - __version__ = "0.02" + __name = "MegauploadCom" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' + __pattern = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' - __description__ = """Megaupload.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Megaupload.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/Movie2KTo.py b/pyload/plugin/crypter/Movie2KTo.py index f8ff4e756..e807855af 100644 --- a/pyload/plugin/crypter/Movie2KTo.py +++ b/pyload/plugin/crypter/Movie2KTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class Movie2KTo(DeadCrypter): - __name__ = "Movie2KTo" - __type__ = "crypter" - __version__ = "0.51" + __name = "Movie2KTo" + __type = "crypter" + __version = "0.51" - __pattern__ = r'http://(?:www\.)?movie2k\.to/(.+)\.html' - __config__ = [] + __pattern = r'http://(?:www\.)?movie2k\.to/(.+)\.html' + __config = [] - __description__ = """Movie2k.to decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("4Christopher", "4Christopher@gmx.de")] + __description = """Movie2k.to decrypter plugin""" + __license = "GPLv3" + __authors = [("4Christopher", "4Christopher@gmx.de")] diff --git a/pyload/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py index 1585ac1c8..7d046f2e3 100644 --- a/pyload/plugin/crypter/MultiUpOrg.py +++ b/pyload/plugin/crypter/MultiUpOrg.py @@ -7,24 +7,24 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class MultiUpOrg(SimpleCrypter): - __name__ = "MultiUpOrg" - __type__ = "crypter" - __version__ = "0.03" + __name = "MultiUpOrg" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?Pproject|download|miror)/\w+(/\w+)?' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?multiup\.org/(en|fr)/(?Pproject|download|miror)/\w+(/\w+)?' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """MultiUp.org decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """MultiUp.org decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'.*(?:Project|Projet|ownload|élécharger) (?P<N>.+?) (\(|- )' def getLinks(self): - m_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') + m_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') if m_type == "project": pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py index 856a94a25..622ccab4d 100644 --- a/pyload/plugin/crypter/MultiloadCz.py +++ b/pyload/plugin/crypter/MultiloadCz.py @@ -5,19 +5,19 @@ from pyload.plugin.Crypter import Crypter class MultiloadCz(Crypter): - __name__ = "MultiloadCz" - __type__ = "crypter" - __version__ = "0.40" + __name = "MultiloadCz" + __type = "crypter" + __version = "0.40" - __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""), ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] - __description__ = """Multiload.cz decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Multiload.cz decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>' @@ -27,7 +27,7 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): self.html = self.load(pyfile.url, decode=True) - if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": + if re.match(self.__pattern, pyfile.url).group(1) == "slozka": m = re.search(self.FOLDER_PATTERN, self.html) if m: self.urls.extend(m.group(1).split()) diff --git a/pyload/plugin/crypter/MultiuploadCom.py b/pyload/plugin/crypter/MultiuploadCom.py index 9127140f1..439e0e69b 100644 --- a/pyload/plugin/crypter/MultiuploadCom.py +++ b/pyload/plugin/crypter/MultiuploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class MultiuploadCom(DeadCrypter): - __name__ = "MultiuploadCom" - __type__ = "crypter" - __version__ = "0.02" + __name = "MultiuploadCom" + __type = "crypter" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+' + __pattern = r'http://(?:www\.)?multiupload\.(com|nl)/\w+' - __description__ = """MultiUpload.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """MultiUpload.com decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py index 29b45b11a..d0e0403fb 100644 --- a/pyload/plugin/crypter/NCryptIn.py +++ b/pyload/plugin/crypter/NCryptIn.py @@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import ReCaptcha class NCryptIn(Crypter): - __name__ = "NCryptIn" - __type__ = "crypter" - __version__ = "1.34" + __name = "NCryptIn" + __type = "crypter" + __version = "1.34" - __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """NCrypt.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), + __description = """NCrypt.in decrypter plugin""" + __license = "GPLv3" + __authors = [("fragonib", "fragonib[AT]yahoo[DOT]es"), ("stickell", "l.stickell@yahoo.it")] @@ -79,7 +79,7 @@ class NCryptIn(Crypter): def isSingleLink(self): - link_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') + link_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') return link_type in ("link", "frame") diff --git a/pyload/plugin/crypter/NetfolderIn.py b/pyload/plugin/crypter/NetfolderIn.py index a24a5270f..d99f47328 100644 --- a/pyload/plugin/crypter/NetfolderIn.py +++ b/pyload/plugin/crypter/NetfolderIn.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class NetfolderIn(SimpleCrypter): - __name__ = "NetfolderIn" - __type__ = "crypter" - __version__ = "0.72" + __name = "NetfolderIn" + __type = "crypter" + __version = "0.72" - __pattern__ = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """NetFolder.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org"), + __description = """NetFolder.in decrypter plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org"), ("fragonib", "fragonib[AT]yahoo[DOT]es")] @@ -43,7 +43,7 @@ class NetfolderIn(SimpleCrypter): def submitPassword(self): # Gather data try: - m = re.match(self.__pattern__, self.pyfile.url) + m = re.match(self.__pattern, self.pyfile.url) id = m.group('ID') except AttributeError: self.logDebug("Unable to get package id from url [%s]" % self.pyfile.url) diff --git a/pyload/plugin/crypter/NosvideoCom.py b/pyload/plugin/crypter/NosvideoCom.py index d048ec956..a9f29cf74 100644 --- a/pyload/plugin/crypter/NosvideoCom.py +++ b/pyload/plugin/crypter/NosvideoCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class NosvideoCom(SimpleCrypter): - __name__ = "NosvideoCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "NosvideoCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Nosvideo.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("igel", "igelkun@myopera.com")] + __description = """Nosvideo.com decrypter plugin""" + __license = "GPLv3" + __authors = [("igel", "igelkun@myopera.com")] LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"' diff --git a/pyload/plugin/crypter/OneKhDe.py b/pyload/plugin/crypter/OneKhDe.py index 323214df8..f0b6f7db1 100644 --- a/pyload/plugin/crypter/OneKhDe.py +++ b/pyload/plugin/crypter/OneKhDe.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class OneKhDe(Crypter): - __name__ = "OneKhDe" - __type__ = "crypter" - __version__ = "0.11" + __name = "OneKhDe" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?1kh\.de/f/' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?1kh\.de/f/' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """1kh.de decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org")] + __description = """1kh.de decrypter plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org")] def __init__(self, parent): diff --git a/pyload/plugin/crypter/OronCom.py b/pyload/plugin/crypter/OronCom.py index 257e0e046..316e6d525 100644 --- a/pyload/plugin/crypter/OronCom.py +++ b/pyload/plugin/crypter/OronCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class OronCom(DeadCrypter): - __name__ = "OronCom" - __type__ = "crypter" - __version__ = "0.11" + __name = "OronCom" + __type = "crypter" + __version = "0.11" - __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+' - __config__ = [] + __pattern = r'http://(?:www\.)?oron\.com/folder/\w+' + __config = [] - __description__ = """Oron.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("DHMH", "webmaster@pcProfil.de")] + __description = """Oron.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("DHMH", "webmaster@pcProfil.de")] diff --git a/pyload/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py index 43a818cf1..95c925733 100644 --- a/pyload/plugin/crypter/PastebinCom.py +++ b/pyload/plugin/crypter/PastebinCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class PastebinCom(SimpleCrypter): - __name__ = "PastebinCom" - __type__ = "crypter" - __version__ = "0.03" + __name = "PastebinCom" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?pastebin\.com/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Pastebin.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Pastebin.com decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>' diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py index 8cd4b9c02..750672ec1 100644 --- a/pyload/plugin/crypter/QuickshareCz.py +++ b/pyload/plugin/crypter/QuickshareCz.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class QuickshareCz(Crypter): - __name__ = "QuickshareCz" - __type__ = "crypter" - __version__ = "0.10" + __name = "QuickshareCz" + __type = "crypter" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Quickshare.cz folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Quickshare.cz folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' diff --git a/pyload/plugin/crypter/RSLayerCom.py b/pyload/plugin/crypter/RSLayerCom.py index 8ea8a4369..756c356f7 100644 --- a/pyload/plugin/crypter/RSLayerCom.py +++ b/pyload/plugin/crypter/RSLayerCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class RSLayerCom(DeadCrypter): - __name__ = "RSLayerCom" - __type__ = "crypter" - __version__ = "0.21" + __name = "RSLayerCom" + __type = "crypter" + __version = "0.21" - __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-' - __config__ = [] + __pattern = r'http://(?:www\.)?rs-layer\.com/directory-' + __config = [] - __description__ = """RS-Layer.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("hzpz", "")] + __description = """RS-Layer.com decrypter plugin""" + __license = "GPLv3" + __authors = [("hzpz", "")] diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py index 0c27c29b5..023024a82 100644 --- a/pyload/plugin/crypter/RelinkUs.py +++ b/pyload/plugin/crypter/RelinkUs.py @@ -12,17 +12,17 @@ from pyload.utils import safe_join class RelinkUs(Crypter): - __name__ = "RelinkUs" - __type__ = "crypter" - __version__ = "3.12" + __name = "RelinkUs" + __type = "crypter" + __version = "3.12" - __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Relink.us decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), + __description = """Relink.us decrypter plugin""" + __license = "GPLv3" + __authors = [("fragonib", "fragonib[AT]yahoo[DOT]es"), ("AndroKev", "neureither.kevin@gmail.com")] @@ -99,7 +99,7 @@ class RelinkUs(Crypter): def initPackage(self, pyfile): - self.fileid = re.match(self.__pattern__, pyfile.url).group('ID') + self.fileid = re.match(self.__pattern, pyfile.url).group('ID') self.package = pyfile.package() diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py index 2d5d273ed..ed2d76e85 100644 --- a/pyload/plugin/crypter/SafelinkingNet.py +++ b/pyload/plugin/crypter/SafelinkingNet.py @@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import SolveMedia class SafelinkingNet(Crypter): - __name__ = "SafelinkingNet" - __type__ = "crypter" - __version__ = "0.14" + __name = "SafelinkingNet" + __type = "crypter" + __version = "0.14" - __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Safelinking.net decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("quareevo", "quareevo@arcor.de")] + __description = """Safelinking.net decrypter plugin""" + __license = "GPLv3" + __authors = [("quareevo", "quareevo@arcor.de")] SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w.-]+)';" @@ -29,7 +29,7 @@ class SafelinkingNet(Crypter): def decrypt(self, pyfile): url = pyfile.url - if re.match(self.__pattern__, url).group(1) == "d": + if re.match(self.__pattern, url).group(1) == "d": header = self.load(url, just_header=True) if 'location' in header: diff --git a/pyload/plugin/crypter/SecuredIn.py b/pyload/plugin/crypter/SecuredIn.py index b0b8eb6d3..23bcea8ab 100644 --- a/pyload/plugin/crypter/SecuredIn.py +++ b/pyload/plugin/crypter/SecuredIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class SecuredIn(DeadCrypter): - __name__ = "SecuredIn" - __type__ = "crypter" - __version__ = "0.21" + __name = "SecuredIn" + __type = "crypter" + __version = "0.21" - __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html' - __config__ = [] + __pattern = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html' + __config = [] - __description__ = """Secured.in decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de")] + __description = """Secured.in decrypter plugin""" + __license = "GPLv3" + __authors = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/SexuriaCom.py b/pyload/plugin/crypter/SexuriaCom.py index 10101cd7a..08f289541 100644 --- a/pyload/plugin/crypter/SexuriaCom.py +++ b/pyload/plugin/crypter/SexuriaCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class SexuriaCom(Crypter): - __name__ = "SexuriaCom" - __type__ = "crypter" - __version__ = "0.01" + __name = "SexuriaCom" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Sexuria.com decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("NETHead", "NETHead.AT.gmx.DOT.net")] + __description = """Sexuria.com decrypter plugin""" + __license = "GPLv3" + __authors = [("NETHead", "NETHead.AT.gmx.DOT.net")] PATTERN_SUPPORTED_MAIN = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', flags=re.I) diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py index 1328e86aa..10053640b 100644 --- a/pyload/plugin/crypter/ShareLinksBiz.py +++ b/pyload/plugin/crypter/ShareLinksBiz.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class ShareLinksBiz(Crypter): - __name__ = "ShareLinksBiz" - __type__ = "crypter" - __version__ = "1.14" + __name = "ShareLinksBiz" + __type = "crypter" + __version = "1.14" - __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Share-Links.biz decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")] + __description = """Share-Links.biz decrypter plugin""" + __license = "GPLv3" + __authors = [("fragonib", "fragonib[AT]yahoo[DOT]es")] def setup(self): @@ -67,8 +67,8 @@ class ShareLinksBiz(Crypter): url = pyfile.url if 's2l.biz' in url: url = self.load(url, just_header=True)['location'] - self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1) - self.fileId = re.match(self.__pattern__, url).group('ID') + self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern, url).group(1) + self.fileId = re.match(self.__pattern, url).group('ID') self.package = pyfile.package() diff --git a/pyload/plugin/crypter/SharingmatrixCom.py b/pyload/plugin/crypter/SharingmatrixCom.py index 7db09b246..d3e8f5b35 100644 --- a/pyload/plugin/crypter/SharingmatrixCom.py +++ b/pyload/plugin/crypter/SharingmatrixCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class SharingmatrixCom(DeadCrypter): - __name__ = "SharingmatrixCom" - __type__ = "crypter" - __version__ = "0.01" + __name = "SharingmatrixCom" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' + __pattern = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' - __description__ = """Sharingmatrix.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Sharingmatrix.com folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/SpeedLoadOrg.py b/pyload/plugin/crypter/SpeedLoadOrg.py index 95c8864dc..32677e9ef 100644 --- a/pyload/plugin/crypter/SpeedLoadOrg.py +++ b/pyload/plugin/crypter/SpeedLoadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class SpeedLoadOrg(DeadCrypter): - __name__ = "SpeedLoadOrg" - __type__ = "crypter" - __version__ = "0.30" + __name = "SpeedLoadOrg" + __type = "crypter" + __version = "0.30" - __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)' - __config__ = [] + __pattern = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)' + __config = [] - __description__ = """Speedload decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Speedload decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/StealthTo.py b/pyload/plugin/crypter/StealthTo.py index 23747be1b..b974a169c 100644 --- a/pyload/plugin/crypter/StealthTo.py +++ b/pyload/plugin/crypter/StealthTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class StealthTo(DeadCrypter): - __name__ = "StealthTo" - __type__ = "crypter" - __version__ = "0.20" + __name = "StealthTo" + __type = "crypter" + __version = "0.20" - __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+' - __config__ = [] + __pattern = r'http://(?:www\.)?stealth\.to/folder/.+' + __config = [] - __description__ = """Stealth.to decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org")] + __description = """Stealth.to decrypter plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org")] diff --git a/pyload/plugin/crypter/TnyCz.py b/pyload/plugin/crypter/TnyCz.py index d73f6de63..19427b845 100644 --- a/pyload/plugin/crypter/TnyCz.py +++ b/pyload/plugin/crypter/TnyCz.py @@ -6,17 +6,17 @@ import re class TnyCz(SimpleCrypter): - __name__ = "TnyCz" - __type__ = "crypter" - __version__ = "0.03" + __name = "TnyCz" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?tny\.cz/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Tny.cz decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Tny.cz decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'<title>(?P<N>.+) - .+' diff --git a/pyload/plugin/crypter/TrailerzoneInfo.py b/pyload/plugin/crypter/TrailerzoneInfo.py index 06894054b..cad464d47 100644 --- a/pyload/plugin/crypter/TrailerzoneInfo.py +++ b/pyload/plugin/crypter/TrailerzoneInfo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter class TrailerzoneInfo(DeadCrypter): - __name__ = "TrailerzoneInfo" - __type__ = "crypter" - __version__ = "0.03" + __name = "TrailerzoneInfo" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?trailerzone\.info/.+' - __config__ = [] + __pattern = r'http://(?:www\.)?trailerzone\.info/.+' + __config = [] - __description__ = """TrailerZone.info decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("godofdream", "soilfiction@gmail.com")] + __description = """TrailerZone.info decrypter plugin""" + __license = "GPLv3" + __authors = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/crypter/TurbobitNet.py b/pyload/plugin/crypter/TurbobitNet.py index d6b6d7b38..fa77732ad 100644 --- a/pyload/plugin/crypter/TurbobitNet.py +++ b/pyload/plugin/crypter/TurbobitNet.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads class TurbobitNet(SimpleCrypter): - __name__ = "TurbobitNet" - __type__ = "crypter" - __version__ = "0.05" + __name = "TurbobitNet" + __type = "crypter" + __version = "0.05" - __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Turbobit.net folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it"), + __description = """Turbobit.net folder decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] @@ -39,6 +39,6 @@ class TurbobitNet(SimpleCrypter): def getLinks(self): - id = re.match(self.__pattern__, self.pyfile.url).group('ID') + id = re.match(self.__pattern, self.pyfile.url).group('ID') fixurl = lambda id: "http://turbobit.net/%s.html" % id return map(fixurl, self._getLinks(id)) diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py index 39d5dee9d..3a62f0ccc 100644 --- a/pyload/plugin/crypter/TusfilesNet.py +++ b/pyload/plugin/crypter/TusfilesNet.py @@ -8,23 +8,23 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter class TusfilesNet(XFSCrypter): - __name__ = "TusfilesNet" - __type__ = "crypter" - __version__ = "0.08" + __name = "TusfilesNet" + __type = "crypter" + __version = "0.08" - __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.)?tusfiles\.net/go/(?P\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Tusfiles.net folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com"), + __description = """Tusfiles.net folder decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com"), ("stickell", "l.stickell@yahoo.it")] PAGES_PATTERN = r'>\((\d+) \w+\)<' - URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g/')] + URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g/')] def loadPage(self, page_n): diff --git a/pyload/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py index 81fbee172..09ec9fa67 100644 --- a/pyload/plugin/crypter/UlozTo.py +++ b/pyload/plugin/crypter/UlozTo.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class UlozTo(Crypter): - __name__ = "UlozTo" - __type__ = "crypter" - __version__ = "0.20" + __name = "UlozTo" + __type = "crypter" + __version = "0.20" - __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Uloz.to folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Uloz.to folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'
      (.*?)
    ' diff --git a/pyload/plugin/crypter/UploadableCh.py b/pyload/plugin/crypter/UploadableCh.py index f5fb0c3bc..bf6bd09eb 100644 --- a/pyload/plugin/crypter/UploadableCh.py +++ b/pyload/plugin/crypter/UploadableCh.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class UploadableCh(SimpleCrypter): - __name__ = "UploadableCh" - __type__ = "crypter" - __version__ = "0.03" + __name = "UploadableCh" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?uploadable\.ch/list/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Uploadable.ch folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("guidobelix", "guidobelix@hotmail.it"), + __description = """Uploadable.ch folder decrypter plugin""" + __license = "GPLv3" + __authors = [("guidobelix", "guidobelix@hotmail.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py index 282f82be7..4acfc3a79 100644 --- a/pyload/plugin/crypter/UploadedTo.py +++ b/pyload/plugin/crypter/UploadedTo.py @@ -8,17 +8,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class UploadedTo(SimpleCrypter): - __name__ = "UploadedTo" - __type__ = "crypter" - __version__ = "0.42" + __name = "UploadedTo" + __type = "crypter" + __version = "0.42" - __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """UploadedTo decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """UploadedTo decrypter plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] PLAIN_PATTERN = r'    user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P[\w-]+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?Puser|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P[\w-]+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("likes", "bool", "Grab user (channel) liked videos", False), ("favorites", "bool", "Grab user (channel) favorite videos", False), ("uploads", "bool", "Grab channel unplaylisted videos", True)] - __description__ = """Youtube.com channel & playlist decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __description = """Youtube.com channel & playlist decrypter plugin""" + __license = "GPLv3" + __authors = [("Walter Purcaro", "vuolter@gmail.com")] API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" @@ -95,7 +95,7 @@ class YoutubeBatch(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern__, pyfile.url) + m = re.match(self.__pattern, pyfile.url) m_id = m.group('ID') m_type = m.group('TYPE') -- cgit v1.2.3