diff options
Diffstat (limited to 'module/plugins/crypter')
87 files changed, 230 insertions, 167 deletions
diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index c34313389..eb094dd2a 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class BitshareComFolder(SimpleCrypter): - __name = "BitshareCom" + __name__ = "BitshareCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 3d40c9c0c..09acace63 100644 --- a/module/plugins/crypter/C1NeonCom.py +++ b/module/plugins/crypter/C1NeonCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class C1NeonCom(DeadCrypter): - __name = "C1NeonCom" + __name__ = "C1NeonCom" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 847490786..3b02ccef0 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class ChipDe(Crypter): - __name = "ChipDe" + __name__ = "ChipDe" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Chip.de decrypter plugin""" diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index 79a52fbfa..26fccde7b 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CloudzillaToFolder(SimpleHoster): - __name = "CloudzillaTo" + __name__ = "CloudzillaTo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Cloudzilla.to folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 926396192..6bcef85d1 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CrockoComFolder(SimpleCrypter): - __name = "CrockoCom" + __name__ = "CrockoCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 1613232d1..be0094747 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class CryptItCom(DeadCrypter): - __name = "CryptItCom" + __name__ = "CryptItCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 7728f236e..d39f7d2a2 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): - __name = "CzshareCom" + __name__ = "CzshareCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index de3dddfc3..0abc720f1 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -9,13 +9,14 @@ from module.utils import save_join as fs_join class DailymotionComFolder(Crypter): - __name = "DailymotionCom" + __name__ = "DailymotionCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Dailymotion.com channel & playlist decrypter""" diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index cec612deb..1a961111d 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DataHuFolder(SimpleCrypter): - __name = "DataHu" + __name__ = "DataHu" __type__ = "crypter" __version__ = "0.08" __status__ = "testing" __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index c462db795..bdd076b16 100644 --- a/module/plugins/crypter/DdlstorageComFolder.py +++ b/module/plugins/crypter/DdlstorageComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DdlstorageComFolder(DeadCrypter): - __name = "DdlstorageCom" + __name__ = "DdlstorageCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 2ea6a3655..70b397db3 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DepositfilesComFolder(SimpleCrypter): - __name = "DepositfilesCom" + __name__ = "DepositfilesCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 631032018..6ce2e7248 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class Dereferer(SimpleCrypter): - __name = "Dereferer" + __name__ = "Dereferer" __type__ = "crypter" __version__ = "0.19" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Crypter for dereferers""" @@ -31,11 +32,11 @@ class Dereferer(SimpleCrypter): def init(self): super(Dereferer, self).init() - self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] #@TODO: Recheck in 0.4.10 + self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.classname]['pattern'] #@TODO: Recheck in 0.4.10 - self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.PLUGIN_DOMAIN) if part != '.') def get_links(self): - return [re.match(self.__pattern, self.pyfile.url).group('LINK')] + return [re.match(self.__pattern__, self.pyfile.url).group('LINK')] diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 92952c57d..92a50f580 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DevhostStFolder(SimpleCrypter): - __name = "DevhostSt" + __name__ = "DevhostSt" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index fccd385f5..760cbfaa6 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DlProtectCom(SimpleCrypter): - __name = "DlProtectCom" + __name__ = "DlProtectCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 5bb7208af..eae58d60c 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): - __name = "DuckCryptInfo" + __name__ = "DuckCryptInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """DuckCrypt.info decrypter plugin""" @@ -28,7 +29,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": @@ -39,7 +40,7 @@ class DuckCryptInfo(Crypter): def handle_folder(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.log_debug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup.BeautifulSoup(html) diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index 0cc810ea6..36e7790ae 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DuploadOrgFolder(DeadCrypter): - __name = "DuploadOrg" + __name__ = "DuploadOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 96c546ebc..bbeef30bc 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): - __name = "EasybytezCom" + __name__ = "EasybytezCom" __type__ = "crypter" __version__ = "0.11" __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Easybytez.com folder decrypter plugin""" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 8bf5aa787..96eb92f7e 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -6,13 +6,14 @@ from module.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name = "EmbeduploadCom" + __name__ = "EmbeduploadCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True ), ("preferedHoster" , "str" , "Prefered hoster list (bar-separated)", "embedupload"), ("ignoredHoster" , "str" , "Ignored hoster list (bar-separated)" , "" )] diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 0c072d07f..f775c8695 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilebeerInfoFolder(DeadCrypter): - __name = "FilebeerInfo" + __name__ = "FilebeerInfo" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 89495e8c7..63f6ad677 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilecloudIoFolder(SimpleCrypter): - __name = "FilecloudIo" + __name__ = "FilecloudIo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 720d20e01..a516392f1 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -15,12 +15,13 @@ from module.plugins.captcha.SolveMedia import SolveMedia class FilecryptCc(Crypter): - __name = "FilecryptCc" + __name__ = "FilecryptCc" __type__ = "crypter" __version__ = "0.20" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filecrypt.cc decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index e7d6b4771..2d3634a1f 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilefactoryComFolder(SimpleCrypter): - __name = "FilefactoryCom" + __name__ = "FilefactoryCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 9151e43c3..5a79b17e3 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilerNetFolder(SimpleCrypter): - __name = "FilerNet" + __name__ = "FilerNet" __type__ = "crypter" __version__ = "0.43" __status__ = "testing" __pattern__ = r'https?://filer\.net/folder/\w{16}' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 7a64ac451..af01338cb 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): - __name = "FileserveCom" + __name__ = "FileserveCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """FileServe.com folder decrypter plugin""" diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index c749c74b2..00ceb31f1 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilesonicComFolder(DeadCrypter): - __name = "FilesonicCom" + __name__ = "FilesonicCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 2dff23b11..c65296e8b 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilestubeCom(SimpleCrypter): - __name = "FilestubeCom" + __name__ = "FilestubeCom" __type__ = "crypter" __version__ = "0.07" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 4edb85371..18960f605 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FiletramCom(SimpleCrypter): - __name = "FiletramCom" + __name__ = "FiletramCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 47a9d96e4..4a352d942 100644 --- a/module/plugins/crypter/FiredriveComFolder.py +++ b/module/plugins/crypter/FiredriveComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FiredriveComFolder(DeadCrypter): - __name = "FiredriveCom" + __name__ = "FiredriveCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index a2fdb99d1..519fb75c4 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -9,13 +9,14 @@ from module.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): - __name = "4chan" + __name__ = "FourChanOrg" __type__ = "crypter" - __version__ = "0.33" + __version__ = "0.34" __status__ = "testing" __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """4chan.org folder decrypter plugin""" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 7ea7ae6ad..1f78470e2 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreakhareComFolder(SimpleCrypter): - __name = "FreakhareCom" + __name__ = "FreakhareCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index 8920c6c15..246d9ede9 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreetexthostCom(SimpleCrypter): - __name = "FreetexthostCom" + __name__ = "FreetexthostCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 6da2cccf9..3b947a057 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FshareVnFolder(SimpleCrypter): - __name = "FshareVn" + __name__ = "FshareVn" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index 9ff8ca218..6f19bdbce 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FurLy(SimpleCrypter): - __name = "FurLy" + __name__ = "FurLy" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fur\.ly/(\d/)?\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Fur.ly decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index 9ea5b333e..6aed6ffba 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -8,13 +8,14 @@ import json class Go4UpCom(SimpleCrypter): - __name = "Go4UpCom" + __name__ = "Go4UpCom" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True), ("preferred_hoster" , "int" , "Id of preferred hoster or 0 for all", 0)] diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 8298701d3..cbe44a5b3 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -5,12 +5,13 @@ from module.common.json_layer import json_loads class GooGl(SimpleCrypter): - __name = "GooGl" + __name__ = "GooGl" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?goo\.gl/([a-zA-Z]+/)?\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Goo.gl decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index 774e768f9..2a687937e 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class GoogledriveComFolder(SimpleCrypter): - __name = "GoogledriveCom" + __name__ = "GoogledriveCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?drive\.google\.com/folderview\?.*id=\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Drive.google.com folder decrypter plugin""" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 23ec42064..f99b66f40 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): - __name = "HoerbuchIn" + __name__ = "HoerbuchIn" __type__ = "crypter" __version__ = "0.62" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Hoerbuch.in decrypter plugin""" diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index a489e4309..c5eab0490 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/module/plugins/crypter/HotfileComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class HotfileComFolder(DeadCrypter): - __name = "HotfileCom" + __name__ = "HotfileCom" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index bebdbef55..7d73b898f 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class ILoadTo(DeadCrypter): - __name = "ILoadTo" + __name__ = "ILoadTo" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index a2bb4c9f7..6ae70df79 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -5,13 +5,14 @@ from module.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name = "ImgurComAlbum" + __name__ = "ImgurComAlbum" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index b9107ef95..82e3a818f 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): - __name = "LetitbitNet" + __name__ = "LetitbitNet" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Letitbit.net folder decrypter plugin""" diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 8fff032a0..4f3cceebb 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -12,12 +12,13 @@ from module.utils import html_unescape class LinkCryptWs(Crypter): - __name = "LinkCryptWs" + __name__ = "LinkCryptWs" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """LinkCrypt.ws decrypter plugin""" __license__ = "GPLv3" @@ -37,7 +38,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/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 1cce479ac..e4701a62a 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class LinkSaveIn(SimpleCrypter): - __name = "LinkSaveIn" + __name__ = "LinkSaveIn" __type__ = "crypter" __version__ = "2.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """LinkSave.in decrypter plugin""" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 589f21bd2..999adcc79 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiCrypter import MultiCrypter class LinkdecrypterCom(MultiCrypter): - __name = "LinkdecrypterCom" + __name__ = "LinkdecrypterCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Linkdecrypter.com decrypter plugin""" diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 49ca7e020..853240b44 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -7,13 +7,14 @@ from module.plugins.internal.Crypter import Crypter class LixIn(Crypter): - __name = "LixIn" + __name__ = "LixIn" __type__ = "crypter" __version__ = "0.24" __status__ = "testing" __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Lix.in decrypter plugin""" @@ -29,7 +30,7 @@ class LixIn(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.error(_("Unable to identify file ID")) diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index 93ed91450..b25c9485a 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class LofCc(DeadCrypter): - __name = "LofCc" + __name__ = "LofCc" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index 03e6377d6..98c63b9d4 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MBLinkInfo(DeadCrypter): - __name = "MBLinkInfo" + __name__ = "MBLinkInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index c541a0505..4ef330a3f 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class MediafireComFolder(Crypter): - __name = "MediafireCom" + __name__ = "MediafireCom" __type__ = "crypter" __version__ = "0.16" __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Mediafire.com folder decrypter plugin""" diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index aefdd8532..abdecff30 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.Crypter import Crypter class MegaCoNzFolder(Crypter): - __name = "MegaCoNz" + __name__ = "MegaCoNz" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Mega.co.nz folder decrypter plugin""" @@ -25,6 +26,6 @@ class MegaCoNzFolder(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/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index 11f9622c8..d7e79db34 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MegaRapidCzFolder(SimpleCrypter): - __name = "MegaRapidCz" + __name__ = "MegaRapidCz" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index 2d21ff55b..f1ac8ddf7 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MegauploadComFolder(DeadCrypter): - __name = "MegauploadCom" + __name__ = "MegauploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index 6c582ed9a..53636cda3 100644 --- a/module/plugins/crypter/Movie2KTo.py +++ b/module/plugins/crypter/Movie2KTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class Movie2KTo(DeadCrypter): - __name = "Movie2KTo" + __name__ = "Movie2KTo" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index 183b4b472..8c512da28 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MultiUpOrg(SimpleCrypter): - __name = "MultiUpOrg" + __name__ = "MultiUpOrg" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|mirror)/\w+(/\w+)?' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -26,7 +27,7 @@ class MultiUpOrg(SimpleCrypter): def get_links(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/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 10cc5a3d7..034fdec0c 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): - __name = "MultiloadCz" + __name__ = "MultiloadCz" __type__ = "crypter" __version__ = "0.42" __status__ = "testing" __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True), ("usedHoster" , "str" , "Prefered hoster list (bar-separated)", "" ), ("ignoredHoster" , "str" , "Ignored hoster list (bar-separated)" , "" )] @@ -28,7 +29,7 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): self.html = self.load(pyfile.url) - 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 is not None: self.urls.extend(m.group(1).split()) diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 325ffc153..358758b7a 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MultiuploadCom(DeadCrypter): - __name = "MultiuploadCom" + __name__ = "MultiuploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 756adc379..fe26aec52 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -10,13 +10,14 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class NCryptIn(Crypter): - __name = "NCryptIn" + __name__ = "NCryptIn" __type__ = "crypter" __version__ = "1.37" __status__ = "testing" __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """NCrypt.in decrypter plugin""" @@ -80,7 +81,7 @@ class NCryptIn(Crypter): def is_single_link(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/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 49cf3716a..5b992bf58 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class NetfolderIn(DeadCrypter): - __name = "NetfolderIn" + __name__ = "NetfolderIn" __type__ = "crypter" __version__ = "0.74" __status__ = "testing" diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py index 431ed0104..d6bdd6b98 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NitroflareComFolder(SimpleCrypter): - __name = "NitroflareCom" + __name__ = "NitroflareCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/folder/(?P<USER>\d+)/(?P<ID>[\w=]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Nitroflare.com folder decrypter plugin""" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index a48672a45..d186dd635 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NosvideoCom(SimpleCrypter): - __name = "NosvideoCom" + __name__ = "NosvideoCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index ca6a92508..054a8c902 100644 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class OronComFolder(DeadCrypter): - __name = "OronCom" + __name__ = "OronCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index eeb605dd7..ed52a49cc 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class PastebinCom(SimpleCrypter): - __name = "PastebinCom" + __name__ = "PastebinCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https://(?:www\.)?pastebin\.com/(.+i=)?(?P<ID>\w{8})' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -19,7 +20,7 @@ class PastebinCom(SimpleCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - URL_REPLACEMENTS = [(__pattern + '.*', r'http://www.pastebin.com/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + '.*', r'http://www.pastebin.com/\g<ID>')] NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)"' LINK_PATTERN = r'<div class="de\d+">(.+?)<' diff --git a/module/plugins/crypter/PastedCo.py b/module/plugins/crypter/PastedCo.py index 781b60166..c57d4e6c5 100644 --- a/module/plugins/crypter/PastedCo.py +++ b/module/plugins/crypter/PastedCo.py @@ -6,12 +6,13 @@ import re class PastedCo(Crypter): - __name = "PastedCo" + __name__ = "PastedCo" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://pasted\.co/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Pasted.co decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 575e18427..cb51392f2 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): - __name = "QuickshareCz" + __name__ = "QuickshareCz" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Quickshare.cz folder decrypter plugin""" diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 34d8e19b6..c8637279b 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class RSLayerCom(DeadCrypter): - __name = "RSLayerCom" + __name__ = "RSLayerCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 3e40b554d..ea0ce6072 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -12,13 +12,14 @@ from module.utils import save_join as fs_join class RelinkUs(Crypter): - __name = "RelinkUs" + __name__ = "RelinkUs" __type__ = "crypter" __version__ = "3.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Relink.us decrypter plugin""" @@ -100,7 +101,7 @@ class RelinkUs(Crypter): def init_package(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/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index c90a67773..734f62e6d 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -10,13 +10,14 @@ from module.plugins.captcha.SolveMedia import SolveMedia class SafelinkingNet(Crypter): - __name = "SafelinkingNet" + __name__ = "SafelinkingNet" __type__ = "crypter" __version__ = "0.17" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Safelinking.net decrypter plugin""" @@ -30,7 +31,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/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 7247d3169..4731e41f4 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SecuredIn(DeadCrypter): - __name = "SecuredIn" + __name__ = "SecuredIn" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 6e224e694..42a322dd3 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -4,13 +4,14 @@ import re from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): - __name = "SexuriaCom" + __name__ = "SexuriaCom" __type__ = "crypter" __version__ = "0.10" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """Sexuria.com decrypter plugin""" diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 77331e065..99c2f0db1 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -7,12 +7,13 @@ import re class ShSt(Crypter): - __name = "ShSt" + __name__ = "ShSt" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://sh\.st/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Sh.St decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 448ad3b15..124a3a5b4 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): - __name = "ShareLinksBiz" + __name__ = "ShareLinksBiz" __type__ = "crypter" __version__ = "1.18" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Share-Links.biz decrypter plugin""" @@ -70,12 +71,12 @@ class ShareLinksBiz(Crypter): if 's2l.biz' in url: url = self.load(url, just_header=True)['location'] - if re.match(self.__pattern, url): - self.base_url = "http://www.%s.biz" % re.match(self.__pattern, url).group(1) - self.file_id = re.match(self.__pattern, url).group('ID') + if re.match(self.__pattern__, url): + self.base_url = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1) + self.file_id = re.match(self.__pattern__, url).group('ID') else: - self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern)) + self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern__)) self.fail(_("Unsupported download link")) self.package = pyfile.package() diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index b8519bad5..d7c467933 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SharingmatrixComFolder(DeadCrypter): - __name = "SharingmatrixCom" + __name__ = "SharingmatrixCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index ff1cb0c73..fcf2cea05 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SpeedLoadOrgFolder(DeadCrypter): - __name = "SpeedLoadOrg" + __name__ = "SpeedLoadOrg" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 79e41a66b..3a175cd87 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class StealthTo(DeadCrypter): - __name = "StealthTo" + __name__ = "StealthTo" __type__ = "crypter" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/crypter/TNTVillageScambioeticoOrg.py b/module/plugins/crypter/TNTVillageScambioeticoOrg.py index 6df634cf8..567e7f752 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TNTVillageScambioeticoOrg(SimpleCrypter): - __name = "TNTVillageScambioeticoOrg" + __name__ = "TNTVillageScambioeticoOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?forum\.tntvillage\.scambioetico\.org/index\.php\?.*showtopic=\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """TNTVillage.scambioetico.org decrypter plugin""" diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index d4d86ff3d..b630cd86e 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TinyurlCom(SimpleCrypter): - __name = "TinyurlCom" + __name__ = "TinyurlCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(preview\.)?tinyurl\.com/[\w\-]+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Tinyurl.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index 8ab613fef..07cfeb728 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TnyCz(SimpleCrypter): - __name = "TnyCz" + __name__ = "TnyCz" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 9ecd958e1..03ab004a3 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class TrailerzoneInfo(DeadCrypter): - __name = "TrailerzoneInfo" + __name__ = "TrailerzoneInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index cd1a57691..ac18a7399 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class TurbobitNetFolder(SimpleCrypter): - __name = "TurbobitNet" + __name__ = "TurbobitNet" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index f351707e5..640b4bdfb 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -8,13 +8,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class TusfilesNetFolder(XFSCrypter): - __name = "TusfilesNet" + __name__ = "TusfilesNet" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Tusfiles.net folder decrypter plugin""" @@ -25,7 +26,7 @@ class TusfilesNetFolder(XFSCrypter): PAGES_PATTERN = r'>\((\d+) \w+\)<' - URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] def load_page(self, page_n): diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index c2b8e106a..b78838cea 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): - __name = "UlozTo" + __name__ = "UlozTo" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Uloz.to folder decrypter plugin""" diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index e1d29cbdf..0809b0f37 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadableChFolder(SimpleCrypter): - __name = "UploadableCh" + __name__ = "UploadableCh" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index f1e217e92..0d4e621b2 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadedToFolder(SimpleCrypter): - __name = "UploadedTo" + __name__ = "UploadedTo" __type__ = "crypter" __version__ = "0.44" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """UploadedTo decrypter plugin""" diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 90b7c5c6b..7679836d2 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WiiReloadedOrg(DeadCrypter): - __name = "WiiReloadedOrg" + __name__ = "WiiReloadedOrg" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index ffe08b30d..2cf6f81fd 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WuploadComFolder(DeadCrypter): - __name = "WuploadCom" + __name__ = "WuploadCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index aa65ccd12..50b462e93 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class XFileSharingProFolder(XFSCrypter): - __name = "XFileSharingPro" + __name__ = "XFileSharingPro" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """XFileSharingPro dummy folder decrypter plugin for hook""" @@ -30,14 +31,14 @@ class XFileSharingProFolder(XFSCrypter): def init(self): super(XFileSharingProFolder, self).init() - self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] + self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.classname]['pattern'] - self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.') def _setup(self): - account_name = self.__name__ if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME + account_name = self.classname if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME self.chunk_limit = 1 self.multiDL = True @@ -59,7 +60,7 @@ class XFileSharingProFolder(XFSCrypter): self.account = self.pyload.accountManager.getAccountPlugin(self.PLUGIN_NAME) if not self.account: - self.account = self.pyload.accountManager.getAccountPlugin(self.__name__) + self.account = self.pyload.accountManager.getAccountPlugin(self.classname) if self.account: if not self.account.PLUGIN_DOMAIN: diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 230988318..41abc861e 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -4,13 +4,14 @@ from module.plugins.internal.Crypter import Crypter class XupPl(Crypter): - __name = "XupPl" + __name__ = "XupPl" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Xup.pl decrypter plugin""" diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index a8d79d863..3c794e956 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -9,13 +9,14 @@ from module.utils import save_join as fs_join class YoutubeComFolder(Crypter): - __name = "YoutubeCom" + __name__ = "YoutubeCom" __type__ = "crypter" __version__ = "1.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ), ("likes" , "bool", "Grab user (channel) liked videos" , False), ("favorites" , "bool", "Grab user (channel) favorite videos", False), @@ -95,7 +96,7 @@ class YoutubeComFolder(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') |