diff options
Diffstat (limited to 'module/plugins')
231 files changed, 1081 insertions, 571 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 3141009c3..563eaef6d 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -18,7 +18,9 @@ class CCF(Container): __status__ = "testing" __pattern__ = r'.+\.ccf$' - __config__ = [("activated", "bool", "Activated", 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__ = """CCF container decrypter plugin""" __license__ = "GPLv3" @@ -47,4 +49,4 @@ class CCF(Container): with open(dlc_file, "w") as tempdlc: tempdlc.write(dlc) - self.urls = [dlc_file] + self.links = [dlc_file] diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index 4694478a7..7b4364a0a 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -18,7 +18,9 @@ class DLC(Container): __status__ = "testing" __pattern__ = r'(.+\.dlc|[\w\+^_]+==[\w\+^_/]+==)$' - __config__ = [("activated", "bool", "Activated", 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__ = """DLC container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index f3d56f6f4..2401a79ce 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -18,7 +18,9 @@ class RSDF(Container): __status__ = "testing" __pattern__ = r'.+\.rsdf$' - __config__ = [("activated", "bool", "Activated", 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__ = """RSDF container decrypter plugin""" __license__ = "GPLv3" @@ -60,4 +62,4 @@ class RSDF(Container): if not link: continue link = cipher.decrypt(link.decode('base64')).replace('CCF: ', '') - self.urls.append(link) + self.links.append(link) diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 8d4b1b785..741538947 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -13,9 +13,11 @@ class TXT(Container): __status__ = "testing" __pattern__ = r'.+\.(txt|text)$' - __config__ = [("activated", "bool", "Activated", True), - ("flush" , "bool" , "Flush list after adding", False ), - ("encoding", "string", "File encoding" , "utf-8")] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True ), + ("flush" , "bool", "Flush list after adding" , False ), + ("encoding" , "str" , "File encoding" , "utf-8")] __description__ = """Read link lists in plain text formats""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index 065d7b697..c1c4a915b 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -10,10 +10,11 @@ class BitshareComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Bitshare.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 9998e02fc..de0868fa1 100644 --- a/module/plugins/crypter/C1NeonCom.py +++ b/module/plugins/crypter/C1NeonCom.py @@ -10,7 +10,7 @@ class C1NeonCom(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?c1neon\.com/.+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """C1neon.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index f57ebc387..ced06fe0c 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -12,9 +12,10 @@ class ChipDe(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Chip.de decrypter plugin""" __license__ = "GPLv3" @@ -30,8 +31,8 @@ class ChipDe(Crypter): self.fail(_("Failed to find the URL")) else: - self.urls = [f.group(1)] - self.log_debug("The file URL is %s" % self.urls[0]) + self.links = [f.group(1)] + self.log_debug("The file URL is %s" % self.links[0]) getInfo = create_getInfo(ChipDe) diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index 19303960c..e8a2b5525 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -12,7 +12,11 @@ class CloudzillaToFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' - __config__ = [("activated", "bool", "Activated", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Cloudzilla.to folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 2383953ec..b6d3ba214 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -10,10 +10,11 @@ class CrockoComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Crocko.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 77febdd46..742483017 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -10,7 +10,7 @@ class CryptItCom(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Crypt-it.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 2f348a941..07c8471d5 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -12,9 +12,10 @@ class CzshareComFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" __license__ = "GPLv3" @@ -32,7 +33,7 @@ class CzshareComFolder(Crypter): if m is None: self.error(_("FOLDER_PATTERN not found")) - self.urls.extend(re.findall(self.LINK_PATTERN, m.group(1))) + self.links.extend(re.findall(self.LINK_PATTERN, m.group(1))) getInfo = create_getInfo(CzshareComFolder) diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index b3406402d..35db79a0d 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -14,9 +14,10 @@ class DailymotionComFolder(Crypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Dailymotion.com channel & playlist decrypter""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index 417d72e26..ff8ae6b74 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -12,10 +12,11 @@ class DataHuFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Data.hu folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index 1514393a7..cf0b72071 100644 --- a/module/plugins/crypter/DdlstorageComFolder.py +++ b/module/plugins/crypter/DdlstorageComFolder.py @@ -10,7 +10,7 @@ class DdlstorageComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """DDLStorage.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 11c6cdb79..5b5a096ea 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -10,10 +10,11 @@ class DepositfilesComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Depositfiles.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index ce4ebcdf4..8581134c0 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -12,9 +12,11 @@ class Dereferer(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,63}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>[\w^_]+://.+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Universal link dereferer""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 7ed71fa24..68c069cfc 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -16,10 +16,11 @@ class DevhostStFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """D-h.st folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index 333f438bf..3377d4a8a 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -15,10 +15,11 @@ class DlProtectCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Dl-protect.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 713dbe059..c12ffc977 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -14,9 +14,10 @@ class DuckCryptInfo(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """DuckCrypt.info decrypter plugin""" __license__ = "GPLv3" @@ -56,8 +57,8 @@ class DuckCryptInfo(Crypter): def handle_link(self, url): html = self.load(url) soup = BeautifulSoup(html) - self.urls = [soup.find("iframe")['src']] - if not self.urls: + self.links = [soup.find("iframe")['src']] + if not self.links: self.log_info(_("No link found")) diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index f3c311f23..897736669 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -10,7 +10,7 @@ class DuploadOrgFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Dupload.org folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index e7675d106..9fa2740b8 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -10,9 +10,11 @@ class EasybytezComFolder(XFSCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Easybytez.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 0e4e1bf7a..4e232f38e 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -13,11 +13,12 @@ class EmbeduploadCom(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' - __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)" , "" )] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("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" @@ -39,16 +40,16 @@ class EmbeduploadCom(Crypter): self.log_debug("PF: %s" % prefered_set) tmp_links.extend(x[1] for x in m if x[0] in prefered_set) - self.urls = self.get_location(tmp_links) + self.links = self.get_location(tmp_links) - if not self.urls: + if not self.links: ignored_set = set(self.get_config('ignoredHoster').split('|')) ignored_set = map(lambda s: s.lower().split('.')[0], ignored_set) self.log_debug("IG: %s" % ignored_set) tmp_links.extend(x[1] for x in m if x[0] not in ignored_set) - self.urls = self.get_location(tmp_links) + self.links = self.get_location(tmp_links) def get_location(self, tmp_links): diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 2d9026cbf..b3c2e1903 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -10,7 +10,7 @@ class FilebeerInfoFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filebeer.info folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 0f6a259f8..61ff1de5c 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -10,10 +10,11 @@ class FilecloudIoFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filecloud.io folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index ac0e4f265..d435f4b9d 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -44,7 +44,7 @@ class FilecryptCc(Crypter): def setup(self): - self.links = [] + self.urls = [] def decrypt(self, pyfile): @@ -59,8 +59,8 @@ class FilecryptCc(Crypter): for handle in (self.handle_CNL, self.handle_weblinks, self.handle_dlc_container): handle() - if self.links: - self.packages = [(pyfile.package().name, self.links, pyfile.package().name)] + if self.urls: + self.packages = [(pyfile.package().name, self.urls, pyfile.package().name)] return @@ -165,7 +165,7 @@ class FilecryptCc(Crypter): return for _dlc in dlcs: - self.links.append(urlparse.urljoin(self.pyfile.url, "/DLC/%s.dlc" % _dlc)) + self.urls.append(urlparse.urljoin(self.pyfile.url, "/DLC/%s.dlc" % _dlc)) def handle_weblinks(self): @@ -177,7 +177,7 @@ class FilecryptCc(Crypter): link2 = re.search('<iframe noresize src="(.*)"></iframe>', res) if link2: res2 = self.load(link2.group(1), just_header=True) - self.links.append(res2['location']) + self.urls.append(res2['location']) except Exception, e: self.log_debug("Error decrypting weblinks: %s" % e) @@ -189,7 +189,7 @@ class FilecryptCc(Crypter): vcrypted = re.findall('<input type="hidden" name="crypted" value="(.*)">', self.site_with_links) for i in xrange(len(vcrypted)): - self.links.extend(self._get_links(vcrypted[i], vjk[i])) + self.urls.extend(self._get_links(vcrypted[i], vjk[i])) except Exception, e: self.log_debug("Error decrypting CNL: %s" % e) diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index e5f8f2152..e5623435f 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -10,10 +10,11 @@ class FilefactoryComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filefactory.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 3f39456b1..b48b8b38e 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -10,10 +10,11 @@ class FilerNetFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://filer\.net/folder/\w{16}' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filer.net decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index e0b8dbb55..80b1f974d 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -12,9 +12,10 @@ class FileserveComFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """FileServe.com folder decrypter plugin""" __license__ = "GPLv3" @@ -37,7 +38,7 @@ class FileserveComFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1))) if new_links: - self.urls = [map(lambda s: "http://fileserve.com%s" % s, new_links)] + self.links = [map(lambda s: "http://fileserve.com%s" % s, new_links)] getInfo = create_getInfo(FileserveComFolder) diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index 77a3b3e62..e9f0e9c4d 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -10,7 +10,7 @@ class FilesonicComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filesonic.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 17fe97715..4e93e6aac 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -10,10 +10,11 @@ class FilestubeCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filestube.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 8d3871bb5..aacedf9ee 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -10,10 +10,11 @@ class FiletramCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filetram.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 10164f2f9..0b9290e2e 100644 --- a/module/plugins/crypter/FiredriveComFolder.py +++ b/module/plugins/crypter/FiredriveComFolder.py @@ -10,7 +10,7 @@ class FiredriveComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Firedrive.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index aacf62c20..7fa38a736 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -15,9 +15,10 @@ class FourChanOrg(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """4chan.org folder decrypter plugin""" __license__ = "GPLv3" @@ -27,7 +28,7 @@ class FourChanOrg(Crypter): def decrypt(self, pyfile): pagehtml = self.load(pyfile.url) images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]+)', pagehtml)) - self.urls = [urlparse.urljoin("http://", image) for image in images] + self.links = [urlparse.urljoin("http://", image) for image in images] getInfo = create_getInfo(FourChanOrg) diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 5eac4cce0..23f235205 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -12,10 +12,11 @@ class FreakhareComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Freakhare.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index ab23b7c0f..f9822bb0d 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -12,10 +12,11 @@ class FreetexthostCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Freetexthost.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index a148d168a..0e0b8b4cc 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -10,10 +10,11 @@ class FshareVnFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Fshare.vn folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index d75303a3b..582c2dca0 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -10,7 +10,11 @@ class FurLy(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fur\.ly/(\d/)?\w+' - __config__ = [("activated", "bool", "Activated", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Fur.ly decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index f3f7a60d1..9a3315399 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -14,11 +14,11 @@ class Go4UpCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Go4Up.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 8973cdc35..5d5a42274 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -11,7 +11,11 @@ class GooGl(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?goo\.gl/([a-zA-Z]+/)?\w+' - __config__ = [("activated", "bool", "Activated", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Goo.gl decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index f6472c7b2..fe517c222 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -10,9 +10,11 @@ class GoogledriveComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?drive\.google\.com/folderview\?.*id=\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Drive.google.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 3d96c50dd..6ed600f4d 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -14,9 +14,10 @@ class HoerbuchIn(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Hoerbuch.in decrypter plugin""" __license__ = "GPLv3" @@ -42,7 +43,7 @@ class HoerbuchIn(Crypter): self.packages.append((package, links, package)) else: - self.urls = self.decrypt_folder(pyfile.url) + self.links = self.decrypt_folder(pyfile.url) def decrypt_folder(self, url): diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index dd0078faf..a06a24a54 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/module/plugins/crypter/HotfileComFolder.py @@ -10,7 +10,7 @@ class HotfileComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Hotfile.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index 27c7d4940..7fdbeeaa0 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -10,7 +10,7 @@ class ILoadTo(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+\-[\w\-.]+/' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Iload.to decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index 285a0bd46..620b0e036 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -11,10 +11,11 @@ class ImgurComAlbum(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Imgur.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/JDlist.py b/module/plugins/crypter/JDlist.py index cc4ece751..29ad0d5fe 100644 --- a/module/plugins/crypter/JDlist.py +++ b/module/plugins/crypter/JDlist.py @@ -10,9 +10,10 @@ class JDlist(Crypter): __status__ = "testing" __pattern__ = r'jdlist://(?P<LIST>[\w\+^_]+==)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """JDlist decrypter plugin""" __license__ = "GPLv3" @@ -20,7 +21,7 @@ class JDlist(Crypter): def decrypt(self, pyfile): - self.urls.extend(self.info['pattern']['LIST'].decode('base64').split(',')) + self.links.extend(self.info['pattern']['LIST'].decode('base64').split(',')) getInfo = create_getInfo(JDlist) diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index 77dd8a79f..635dc1737 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -12,9 +12,10 @@ class LetitbitNetFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Letitbit.net folder decrypter plugin""" __license__ = "GPLv3" @@ -33,7 +34,7 @@ class LetitbitNetFolder(Crypter): if folder is None: self.error(_("FOLDER_PATTERN not found")) - self.urls.extend(re.findall(self.LINK_PATTERN, folder.group(0))) + self.links.extend(re.findall(self.LINK_PATTERN, folder.group(0))) getInfo = create_getInfo(LetitbitNetFolder) diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 46e27dfef..d849f08c2 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -32,7 +32,7 @@ class LinkCryptWs(Crypter): def setup(self): - self.links = [] + self.urls = [] self.sources = ['cnl', 'web', 'dlc', 'rsdf', 'ccf'] @@ -83,11 +83,11 @@ class LinkCryptWs(Crypter): links = self.handle_link_source(type) if links: - self.links.extend(links) + self.urls.extend(links) break - if self.links: - self.packages = [(package_name, self.links, folder_name)] + if self.urls: + self.packages = [(package_name, self.urls, folder_name)] def is_online(self): diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index c1148beb5..45ef59063 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -10,9 +10,11 @@ class LinkSaveIn(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """LinkSave.in decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 977caac4d..ad55ce55d 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -12,9 +12,10 @@ class LinkdecrypterCom(MultiCrypter): __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Linkdecrypter.com decrypter plugin""" __license__ = "GPLv3" @@ -41,7 +42,7 @@ class LinkdecrypterCom(MultiCrypter): while retries: m = re.search(self.TEXTAREA_PATTERN, self.data, re.S) if m is not None: - self.urls = [x for x in m.group(1).splitlines() if '[LINK-ERROR]' not in x] + self.links = [x for x in m.group(1).splitlines() if '[LINK-ERROR]' not in x] m = re.search(self.CAPTCHA_PATTERN, self.data) if m is not None: diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 0cd1e4a07..e3dcf9d89 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -13,9 +13,10 @@ class LixIn(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Lix.in decrypter plugin""" __license__ = "GPLv3" @@ -58,8 +59,8 @@ class LixIn(Crypter): if m is None: self.error(_("Unable to find destination url")) else: - self.urls = [m.group(1)] - self.log_debug("Found link %s, adding to package" % self.urls[0]) + self.links = [m.group(1)] + self.log_debug("Found link %s, adding to package" % self.links[0]) getInfo = create_getInfo(LixIn) diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index a7efa558f..4836bbb67 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -10,7 +10,7 @@ class LofCc(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?lof\.cc/(.+)' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Lof.cc decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index 9a22a8922..ba0952d7d 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -10,7 +10,7 @@ class MBLinkInfo(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """MBLink.info decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 7e2bd94b1..604d78687 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -13,9 +13,10 @@ class MediafireComFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Mediafire.com folder decrypter plugin""" __license__ = "GPLv3" @@ -64,7 +65,7 @@ class MediafireComFolder(Crypter): m = re.search(self.LINK_PATTERN, html) if m is not None: #: File page - self.urls.append("http://www.mediafire.com/file/%s" % m.group(1)) + self.links.append("http://www.mediafire.com/file/%s" % m.group(1)) else: #: Folder page m = re.search(self.FOLDER_KEY_PATTERN, html) @@ -79,7 +80,7 @@ class MediafireComFolder(Crypter): # self.log_info(json_resp) if json_resp['response']['result'] == "Success": for link in json_resp['response']['folder_info']['files']: - self.urls.append("http://www.mediafire.com/file/%s" % link['quickkey']) + self.links.append("http://www.mediafire.com/file/%s" % link['quickkey']) else: self.fail(json_resp['response']['message']) @@ -87,7 +88,7 @@ class MediafireComFolder(Crypter): self.offline() else: - self.urls.append(url) + self.links.append(url) getInfo = create_getInfo(MediafireComFolder) diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 09c83ff68..01e8338ac 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -12,9 +12,10 @@ class MegaCoNzFolder(Crypter): __status__ = "broken" __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Mega.co.nz folder decrypter plugin""" __license__ = "GPLv3" @@ -28,7 +29,7 @@ class MegaCoNzFolder(Crypter): def decrypt(self, pyfile): url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() self.data = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) - self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.data) + self.links = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.data) getInfo = create_getInfo(MegaCoNzFolder) diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index 701eb82ae..c49f6297e 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -10,10 +10,11 @@ class MegaRapidCzFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Share-Rapid.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index 7e9f2d764..532ab9b88 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -10,7 +10,7 @@ class MegauploadComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Megaupload.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index 41e138cd6..6c0abfd88 100644 --- a/module/plugins/crypter/Movie2KTo.py +++ b/module/plugins/crypter/Movie2KTo.py @@ -10,7 +10,7 @@ class Movie2KTo(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?movie2k\.to/(.+)\.html' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Movie2k.to decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index cb3da36c2..82dd64eb0 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -13,10 +13,11 @@ class MultiUpOrg(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|mirror)/\w+(/\w+)?' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """MultiUp.org crypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index e0c2f6b02..87a900a2a 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -12,11 +12,12 @@ class MultiloadCz(Crypter): __status__ = "testing" __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' - __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)" , "" )] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("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" @@ -33,16 +34,16 @@ class MultiloadCz(Crypter): if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": m = re.search(self.FOLDER_PATTERN, self.data) if m is not None: - self.urls.extend(m.group(1).split()) + self.links.extend(m.group(1).split()) else: m = re.findall(self.LINK_PATTERN, self.data) if m is not None: prefered_set = set(self.get_config('usedHoster').split('|')) - self.urls.extend(x[1] for x in m if x[0] in prefered_set) + self.links.extend(x[1] for x in m if x[0] in prefered_set) - if not self.urls: + if not self.links: ignored_set = set(self.get_config('ignoredHoster').split('|')) - self.urls.extend(x[1] for x in m if x[0] not in ignored_set) + self.links.extend(x[1] for x in m if x[0] not in ignored_set) getInfo = create_getInfo(MultiloadCz) diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 6efaee309..6b7ea9f16 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -10,7 +10,7 @@ class MultiuploadCom(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """MultiUpload.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 05b0b6e1f..a60e99ce7 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -16,9 +16,10 @@ class NCryptIn(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """NCrypt.in decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 46022737d..eba13d1b6 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -10,7 +10,7 @@ class NetfolderIn(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?netfolder\.(in|me)/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """NetFolder.in decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py index a277819df..ae7ca27da 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -11,9 +11,11 @@ class NitroflareComFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/folder/(?P<USER>\d+)/(?P<ID>[\w=]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Nitroflare.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index f20e2366c..a8d5d741d 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -10,10 +10,11 @@ class NosvideoCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Nosvideo.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 1df5d2acb..ad650d751 100644 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -10,7 +10,7 @@ class OronComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Oron.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index 8602535fc..fe759320f 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -10,10 +10,11 @@ class PastebinCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'https://(?:www\.)?pastebin\.com/(.+i=)?(?P<ID>\w{8})' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Pastebin.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 313b77249..c2ab3e144 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -12,9 +12,10 @@ class QuickshareCzFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Quickshare.cz folder decrypter plugin""" __license__ = "GPLv3" @@ -31,7 +32,7 @@ class QuickshareCzFolder(Crypter): m = re.search(self.FOLDER_PATTERN, html, re.S) if m is None: self.error(_("FOLDER_PATTERN not found")) - self.urls.extend(re.findall(self.LINK_PATTERN, m.group(1))) + self.links.extend(re.findall(self.LINK_PATTERN, m.group(1))) getInfo = create_getInfo(QuickshareCzFolder) diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 25f346eb5..b59b4f108 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -10,7 +10,7 @@ class RSLayerCom(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """RS-Layer.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index cd8c4c807..d8933be0a 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -19,9 +19,10 @@ class RelinkUs(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Relink.us decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index 787c0c81a..98af1522f 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -16,9 +16,10 @@ class SafelinkingNet(Crypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Safelinking.net decrypter plugin""" __license__ = "GPLv3" @@ -35,7 +36,7 @@ class SafelinkingNet(Crypter): header = self.load(url, just_header=True) if 'location' in header: - self.urls = [header.get('location')] + self.links = [header.get('location')] else: self.error(_("Couldn't find forwarded Link")) @@ -79,9 +80,9 @@ class SafelinkingNet(Crypter): linkDict = json.loads(m.group(1)) for link in linkDict: if not "http://" in link['full']: - self.urls.append("https://safelinking.net/d/" + link['full']) + self.links.append("https://safelinking.net/d/" + link['full']) else: - self.urls.append(link['full']) + self.links.append(link['full']) getInfo = create_getInfo(SafelinkingNet) diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 09d2514ba..62ec9ea7d 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -10,7 +10,7 @@ class SecuredIn(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+\-\w{8}\.html' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Secured.in decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index fe6e2398e..8ccf0c83a 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -36,10 +36,10 @@ class SexuriaCom(Crypter): self.package = pyfile.package() #: Decrypt and add links - package_name, self.links, folder_name, package_pwd = self.decrypt_links(self.pyfile.url) + package_name, self.urls, folder_name, package_pwd = self.decrypt_links(self.pyfile.url) if package_pwd: self.pyfile.package().password = package_pwd - self.packages = [(package_name, self.links, folder_name)] + self.packages = [(package_name, self.urls, folder_name)] def decrypt_links(self, url): diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index ca9ea8327..be2fea9e1 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -30,7 +30,7 @@ class ShSt(Crypter): #: Fetch the target URL header = self.load(self.pyfile.url, just_header = True, decode = False) target_url = header.get('location') - self.urls.append(target_url) + self.links.append(target_url) getInfo = create_getInfo(ShSt) diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 09a856094..e359bbeab 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -15,9 +15,10 @@ class ShareLinksBiz(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Share-Links.biz decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index 765e79bc0..2fb24bca3 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -10,7 +10,7 @@ class SharingmatrixComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Sharingmatrix.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index eb4770df1..bc01d50dd 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -10,7 +10,7 @@ class SpeedLoadOrgFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Speedload decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 7ee95af1e..7d52b34dc 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -10,7 +10,7 @@ class StealthTo(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Stealth.to decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TNTVillageScambioeticoOrg.py b/module/plugins/crypter/TNTVillageScambioeticoOrg.py index 58161079e..81e18e697 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -10,9 +10,11 @@ class TNTVillageScambioeticoOrg(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?forum\.tntvillage\.scambioetico\.org/index\.php\?.*showtopic=\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """TNTVillage.scambioetico.org decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index 0c0fd6016..e11fa5e8f 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -10,7 +10,11 @@ class TinyurlCom(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(preview\.)?tinyurl\.com/[\w\-]+' - __config__ = [("activated", "bool", "Activated", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Tinyurl.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index 118569777..cba2df0c9 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -12,10 +12,11 @@ class TnyCz(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Tny.cz decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 507cd2a2f..6c3485a14 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -10,7 +10,7 @@ class TrailerzoneInfo(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?trailerzone\.info/.+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """TrailerZone.info decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 81fc9564d..20f664526 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -13,10 +13,11 @@ class TurbobitNetFolder(SimpleCrypter): __status__ = "broken" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Turbobit.net folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 57405740a..8a524306d 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -14,9 +14,11 @@ class TusfilesNetFolder(XFSCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Tusfiles.net folder decrypter plugin""" __license__ = "GPLv3" @@ -44,7 +46,7 @@ class TusfilesNetFolder(XFSCrypter): for p in xrange(2, pages + 1): self.data = self.load_page(p) - self.urls.append(self.get_links()) + self.links.append(self.get_links()) getInfo = create_getInfo(TusfilesNetFolder) diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index 0de684d13..a57544db6 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -12,9 +12,10 @@ class UlozToFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Uloz.to folder decrypter plugin""" __license__ = "GPLv3" @@ -46,7 +47,7 @@ class UlozToFolder(Crypter): self.log_info(_("Limit of 99 pages reached, aborting")) if new_links: - self.urls = [map(lambda s: "http://ulozto.net/%s" % s, new_links)] + self.links = [map(lambda s: "http://ulozto.net/%s" % s, new_links)] getInfo = create_getInfo(UlozToFolder) diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index 5b97bd455..320dbc0d9 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -10,10 +10,11 @@ class UploadableChFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' - __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)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), + ("subfolder_per_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uploadable.ch folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 834b4ae64..8c55beda9 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -12,9 +12,11 @@ class UploadedToFolder(SimpleCrypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """UploadedTo decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 51ecb07dd..ebacdd953 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -10,7 +10,7 @@ class WiiReloadedOrg(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Wii-Reloaded.org decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index 872e4294a..92cf7bae0 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -10,7 +10,7 @@ class WuploadComFolder(DeadCrypter): __status__ = "stable" __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+' - __config__ = [] #@TODO: Remove in 0.4.10 + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Wupload.com folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/XFileSharingFolder.py b/module/plugins/crypter/XFileSharingFolder.py index 9985caa5f..927a0f6bc 100644 --- a/module/plugins/crypter/XFileSharingFolder.py +++ b/module/plugins/crypter/XFileSharingFolder.py @@ -12,9 +12,11 @@ class XFileSharingFolder(XFSCrypter): __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """XFileSharing dummy folder decrypter plugin for hook""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 9d698cd83..39d168379 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -10,9 +10,10 @@ class XupPl(Crypter): __status__ = "testing" __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package", True)] __description__ = """Xup.pl decrypter plugin""" __license__ = "GPLv3" @@ -22,7 +23,7 @@ class XupPl(Crypter): def decrypt(self, pyfile): header = self.load(pyfile.url, just_header=True) if 'location' in header: - self.urls = [header.get('location')] + self.links = [header.get('location')] else: self.fail(_("Unable to find link")) diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index bb3086cf4..b7b51aeef 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -14,12 +14,13 @@ class YoutubeComFolder(Crypter): __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)' - __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), - ("uploads" , "bool", "Grab channel unplaylisted videos" , 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_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" @@ -108,9 +109,7 @@ class YoutubeComFolder(Crypter): playlists = self.get_playlists(channel['id']) self.log_debug("%s playlist\s found on channel \"%s\"" % (len(playlists), channel['title'])) - relatedplaylist = dict() - for p_name, p_id in channel['relatedPlaylists'].items(): - relatedplaylist.update({p_name: self.get_playlist(p_id)}) + relatedplaylist = dict((p_name, self.get_playlist(p_id)) for p_name, p_id in channel['relatedPlaylists'].items()) self.log_debug("Channel's related playlists found = %s" % relatedplaylist.keys()) diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py index 3d2861bbf..c81882f67 100644 --- a/module/plugins/hooks/Captcha9Kw.py +++ b/module/plugins/hooks/Captcha9Kw.py @@ -24,7 +24,7 @@ class Captcha9Kw(Addon): ("captchapermin" , "int" , "Captcha per minute" , "9999" ), ("prio" , "int" , "Priority (max 10)(cost +0 -> +10 credits)" , "0" ), ("queue" , "int" , "Max. Queue (max 999)" , "50" ), - ("hoster_options", "string" , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"), + ("hoster_options", "str" , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"), ("selfsolve" , "bool" , "Selfsolve (manually solve your captcha in your 9kw client if active)" , "0" ), ("passkey" , "password", "API key" , "" ), ("timeout" , "int" , "Timeout in seconds (min 60, max 3999)" , "900" )] diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 4c9c51dcc..6cc5a8824 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -14,9 +14,12 @@ class AlldebridCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Alldebrid.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/AndroidfilehostCom.py b/module/plugins/hoster/AndroidfilehostCom.py index b81c18cb4..be10e122a 100644 --- a/module/plugins/hoster/AndroidfilehostCom.py +++ b/module/plugins/hoster/AndroidfilehostCom.py @@ -15,8 +15,11 @@ class AndroidfilehostCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Androidfilehost.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BasketbuildCom.py b/module/plugins/hoster/BasketbuildCom.py index cd5b0fa68..329a4715a 100644 --- a/module/plugins/hoster/BasketbuildCom.py +++ b/module/plugins/hoster/BasketbuildCom.py @@ -16,8 +16,11 @@ class BasketbuildCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Basketbuild.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index b0d1f2b81..8e75d2510 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -12,8 +12,11 @@ class BezvadataCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """BezvaData.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 2bc65a921..b90f69759 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -15,8 +15,11 @@ class BitshareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Bitshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index bcc790e63..794a3b60e 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -13,8 +13,11 @@ class CatShareNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?catshare\.net/\w{15,16}' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """CatShare.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CloudzillaTo.py b/module/plugins/hoster/CloudzillaTo.py index 7f4395518..3c613c9e3 100644 --- a/module/plugins/hoster/CloudzillaTo.py +++ b/module/plugins/hoster/CloudzillaTo.py @@ -12,8 +12,11 @@ class CloudzillaTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Cloudzilla.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index 079b0157a..3b6044adf 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -10,7 +10,11 @@ class CramitIn(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Cramit.in hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index e908b648a..30934cffc 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -14,8 +14,11 @@ class CrockoCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Crocko hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 06f0aebe1..2341f80e9 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -16,8 +16,11 @@ class CzshareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """CZshare.com hoster plugin, now Sdilej.cz""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py index 20a250897..24bb1e8a5 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -15,8 +15,11 @@ class DataHu(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Data.hu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 768790d11..27e8a566b 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -10,8 +10,11 @@ class DataportCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Dataport.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 91592ac40..f63541a10 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -13,8 +13,11 @@ class DateiTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Datei.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index e6e87a3a1..654fd7902 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -12,9 +12,12 @@ class DebridItaliaCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Debriditalia.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index 1eec79911..0f6e7346c 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -14,8 +14,11 @@ class DepositfilesCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Depositfiles.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py index 66dd21abc..2b75ea2d8 100644 --- a/module/plugins/hoster/DevhostSt.py +++ b/module/plugins/hoster/DevhostSt.py @@ -15,8 +15,11 @@ class DevhostSt(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """D-h.st hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 346f87560..a11bfab61 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -10,8 +10,11 @@ class DlFreeFr(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(getfile\.pl\?file=/|[a-z])(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Dl.free.fr hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py index bfd67a6aa..dd9f926a1 100644 --- a/module/plugins/hoster/DropboxCom.py +++ b/module/plugins/hoster/DropboxCom.py @@ -12,8 +12,11 @@ class DropboxCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Dropbox.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py index e15dbf790..aa34ce929 100644 --- a/module/plugins/hoster/EasybytezCom.py +++ b/module/plugins/hoster/EasybytezCom.py @@ -10,7 +10,11 @@ class EasybytezCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Easybytez.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py index c3073c46a..b501ccd5b 100644 --- a/module/plugins/hoster/EdiskCz.py +++ b/module/plugins/hoster/EdiskCz.py @@ -12,8 +12,11 @@ class EdiskCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Edisk.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 2d5513001..dac20bd2d 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -12,8 +12,11 @@ class EuroshareEu(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Euroshare.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ExashareCom.py b/module/plugins/hoster/ExashareCom.py index 1e0f7f762..2314cc160 100644 --- a/module/plugins/hoster/ExashareCom.py +++ b/module/plugins/hoster/ExashareCom.py @@ -12,7 +12,11 @@ class ExashareCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Exashare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index 8c1b7f9ce..328714229 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -15,8 +15,11 @@ class ExtabitCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Extabit.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 7137836cf..f364bd441 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -14,9 +14,12 @@ class FastixRu(MultiHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Fastix multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index bedab8916..493678e9b 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -13,8 +13,11 @@ class FastshareCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FastShare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py index 3cfc677fd..837d1fe4a 100644 --- a/module/plugins/hoster/FileSharkPl.py +++ b/module/plugins/hoster/FileSharkPl.py @@ -13,8 +13,11 @@ class FileSharkPl(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FileShark.pl hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py index 5f3e76024..a148d6153 100644 --- a/module/plugins/hoster/FileStoreTo.py +++ b/module/plugins/hoster/FileStoreTo.py @@ -12,8 +12,11 @@ class FileStoreTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FileStore.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index fb4fbefb4..076fce1ae 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -13,7 +13,11 @@ class FileboomMe(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://f(?:ile)?boom\.me/file/(?P<ID>\w+)' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Fileboom.me hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index b5f0beb09..7b7ffd6ea 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -14,8 +14,11 @@ class FilecloudIo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filecloud.io hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FiledropperCom.py b/module/plugins/hoster/FiledropperCom.py index 84adfec52..c5b70fe20 100644 --- a/module/plugins/hoster/FiledropperCom.py +++ b/module/plugins/hoster/FiledropperCom.py @@ -13,7 +13,11 @@ class FiledropperCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filedropper\.com/\w+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filedropper.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index b018a8c01..0cd8904e1 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -25,8 +25,11 @@ class FilefactoryCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filefactory.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 78c798257..0e189aac4 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -13,7 +13,11 @@ class FileomCom(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Fileom.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index cc22699df..abd5c4d23 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -15,8 +15,11 @@ class FilepostCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filepost.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilepupNet.py b/module/plugins/hoster/FilepupNet.py index 5408bfd25..0e6750c91 100644 --- a/module/plugins/hoster/FilepupNet.py +++ b/module/plugins/hoster/FilepupNet.py @@ -16,8 +16,11 @@ class FilepupNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filepup.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index 5da14bc60..0849a42d5 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -18,8 +18,11 @@ class FilerNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Filer.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py index 328278660..9c045b168 100644 --- a/module/plugins/hoster/FilerioCom.py +++ b/module/plugins/hoster/FilerioCom.py @@ -10,7 +10,11 @@ class FilerioCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FileRio.in hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileuploadNet.py b/module/plugins/hoster/FileuploadNet.py index 0474185d6..891cc5640 100644 --- a/module/plugins/hoster/FileuploadNet.py +++ b/module/plugins/hoster/FileuploadNet.py @@ -12,7 +12,11 @@ class FileuploadNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(en\.)?file-upload\.net/download-\d+/.+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """File-upload.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py index a56033a39..88d89fbd7 100644 --- a/module/plugins/hoster/FlyFilesNet.py +++ b/module/plugins/hoster/FlyFilesNet.py @@ -13,8 +13,11 @@ class FlyFilesNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FlyFiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py index 751e52b8b..1e9d8ce54 100644 --- a/module/plugins/hoster/FourSharedCom.py +++ b/module/plugins/hoster/FourSharedCom.py @@ -12,8 +12,11 @@ class FourSharedCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?4shared(-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """4Shared.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 74155a220..1865a3901 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -10,9 +10,12 @@ class FreeWayMe(MultiHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?free-way\.(bz|me)/.+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """FreeWayMe multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 6a8c32ff8..6031132c4 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -27,8 +27,11 @@ class FshareVn(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """FshareVn hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GamefrontCom.py b/module/plugins/hoster/GamefrontCom.py index 7fca5a497..c46c77208 100644 --- a/module/plugins/hoster/GamefrontCom.py +++ b/module/plugins/hoster/GamefrontCom.py @@ -10,7 +10,11 @@ class GamefrontCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?gamefront\.com/files/(?P<ID>\d+)' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Gamefront.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index 0d0333634..722a317df 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -14,8 +14,11 @@ class GigapetaCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """GigaPeta.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py index c96b81b88..6d10e6dae 100644 --- a/module/plugins/hoster/GooIm.py +++ b/module/plugins/hoster/GooIm.py @@ -15,8 +15,11 @@ class GooIm(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?goo\.im/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Goo.im hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py index aa842b4e1..d70b44efc 100644 --- a/module/plugins/hoster/GoogledriveCom.py +++ b/module/plugins/hoster/GoogledriveCom.py @@ -17,8 +17,11 @@ class GoogledriveCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(drive|docs)\.google\.com/(file/d/\w+|uc\?.*id=)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Drive.google.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py index 7ffeff3e3..c4cbde712 100644 --- a/module/plugins/hoster/HellshareCz.py +++ b/module/plugins/hoster/HellshareCz.py @@ -10,8 +10,11 @@ class HellshareCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Hellshare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HighWayMe.py b/module/plugins/hoster/HighWayMe.py index 94fa65e1d..6c66dce3e 100644 --- a/module/plugins/hoster/HighWayMe.py +++ b/module/plugins/hoster/HighWayMe.py @@ -13,9 +13,12 @@ class HighWayMe(MultiHoster): __status__ = "testing" __pattern__ = r'https?://.+high-way\.my' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """High-Way.me multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HostujeNet.py b/module/plugins/hoster/HostujeNet.py index c94d6b623..212578328 100644 --- a/module/plugins/hoster/HostujeNet.py +++ b/module/plugins/hoster/HostujeNet.py @@ -12,7 +12,11 @@ class HostujeNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?hostuje\.net/\w+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Hostuje.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HugefilesNet.py b/module/plugins/hoster/HugefilesNet.py index 295a74110..2dae78ea2 100644 --- a/module/plugins/hoster/HugefilesNet.py +++ b/module/plugins/hoster/HugefilesNet.py @@ -12,7 +12,11 @@ class HugefilesNet(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Hugefiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py index d60f9ae53..8aaf2d770 100644 --- a/module/plugins/hoster/HundredEightyUploadCom.py +++ b/module/plugins/hoster/HundredEightyUploadCom.py @@ -10,7 +10,11 @@ class HundredEightyUploadCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """180upload.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py index 66cba8f2b..279d9f0f0 100644 --- a/module/plugins/hoster/IfolderRu.py +++ b/module/plugins/hoster/IfolderRu.py @@ -12,8 +12,11 @@ class IfolderRu(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www)?(files\.)?(ifolder\.ru|metalarea\.org|rusfolder\.(com|net|ru))/(files/)?(?P<ID>\d+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Ifolder.ru hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py index 5cd9b91ba..f90916eb6 100644 --- a/module/plugins/hoster/JumbofilesCom.py +++ b/module/plugins/hoster/JumbofilesCom.py @@ -12,8 +12,11 @@ class JumbofilesCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """JumboFiles.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py index b756e0534..15d596e59 100644 --- a/module/plugins/hoster/JunocloudMe.py +++ b/module/plugins/hoster/JunocloudMe.py @@ -10,7 +10,11 @@ class JunocloudMe(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Junocloud.me hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py index a4bfda5dd..c927ea11c 100644 --- a/module/plugins/hoster/Keep2ShareCc.py +++ b/module/plugins/hoster/Keep2ShareCc.py @@ -14,8 +14,11 @@ class Keep2ShareCc(SimpleHoster): __status__ = "broken" __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Keep2Share.cc hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py index 2930dda2d..ddc6286b6 100644 --- a/module/plugins/hoster/KingfilesNet.py +++ b/module/plugins/hoster/KingfilesNet.py @@ -13,8 +13,11 @@ class KingfilesNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Kingfiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py index 860453d51..95b938c6a 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -39,8 +39,11 @@ class LetitbitNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Letitbit.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py index 296425017..a57f0f830 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -14,9 +14,12 @@ class LinksnappyCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Linksnappy.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 7914e9428..83c312a2f 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -17,8 +17,11 @@ class LoadTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?load\.to/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Load.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LolabitsEs.py b/module/plugins/hoster/LolabitsEs.py index 472c041a2..ae3b61210 100644 --- a/module/plugins/hoster/LolabitsEs.py +++ b/module/plugins/hoster/LolabitsEs.py @@ -13,7 +13,11 @@ class LolabitsEs(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?lolabits\.es/.+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Lolabits.es hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py index 467261866..47ffb295e 100644 --- a/module/plugins/hoster/LuckyShareNet.py +++ b/module/plugins/hoster/LuckyShareNet.py @@ -14,8 +14,11 @@ class LuckyShareNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """LuckyShare.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py index 2ed99a7e4..5917ffd5b 100644 --- a/module/plugins/hoster/MediafireCom.py +++ b/module/plugins/hoster/MediafireCom.py @@ -12,8 +12,11 @@ class MediafireCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Mediafire.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py index 58452ace6..4772ac1fe 100644 --- a/module/plugins/hoster/MegaDebridEu.py +++ b/module/plugins/hoster/MegaDebridEu.py @@ -14,9 +14,12 @@ class MegaDebridEu(MultiHoster): __status__ = "testing" __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Mega-debrid.eu multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py index b6401f56c..dee74e653 100644 --- a/module/plugins/hoster/MegaRapidCz.py +++ b/module/plugins/hoster/MegaRapidCz.py @@ -26,8 +26,11 @@ class MegaRapidCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """MegaRapid.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py index dcfdc90fa..6094cf6ac 100644 --- a/module/plugins/hoster/MegaRapidoNet.py +++ b/module/plugins/hoster/MegaRapidoNet.py @@ -27,9 +27,12 @@ class MegaRapidoNet(MultiHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """MegaRapido.net multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py index 63238e78b..2d6e0f0d5 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -13,8 +13,11 @@ class MegasharesCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Megashares.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 963508f17..9e5b8e2c2 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -10,7 +10,11 @@ class MovReelCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """MovReel.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index f224fc356..051985c1d 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -13,8 +13,11 @@ class MultishareCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """MultiShare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index 90d9755bb..5424bbebe 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -13,9 +13,12 @@ class MyfastfileCom(MultiHoster): __status__ = "testing" __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Myfastfile.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MystoreTo.py b/module/plugins/hoster/MystoreTo.py index 9c7b8fbf0..7429900c5 100644 --- a/module/plugins/hoster/MystoreTo.py +++ b/module/plugins/hoster/MystoreTo.py @@ -15,8 +15,11 @@ class MystoreTo(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Mystore.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py index 329b7794e..e34dcbc2d 100644 --- a/module/plugins/hoster/NarodRu.py +++ b/module/plugins/hoster/NarodRu.py @@ -14,8 +14,11 @@ class NarodRu(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+\-narod\.yandex\.ru)/(?P<ID>\d+)/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Narod.ru hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index 6eac06163..7970ae460 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -13,8 +13,11 @@ class NitroflareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Nitroflare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index b7c3471f1..48db4be71 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -11,9 +11,12 @@ class NoPremiumPl(MultiHoster): __status__ = "testing" __pattern__ = r'https?://direct\.nopremium\.pl.+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """NoPremium.pl multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 43c5bc9e0..9171d3b32 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -12,7 +12,11 @@ class NosuploadCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Nosupload.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 2bc7a1c9a..622108c85 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -14,7 +14,11 @@ class NovafileCom(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Novafile.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index 2e81a3fa6..6737ffc5b 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -12,8 +12,11 @@ class NowDownloadSx(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """NowDownload.sx hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NowVideoSx.py b/module/plugins/hoster/NowVideoSx.py index fc67bc66e..cc45faf77 100644 --- a/module/plugins/hoster/NowVideoSx.py +++ b/module/plugins/hoster/NowVideoSx.py @@ -12,8 +12,11 @@ class NowVideoSx(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """NowVideo.sx hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index e524b761a..b657fe484 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -13,8 +13,11 @@ class OneFichierCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """1fichier.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py index 25b7e11a1..48638bdab 100644 --- a/module/plugins/hoster/OpenloadIo.py +++ b/module/plugins/hoster/OpenloadIo.py @@ -14,7 +14,11 @@ class OpenloadIo(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?openload\.(co|io)/(f|embed)/(?P<ID>[\w\-]+)' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Openload.co hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 95366c0c0..f3c04b516 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -14,9 +14,12 @@ class OverLoadMe(MultiHoster): __status__ = "testing" __pattern__ = r'https?://.*overload\.me/.+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Over-Load.me multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py index a2ae1cb97..9f005efe0 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -15,9 +15,12 @@ class PremiumTo(MultiHoster): __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Premium.to multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 43c8a4392..eeb002cb0 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -11,9 +11,12 @@ class PremiumizeMe(MultiHoster): __status__ = "testing" __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Premiumize.me multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 8f6aa4f8a..6f92dcea2 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -12,8 +12,11 @@ class PromptfileCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?promptfile\.com/' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Promptfile.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 2b0d9c526..abcd24d1e 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -13,8 +13,11 @@ class QuickshareCz(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Quickshare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index ed57ede4a..72efe9914 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -13,9 +13,12 @@ class RPNetBiz(MultiHoster): __status__ = "testing" __pattern__ = r'https?://.+rpnet\.biz' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """RPNet.biz multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py index 932c6e7a7..e0cc2c6d3 100644 --- a/module/plugins/hoster/RapideoPl.py +++ b/module/plugins/hoster/RapideoPl.py @@ -11,9 +11,12 @@ class RapideoPl(MultiHoster): __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Rapideo.pl multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py index c202974cf..546e17a8d 100644 --- a/module/plugins/hoster/RapidfileshareNet.py +++ b/module/plugins/hoster/RapidfileshareNet.py @@ -10,7 +10,11 @@ class RapidfileshareNet(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Rapidfileshare.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 7fb1b3693..150aec221 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -18,8 +18,11 @@ class RapidgatorNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Rapidgator.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py index 0bd1c3a8e..09910de69 100644 --- a/module/plugins/hoster/RapiduNet.py +++ b/module/plugins/hoster/RapiduNet.py @@ -16,8 +16,11 @@ class RapiduNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Rapidu.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py index c964a20f5..c9ea75cb1 100644 --- a/module/plugins/hoster/RarefileNet.py +++ b/module/plugins/hoster/RarefileNet.py @@ -12,7 +12,11 @@ class RarefileNet(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Rarefile.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 4064df24b..a8d2f7da1 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -15,9 +15,12 @@ class RealdebridCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Real-Debrid.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index 4af7aff68..011a79c79 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -12,9 +12,12 @@ class RehostTo(MultiHoster): __status__ = "testing" __pattern__ = r'https?://.*rehost\.to\..+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Rehost.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index 8e7ff4101..90fe3a26f 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -20,8 +20,11 @@ class RemixshareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Remixshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py index 32bb5cd57..dc4aeb6a3 100644 --- a/module/plugins/hoster/RgHostNet.py +++ b/module/plugins/hoster/RgHostNet.py @@ -12,8 +12,11 @@ class RgHostNet(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?rghost\.(net|ru)/[\d\-]+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """RgHost.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SafesharingEu.py b/module/plugins/hoster/SafesharingEu.py index 114c42c38..0de0e9556 100644 --- a/module/plugins/hoster/SafesharingEu.py +++ b/module/plugins/hoster/SafesharingEu.py @@ -10,7 +10,11 @@ class SafesharingEu(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Safesharing.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py index 185923845..b94e7e5dc 100644 --- a/module/plugins/hoster/SecureUploadEu.py +++ b/module/plugins/hoster/SecureUploadEu.py @@ -10,7 +10,11 @@ class SecureUploadEu(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """SecureUpload.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index c7dd751a9..84a5949c6 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -12,8 +12,11 @@ class SendspaceCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Sendspace.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index c2822a51e..24c25a43a 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -16,8 +16,11 @@ class ShareonlineBiz(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Shareonline.biz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py index 2d46f7e86..debf8c33d 100644 --- a/module/plugins/hoster/SimplyPremiumCom.py +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -13,9 +13,12 @@ class SimplyPremiumCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://.+simply-premium\.com' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Simply-Premium.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py index 004baa516..c05cd197b 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -13,9 +13,12 @@ class SimplydebridCom(MultiHoster): __status__ = "testing" __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Simply-debrid.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SizedriveCom.py b/module/plugins/hoster/SizedriveCom.py index 3d9598301..24a019f02 100644 --- a/module/plugins/hoster/SizedriveCom.py +++ b/module/plugins/hoster/SizedriveCom.py @@ -12,7 +12,11 @@ class SizedriveCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?sizedrive\.com/[rd]/(?P<ID>\w+)' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Sizedrive.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index 0648de552..fbacac570 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -11,9 +11,12 @@ class SmoozedCom(MultiHoster): __status__ = "testing" __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Smoozed.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SolidfilesCom.py b/module/plugins/hoster/SolidfilesCom.py index 1b0d322c9..e9f7d4f68 100644 --- a/module/plugins/hoster/SolidfilesCom.py +++ b/module/plugins/hoster/SolidfilesCom.py @@ -13,7 +13,11 @@ class SolidfilesCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?solidfiles\.com\/d/\w+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Solidfiles.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py index f4f791396..258b63d75 100644 --- a/module/plugins/hoster/SoundcloudCom.py +++ b/module/plugins/hoster/SoundcloudCom.py @@ -13,9 +13,11 @@ class SoundcloudCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w\-]+/[\w\-]+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium", "bool" , "Use premium account if available", True ), - ("quality" , "Lower;Higher", "Quality" , "Higher")] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """SoundCloud.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py index c2d49479d..6718ce797 100644 --- a/module/plugins/hoster/SpeedyshareCom.py +++ b/module/plugins/hoster/SpeedyshareCom.py @@ -15,8 +15,11 @@ class SpeedyshareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Speedyshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 26f175d75..b860c236b 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -12,7 +12,11 @@ class StreamcloudEu(XFSHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Streamcloud.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index d55cb02b6..1490f5071 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -21,8 +21,11 @@ class TurbobitNet(SimpleHoster): __status__ = "broken" __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Turbobit.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index 5708f2f26..3415a36ab 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -12,7 +12,11 @@ class TusfilesNet(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Tusfiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index fbade8e37..389f78743 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -12,8 +12,11 @@ class TwoSharedCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """2Shared.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index 8c756a5c9..0292871a7 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -19,8 +19,11 @@ class UlozTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uloz.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py index 39c7943d6..3a0288873 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -13,8 +13,11 @@ class UloziskoSk(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Ulozisko.sk hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py index 286b409ae..40e20beea 100644 --- a/module/plugins/hoster/UnibytesCom.py +++ b/module/plugins/hoster/UnibytesCom.py @@ -14,8 +14,11 @@ class UnibytesCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w\- .]{11}B' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """UniBytes.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py index 24156ff89..d1656556b 100644 --- a/module/plugins/hoster/UpleaCom.py +++ b/module/plugins/hoster/UpleaCom.py @@ -13,7 +13,11 @@ class UpleaCom(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uplea.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py index 2ab3063a0..0fc62777f 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -13,8 +13,11 @@ class UploadableCh(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uploadable.ch hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 05d976b2a..9e7c0f6a1 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -15,8 +15,11 @@ class UploadedTo(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uploaded.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index a079dc88e..5ff34dc80 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -16,8 +16,11 @@ class UploadheroCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """UploadHero.co plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index 589b58bd7..0f779ffb2 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -14,7 +14,11 @@ class UploadingCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uploading.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index a9c2b8b34..c863dff9d 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -13,8 +13,11 @@ class UpstoreNet(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?upstore\.net/' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Upstore.Net File Download Hoster""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 256a4019d..50e77c78a 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -10,7 +10,11 @@ class UptoboxCom(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Uptobox.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UserscloudCom.py b/module/plugins/hoster/UserscloudCom.py index 46483e843..1b07ffd6d 100644 --- a/module/plugins/hoster/UserscloudCom.py +++ b/module/plugins/hoster/UserscloudCom.py @@ -12,7 +12,11 @@ class UserscloudCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?userscloud\.com/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Userscloud.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index 3039670df..e1d20da31 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -12,9 +12,11 @@ class VeohCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium", "bool" , "Use premium account if available", True ), - ("quality" , "Low;High;Auto", "Quality" , "Auto")] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Veoh.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VidPlayNet.py b/module/plugins/hoster/VidPlayNet.py index 780fc5383..d883a5fdd 100644 --- a/module/plugins/hoster/VidPlayNet.py +++ b/module/plugins/hoster/VidPlayNet.py @@ -13,7 +13,11 @@ class VidPlayNet(XFSHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """VidPlay.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index 62a297cf8..3e62a431a 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -12,10 +12,11 @@ class VimeoCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium", "bool" , "Use premium account if available" , True ), - ("quality" , "Lowest;Mobile;SD;HD;Highest", "Quality" , "Highest"), - ("original" , "bool" , "Try to download the original file", True )] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Vimeo.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VkCom.py b/module/plugins/hoster/VkCom.py index 0415844b5..858c0111c 100644 --- a/module/plugins/hoster/VkCom.py +++ b/module/plugins/hoster/VkCom.py @@ -15,8 +15,11 @@ class VkCom(SimpleHoster): __status__ = "testing" __pattern__ = r"https?://(?:www\.)?vk\.com/video_ext\.php/\?.+" - __config__ = [("activated", "bool", "Activated", True), - ("quality", "Low;High;Auto", "Quality", "Auto")] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Vk.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 0e8db3c96..7fe639335 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -13,8 +13,11 @@ class WebshareCz(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(en\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """WebShare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index 140a5c1f4..5c1a903a9 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -13,8 +13,11 @@ class WrzucTo(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Wrzuc.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/XFileSharing.py b/module/plugins/hoster/XFileSharing.py index 960cb40d4..e0556789a 100644 --- a/module/plugins/hoster/XFileSharing.py +++ b/module/plugins/hoster/XFileSharing.py @@ -12,7 +12,11 @@ class XFileSharing(XFSHoster): __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """XFileSharing dummy hoster plugin for hook""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/XdadevelopersCom.py b/module/plugins/hoster/XdadevelopersCom.py index 1f21a903b..282a3cc06 100644 --- a/module/plugins/hoster/XdadevelopersCom.py +++ b/module/plugins/hoster/XdadevelopersCom.py @@ -15,8 +15,11 @@ class XdadevelopersCom(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Xda-developers.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py index ec0e4e452..9905a13d7 100644 --- a/module/plugins/hoster/YadiSk.py +++ b/module/plugins/hoster/YadiSk.py @@ -14,7 +14,11 @@ class YadiSk(SimpleHoster): __status__ = "testing" __pattern__ = r'https?://yadi\.sk/d/[\w\-]+' - __config__ = [("activated", "bool", "Activated", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Yadi.sk hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index 9fa9ee461..2dbec6c09 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -14,8 +14,11 @@ class YibaishiwuCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """115.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 20373841b..ede1855c2 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -12,9 +12,12 @@ class ZeveraCom(MultiHoster): __status__ = "testing" __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' - __config__ = [("activated", "bool", "Activated", True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("revertfailed", "bool", "Revert to standard download if fails", True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Zevera.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index dc403e9b9..69fe38610 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -16,8 +16,11 @@ class ZippyshareCom(SimpleHoster): __status__ = "testing" __pattern__ = r'http://www\d{0,3}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """Zippyshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/Container.py b/module/plugins/internal/Container.py index 5d294725d..cff4ac4ec 100644 --- a/module/plugins/internal/Container.py +++ b/module/plugins/internal/Container.py @@ -16,7 +16,9 @@ class Container(Crypter): __status__ = "stable" __pattern__ = r'^unmatchable$' - __config__ = [("activated", "bool", "Activated", 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__ = """Base container decrypter plugin""" __license__ = "GPLv3" @@ -34,7 +36,7 @@ class Container(Crypter): self.delete_tmp() - if self.urls: + if self.links: self._generate_packages() elif not self.packages: diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 71076ad0a..157ce5dab 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -23,12 +23,12 @@ class Crypter(Base): def init_base(self): self.packages = [] #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder ) - self.urls = [] #: List of urls, pyLoad will generate packagenames + self.links = [] #: List of urls, pyLoad will generate packagenames def setup_base(self): self.packages = [] - self.urls = [] + self.links = [] def process(self, pyfile): @@ -37,7 +37,7 @@ class Crypter(Base): """ self.decrypt(pyfile) - if self.urls: + if self.links: self._generate_packages() elif not self.packages: @@ -55,9 +55,9 @@ class Crypter(Base): def _generate_packages(self): """ - Generate new packages from self.urls + Generate new packages from self.links """ - packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).items()] + packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.links).items()] self.packages.extend(packages) diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index 130622fa9..bbe37f39f 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -92,7 +92,7 @@ class Hoster(Base): try: self.process(self.pyfile) self.check_status() - self._check_download() + self.check_download() except Fail, e: #@TODO: Move to PluginThread in 0.4.10 if self.get_config('fallback', True) and self.premium: @@ -349,7 +349,7 @@ class Hoster(Base): self.last_download = "" #: Recheck in 0.4.10 - def _check_download(self): + def check_download(self): self.log_info(_("Checking downloaded file...")) if self.captcha.task and not self.last_download: diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 5cb3f6ed2..cbbfcd6dc 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -14,11 +14,12 @@ class MultiHoster(SimpleHoster): __status__ = "stable" __pattern__ = r'^unmatchable$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("fallback" , "bool", "Fallback to free download if premium fails", True), - ("chk_filesize", "bool", "Check file size" , True), - ("revertfailed", "bool", "Revert to standard download if fails" , True)] + __config__ = [("activated" , "bool", "Activated" , True ), + ("use_premium" , "bool", "Use premium account if available" , True ), + ("fallback" , "bool", "Fallback to free download if premium fails" , False), + ("chk_filesize", "bool", "Check file size" , True ), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 ), + ("revertfailed", "bool", "Revert to standard download if fails" , True )] __description__ = """Multi hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 552edc405..f37323f90 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -163,7 +163,7 @@ class SimpleCrypter(Crypter): link = location elif link: - self.urls.append(link) + self.links.append(link) return else: self.log_warning(_("Too many redirects")) @@ -209,16 +209,16 @@ class SimpleCrypter(Crypter): self.log_info(_("Looking for direct link...")) self.handle_direct(pyfile) - if self.urls or self.packages: + if self.links or self.packages: self.log_info(_("Direct link detected")) else: self.log_info(_("Direct link not found")) - if not self.urls and not self.packages: + if not self.links and not self.packages: self.preload() self.check_errors() - self.urls.extend(self.get_links()) + self.links.extend(self.get_links()) if self.PAGES_PATTERN: self.handle_pages(pyfile) @@ -232,7 +232,7 @@ class SimpleCrypter(Crypter): if not links: self.error(_("Free decrypted link not found")) else: - self.urls.extend(links) + self.links.extend(links) def handle_premium(self, pyfile): @@ -244,7 +244,7 @@ class SimpleCrypter(Crypter): if not links: self.error(_("Premium decrypted link found")) else: - self.urls.extend(links) + self.links.extend(links) def get_links(self): @@ -260,7 +260,7 @@ class SimpleCrypter(Crypter): self.log_info(_("Decrypting as free link...")) self.handle_free(pyfile) - return self.urls + return self.links def load_page(self, number): @@ -276,7 +276,7 @@ class SimpleCrypter(Crypter): for p in xrange(2, pages + 1): self.data = self.load_page(p) - self.urls.extend(self.get_links()) + self.links.extend(self.get_links()) def check_errors(self): diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 56bd2d72f..e5ee65bdf 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -283,14 +283,10 @@ class SimpleHoster(Hoster): self.download(self.link, disposition=self.DISPOSITION) - def _check_download(self): - super(SimpleHoster, self)._check_download() - self.check_download() - - def check_download(self): - self.log_debug("Performing default check rules...") + super(SimpleHoster, self).check_download() + self.log_info(_("Checking downloaded file with built-in rules...") for r, p in self.FILE_ERRORS: errmsg = self.check_file({r: re.compile(p)}) if errmsg is not None: @@ -307,13 +303,15 @@ class SimpleHoster(Hoster): self.restart(errmsg) else: if self.CHECK_FILE: - self.log_debug("Performing custom check rules...") + self.log_info(_("Checking downloaded file with custom rules...") with open(encode(self.last_download), "rb") as f: self.data = f.read(1048576) #@TODO: Recheck in 0.4.10 self.check_errors() + self.log_info(_("File is OK")) + def check_errors(self): if not self.data: diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py index 09511097b..7e0c14fe1 100644 --- a/module/plugins/internal/XFSCrypter.py +++ b/module/plugins/internal/XFSCrypter.py @@ -11,10 +11,11 @@ class XFSCrypter(SimpleCrypter): __status__ = "stable" __pattern__ = r'^unmatchable$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_package", "bool", "Create a subfolder for each package", 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_package", "bool", "Create a subfolder for each package" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """XFileSharing decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py index 52b17966d..e8c2073bd 100644 --- a/module/plugins/internal/XFSHoster.py +++ b/module/plugins/internal/XFSHoster.py @@ -16,10 +16,11 @@ class XFSHoster(SimpleHoster): __status__ = "stable" __pattern__ = r'^unmatchable$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("fallback" , "bool", "Fallback to free download if premium fails", True), - ("chk_filesize", "bool", "Check file size" , True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] __description__ = """XFileSharing hoster plugin""" __license__ = "GPLv3" |