diff options
Diffstat (limited to 'module/plugins')
219 files changed, 375 insertions, 194 deletions
| diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index c70a849b6..256c5b5aa 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -9,8 +9,9 @@ class BitshareComFolder(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Bitshare.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 2fc36c355..f535da48d 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -10,8 +10,8 @@ class ChipDe(Crypter):      __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Chip.de decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 57bb339ff..a01f3e814 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -9,8 +9,9 @@ class CrockoComFolder(SimpleCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Crocko.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 5623a4093..b1f242416 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -10,8 +10,8 @@ class CzshareComFolder(Crypter):      __version__ = "0.20"      __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index e7cbbfb2c..5c078000a 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -15,8 +15,8 @@ class DailymotionComFolder(Crypter):      __version__ = "0.01"      __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Dailymotion.com channel & playlist decrypter"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index a5602d6c6..67f5e788f 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -11,8 +11,9 @@ class DataHuFolder(SimpleCrypter):      __version__ = "0.06"      __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Data.hu folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 147f093c3..b23d4a41e 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -9,8 +9,9 @@ class DepositfilesComFolder(SimpleCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Depositfiles.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 0729c8cb6..8427c1540 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -9,8 +9,8 @@ class Dereferer(SimpleDereferer):      __version__ = "0.11"      __pattern__ = r'https?://([^/]+)/.*?(?P<LINK>(ht|f)tps?(://|%3A%2F%2F).+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Crypter for dereferers"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 2753ee389..5cafbf6b8 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -16,8 +16,9 @@ class DevhostStFolder(SimpleCrypter):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """d-h.st folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index 5c20942ff..a9f39c6f3 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -14,8 +14,9 @@ class DlProtectCom(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Dl-protect.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py index d656cde4c..e56751972 100644 --- a/module/plugins/crypter/DontKnowMe.py +++ b/module/plugins/crypter/DontKnowMe.py @@ -9,8 +9,8 @@ class DontKnowMe(SimpleDereferer):      __version__ = "0.11"      __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?(?P<LINK>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """DontKnow.me decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 07cc5cdc4..cc108d101 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -13,8 +13,8 @@ class DuckCryptInfo(Crypter):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """DuckCrypt.info decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 6c643e83f..fdd3d4ff4 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -9,8 +9,8 @@ class EasybytezComFolder(XFSCrypter):      __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Easybytez.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 5336a0d03..d61fc7fda 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -11,10 +11,10 @@ class EmbeduploadCom(Crypter):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), -                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True), -                  ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"), -                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] +    __config__  = [("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)" , ""           )]      __description__ = """EmbedUpload.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 83cce352d..f900f4910 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -9,8 +9,9 @@ class FilecloudIoFolder(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Filecloud.io folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index 261c7e01a..c0cd028cc 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -9,8 +9,9 @@ class FilefactoryComFolder(SimpleCrypter):      __version__ = "0.32"      __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Filefactory.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index d33e26ee8..e2b44e868 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -9,8 +9,9 @@ class FilerNetFolder(SimpleCrypter):      __version__ = "0.42"      __pattern__ = r'https?://filer\.net/folder/\w{16}' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Filer.net decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index e6b35fd36..95ef49498 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -11,8 +11,8 @@ class FileserveComFolder(Crypter):      __version__ = "0.11"      __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """FileServe.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index d58516986..8fc28d592 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -9,6 +9,7 @@ class FilesonicComFolder(DeadCrypter):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+' +    __config__  = []      __description__ = """Filesonic.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 16ebdda37..133f4a53f 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -9,8 +9,9 @@ class FilestubeCom(SimpleCrypter):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Filestube.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 76530c589..b012d35bc 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -9,8 +9,9 @@ class FiletramCom(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Filetram.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index c3fe3db4b..40a18179c 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -13,8 +13,8 @@ class FourChanOrg(Crypter):      __version__ = "0.31"      __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """4chan.org folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 7c1b7de2b..cf89d6a6d 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -11,8 +11,9 @@ class FreakhareComFolder(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Freakhare.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index c33c9ff64..cf6fbb8a4 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -11,8 +11,9 @@ class FreetexthostCom(SimpleCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Freetexthost.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 474364e40..04508198a 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -9,8 +9,9 @@ class FshareVnFolder(SimpleCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Fshare.vn folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index a7e16c0ab..39b85e09c 100644 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -13,6 +13,9 @@ class Go4UpCom(SimpleCrypter):      __version__ = "0.11"      __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' +    __config__  = [("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)]      __description__ = """Go4Up.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index d548a3375..b5f0c0447 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -10,8 +10,8 @@ class GooGl(Crypter):      __version__ = "0.01"      __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Goo.gl decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index a347e4232..ccc3ab664 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -13,8 +13,8 @@ class HoerbuchIn(Crypter):      __version__ = "0.60"      __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Hoerbuch.in decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index 6c074f5f1..9ef7797af 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -10,8 +10,9 @@ class ImgurComAlbum(SimpleCrypter):      __version__ = "0.51"      __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Imgur.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index 56ecbc7f8..f5cc5fa78 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -10,8 +10,8 @@ class LetitbitNetFolder(Crypter):      __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Letitbit.net folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index e96d0438e..040305bd9 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -9,8 +9,8 @@ class LinkSaveIn(SimpleDereferer):      __version__ = "2.03"      __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """LinkSave.in decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 7dc174d66..01db87011 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -10,8 +10,8 @@ class LinkdecrypterCom(Crypter):      __version__ = "0.29"      __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Linkdecrypter.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index d899d58c7..66a0cf339 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -11,8 +11,8 @@ class LixIn(Crypter):      __version__ = "0.22"      __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Lix.in decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index d1dc89518..c1612bb6a 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -12,8 +12,8 @@ class MediafireComFolder(Crypter):      __version__ = "0.14"      __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Mediafire.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 4bef61f67..bd135ac5f 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -11,8 +11,8 @@ class MegaCoNzFolder(Crypter):      __version__ = "0.04"      __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Mega.co.nz folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index e7dff6c8a..63d41982d 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -9,8 +9,9 @@ class MegaRapidCzFolder(SimpleCrypter):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Share-Rapid.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index 08f96700d..1af9d556d 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -9,6 +9,7 @@ class MegauploadComFolder(DeadCrypter):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' +    __config__  = []      __description__ = """Megaupload.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index 5209ebf09..3f9e819eb 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -12,8 +12,9 @@ class MultiUpOrg(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """MultiUp.org crypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 006408c4b..2abb627c3 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -10,10 +10,10 @@ class MultiloadCz(Crypter):      __version__ = "0.40"      __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), -                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True), -                  ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""), -                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] +    __config__  = [("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)" , ""  )]      __description__ = """Multiload.cz decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 20e7c72e2..8e69a9323 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -15,8 +15,8 @@ class NCryptIn(Crypter):      __version__ = "1.34"      __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "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 62dc5c914..ac76c059e 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -11,8 +11,9 @@ class NetfolderIn(SimpleCrypter):      __version__ = "0.72"      __pattern__ = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """NetFolder.in decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 1e280abd2..9808837c4 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -9,8 +9,9 @@ class NosvideoCom(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Nosvideo.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py index 3e75d97b5..4dcb416f5 100644 --- a/module/plugins/crypter/OneKhDe.py +++ b/module/plugins/crypter/OneKhDe.py @@ -13,8 +13,8 @@ class OneKhDe(Crypter):      __version__ = "0.11"      __pattern__ = r'http://(?:www\.)?1kh\.de/f/' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """1kh.de decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index b3d5a4bea..e8ffec4e7 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -9,8 +9,9 @@ class PastebinCom(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Pastebin.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 70666b55a..0ccba2a5e 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -10,8 +10,8 @@ class QuickshareCzFolder(Crypter):      __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Quickshare.cz folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index c50481af0..e3082be00 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -17,8 +17,8 @@ class RelinkUs(Crypter):      __version__ = "3.12"      __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "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 8e46e1e41..34a45ea6e 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -17,8 +17,8 @@ class SafelinkingNet(Crypter):      __version__ = "0.14"      __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Safelinking.net decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 3c952fd6b..fc69a693f 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -11,8 +11,8 @@ class SexuriaCom(Crypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Sexuria.com decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 00a037b2e..4a0b61b5f 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -13,8 +13,8 @@ class ShareLinksBiz(Crypter):      __version__ = "1.14"      __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Share-Links.biz decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index e16bdf814..4448dd691 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -9,6 +9,7 @@ class SharingmatrixComFolder(DeadCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' +    __config__  = []      __description__ = """Sharingmatrix.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index d36128550..719c26449 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -11,8 +11,9 @@ class TnyCz(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Tny.cz decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index c6734c997..dcbd6a5d7 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -12,8 +12,9 @@ class TurbobitNetFolder(SimpleCrypter):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """Turbobit.net folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index cb8efc9a8..47cc973f0 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -13,8 +13,8 @@ class TusfilesNetFolder(XFSCrypter):      __version__ = "0.08"      __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Tusfiles.net folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index a1f3ed5ea..a9a6117c0 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -10,8 +10,8 @@ class UlozToFolder(Crypter):      __version__ = "0.20"      __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Uloz.to folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index 22f9ca2ed..f1eb93323 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -9,8 +9,9 @@ class UploadableChFolder(SimpleCrypter):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """ Uploadable.ch folder decrypter plugin """      __license__     = "GPLv3" diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 0a71add70..b86c66bf7 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -13,8 +13,9 @@ class UploadedToFolder(SimpleCrypter):      __version__ = "0.42"      __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("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)]      __description__ = """UploadedTo decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index 873c71fad..c4171667e 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -9,6 +9,7 @@ class WuploadComFolder(DeadCrypter):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+' +    __config__  = []      __description__ = """Wupload.com folder decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index 7d5cc9c6d..8b850271d 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -11,8 +11,8 @@ class XFileSharingProFolder(XFSCrypter):      __version__ = "0.05"      __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """XFileSharingPro dummy folder decrypter plugin for hook"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index f2ecbee5a..5ab6750c4 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -9,8 +9,8 @@ class XupPl(Crypter):      __version__ = "0.10"      __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Xup.pl decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index 628cf9428..d7ca494fa 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -15,11 +15,11 @@ class YoutubeComFolder(Crypter):      __version__ = "1.01"      __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), -                  ("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)] +    __config__  = [("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 )]      __description__ = """Youtube.com channel & playlist decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py index 257f58584..0564e31ca 100644 --- a/module/plugins/hooks/ClickAndLoad.py +++ b/module/plugins/hooks/ClickAndLoad.py @@ -58,7 +58,7 @@ class ClickAndLoad(Hook):      @threaded      def proxy(self, ip, webport, cnlport): -        time.sleep(10)  #@TODO: Implement addon delay on start in 0.4.10 +        time.sleep(10)  #@TODO: Remove in 0.4.10 (implement addon delay on startup)          self.logInfo(_("Proxy listening on %s:%s") % (ip or "0.0.0.0", cnlport)) diff --git a/module/plugins/hooks/MegaRapidoNet.py b/module/plugins/hooks/MegaRapidoNet.py index 33c74ae6f..fb5e77994 100644 --- a/module/plugins/hooks/MegaRapidoNet.py +++ b/module/plugins/hooks/MegaRapidoNet.py @@ -21,57 +21,57 @@ class MegaRapidoNet(MultiHook):      def getHosters(self): -        hosters = {'1fichier': [],#leave it there are so many possible addresses? -                   '1st-files': ['1st-files.com'], -                   '2shared': ['2shared.com'], -                   '4shared': ['4shared.com', '4shared-china.com'], -                   'asfile': ['http://asfile.com/'], -                   'bitshare': ['bitshare.com'], -                   'brupload': ['brupload.net'], -                   'crocko': ['crocko.com','easy-share.com'], -                   'dailymotion': ['dailymotion.com'], -                   'depfile': ['depfile.com'], +        hosters = {'1fichier'    : [],#leave it there are so many possible addresses? +                   '1st-files'   : ['1st-files.com'], +                   '2shared'     : ['2shared.com'], +                   '4shared'     : ['4shared.com', '4shared-china.com'], +                   'asfile'      : ['http://asfile.com/'], +                   'bitshare'    : ['bitshare.com'], +                   'brupload'    : ['brupload.net'], +                   'crocko'      : ['crocko.com','easy-share.com'], +                   'dailymotion' : ['dailymotion.com'], +                   'depfile'     : ['depfile.com'],                     'depositfiles': ['depositfiles.com', 'dfiles.eu'], -                   'dizzcloud': ['dizzcloud.com'], -                   'dl.dropbox': [], -                   'extabit': ['extabit.com'], -                   'extmatrix': ['extmatrix.com'], -                   'facebook': [], -                   'file4go': ['file4go.com'], -                   'filecloud': ['filecloud.io','ifile.it','mihd.net'], -                   'filefactory': ['filefactory.com'], -                   'fileom': ['fileom.com'], -                   'fileparadox': ['fileparadox.in'], -                   'filepost': ['filepost.com', 'fp.io'], -                   'filerio': ['filerio.in','filerio.com','filekeen.com'], -                   'filesflash': ['filesflash.com'], -                   'firedrive': ['firedrive.com', 'putlocker.com'], -                   'flashx': [], -                   'freakshare': ['freakshare.net', 'freakshare.com'], -                   'gigasize': ['gigasize.com'], -                   'hipfile': ['hipfile.com'], -                   'junocloud': ['junocloud.me'], -                   'letitbit': ['letitbit.net','shareflare.net'], -                   'mediafire': ['mediafire.com'], -                   'mega': ['mega.co.nz'], -                   'megashares': ['megashares.com'], -                   'metacafe': ['metacafe.com'], -                   'netload': ['netload.in'], -                   'oboom': ['oboom.com'], -                   'rapidgator': ['rapidgator.net'], -                   'rapidshare': ['rapidshare.com'], -                   'rarefile': ['rarefile.net'], -                   'ryushare': ['ryushare.com'], -                   'sendspace': ['sendspace.com'], -                   'turbobit': ['turbobit.net', 'unextfiles.com'], -                   'uploadable': ['uploadable.ch'], -                   'uploadbaz': ['uploadbaz.com'], -                   'uploaded': ['uploaded.to', 'uploaded.net', 'ul.to'], -                   'uploadhero': ['uploadhero.com'], -                   'uploading': ['uploading.com'], -                   'uptobox': ['uptobox.com'], -                   'xvideos': ['xvideos.com'], -                   'youtube': ['youtube.com']} +                   'dizzcloud'   : ['dizzcloud.com'], +                   'dl.dropbox'  : [], +                   'extabit'     : ['extabit.com'], +                   'extmatrix'   : ['extmatrix.com'], +                   'facebook'    : [], +                   'file4go'     : ['file4go.com'], +                   'filecloud'   : ['filecloud.io','ifile.it','mihd.net'], +                   'filefactory' : ['filefactory.com'], +                   'fileom'      : ['fileom.com'], +                   'fileparadox' : ['fileparadox.in'], +                   'filepost'    : ['filepost.com', 'fp.io'], +                   'filerio'     : ['filerio.in','filerio.com','filekeen.com'], +                   'filesflash'  : ['filesflash.com'], +                   'firedrive'   : ['firedrive.com', 'putlocker.com'], +                   'flashx'      : [], +                   'freakshare'  : ['freakshare.net', 'freakshare.com'], +                   'gigasize'    : ['gigasize.com'], +                   'hipfile'     : ['hipfile.com'], +                   'junocloud'   : ['junocloud.me'], +                   'letitbit'    : ['letitbit.net','shareflare.net'], +                   'mediafire'   : ['mediafire.com'], +                   'mega'        : ['mega.co.nz'], +                   'megashares'  : ['megashares.com'], +                   'metacafe'    : ['metacafe.com'], +                   'netload'     : ['netload.in'], +                   'oboom'       : ['oboom.com'], +                   'rapidgator'  : ['rapidgator.net'], +                   'rapidshare'  : ['rapidshare.com'], +                   'rarefile'    : ['rarefile.net'], +                   'ryushare'    : ['ryushare.com'], +                   'sendspace'   : ['sendspace.com'], +                   'turbobit'    : ['turbobit.net', 'unextfiles.com'], +                   'uploadable'  : ['uploadable.ch'], +                   'uploadbaz'   : ['uploadbaz.com'], +                   'uploaded'    : ['uploaded.to', 'uploaded.net', 'ul.to'], +                   'uploadhero'  : ['uploadhero.com'], +                   'uploading'   : ['uploading.com'], +                   'uptobox'     : ['uptobox.com'], +                   'xvideos'     : ['xvideos.com'], +                   'youtube'     : ['youtube.com']}          hoster_list = [] diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 163e4e0d2..51fdad757 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -16,6 +16,7 @@ class AlldebridCom(MultiHoster):      __version__ = "0.46"      __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Alldebrid.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/AndroidfilehostCom.py b/module/plugins/hoster/AndroidfilehostCom.py index b6e43d632..08005de0f 100644 --- a/module/plugins/hoster/AndroidfilehostCom.py +++ b/module/plugins/hoster/AndroidfilehostCom.py @@ -14,6 +14,7 @@ class AndroidfilehostCom(SimpleHoster):      __version__ = "0.01"      __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Androidfilehost.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/BasketbuildCom.py b/module/plugins/hoster/BasketbuildCom.py index db482c7c5..89e4d39f9 100644 --- a/module/plugins/hoster/BasketbuildCom.py +++ b/module/plugins/hoster/BasketbuildCom.py @@ -15,6 +15,7 @@ class BasketbuildCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """basketbuild.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py index 0929ece01..92058d634 100644 --- a/module/plugins/hoster/BayfilesCom.py +++ b/module/plugins/hoster/BayfilesCom.py @@ -9,6 +9,7 @@ class BayfilesCom(DeadHoster):      __version__ = "0.09"      __pattern__ = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)' +    __config__  = []      __description__ = """Bayfiles.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index aece7813d..37dd38e02 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -11,6 +11,7 @@ class BezvadataCz(SimpleHoster):      __version__ = "0.26"      __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """BezvaData.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 3bcc76146..43f29c41f 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -14,6 +14,7 @@ class BitshareCom(SimpleHoster):      __version__ = "0.53"      __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Bitshare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/BoltsharingCom.py b/module/plugins/hoster/BoltsharingCom.py index 924545a29..4309eefac 100644 --- a/module/plugins/hoster/BoltsharingCom.py +++ b/module/plugins/hoster/BoltsharingCom.py @@ -9,6 +9,7 @@ class BoltsharingCom(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?boltsharing\.com/\w{12}' +    __config__  = []      __description__ = """Boltsharing.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index bda9d27ae..ec9c62a23 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -12,6 +12,7 @@ class CatShareNet(SimpleHoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """CatShare.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index c5440391f..d2d5e460a 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -9,6 +9,7 @@ class CloudzerNet(DeadHoster):      __version__ = "0.05"      __pattern__ = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+' +    __config__  = []      __description__ = """Cloudzer.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CloudzillaTo.py b/module/plugins/hoster/CloudzillaTo.py index ee966c280..362a8d953 100644 --- a/module/plugins/hoster/CloudzillaTo.py +++ b/module/plugins/hoster/CloudzillaTo.py @@ -11,6 +11,7 @@ class CloudzillaTo(SimpleHoster):      __version__ = "0.06"      __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Cloudzilla.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index 474042a5a..6a9715465 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -12,6 +12,7 @@ class CrockoCom(SimpleHoster):      __version__ = "0.19"      __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Crocko hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py index b26909096..d85a27282 100644 --- a/module/plugins/hoster/CyberlockerCh.py +++ b/module/plugins/hoster/CyberlockerCh.py @@ -9,6 +9,7 @@ class CyberlockerCh(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+' +    __config__  = []      __description__ = """Cyberlocker.ch hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 34f52c05c..6494ce0bd 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -15,6 +15,7 @@ class CzshareCom(SimpleHoster):      __version__ = "0.99"      __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __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 f4b0692a8..58e5b7e3e 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -14,6 +14,7 @@ class DataHu(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Data.hu hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 266199616..89882d7f1 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -9,6 +9,7 @@ class DataportCz(SimpleHoster):      __version__ = "0.41"      __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Dataport.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index e5061e026..e93ebcf04 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -12,6 +12,7 @@ class DateiTo(SimpleHoster):      __version__ = "0.07"      __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Datei.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py index a45ef27e9..d67b4f30f 100644 --- a/module/plugins/hoster/DdlstorageCom.py +++ b/module/plugins/hoster/DdlstorageCom.py @@ -9,6 +9,7 @@ class DdlstorageCom(DeadHoster):      __version__ = "1.02"      __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+' +    __config__  = []      __description__ = """DDLStorage.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 8cda56c0c..4f64215fa 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -11,6 +11,7 @@ class DebridItaliaCom(MultiHoster):      __version__ = "0.17"      __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Debriditalia.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index 450852477..e6f47dc0a 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -14,6 +14,7 @@ class DepositfilesCom(SimpleHoster):      __version__ = "0.54"      __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Depositfiles.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py index d786ba135..e7a23f6b1 100644 --- a/module/plugins/hoster/DevhostSt.py +++ b/module/plugins/hoster/DevhostSt.py @@ -14,6 +14,7 @@ class DevhostSt(SimpleHoster):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """d-h.st hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 5d4e9e7b8..38cc675a6 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -39,6 +39,7 @@ class DlFreeFr(SimpleHoster):      __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Dl.free.fr hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DodanePl.py b/module/plugins/hoster/DodanePl.py index 65d8452fa..96f87a21c 100644 --- a/module/plugins/hoster/DodanePl.py +++ b/module/plugins/hoster/DodanePl.py @@ -9,6 +9,7 @@ class DodanePl(DeadHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?dodane\.pl/file/\d+' +    __config__  = []      __description__ = """Dodane.pl hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py index a8ef5b4bc..c948039ac 100644 --- a/module/plugins/hoster/DropboxCom.py +++ b/module/plugins/hoster/DropboxCom.py @@ -11,6 +11,7 @@ class DropboxCom(SimpleHoster):      __version__ = "0.04"      __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Dropbox.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/DuploadOrg.py b/module/plugins/hoster/DuploadOrg.py index 73702eb67..542240bab 100644 --- a/module/plugins/hoster/DuploadOrg.py +++ b/module/plugins/hoster/DuploadOrg.py @@ -9,6 +9,7 @@ class DuploadOrg(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}' +    __config__  = []      __description__ = """Dupload.grg hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py index f8ccc972e..a27bf46d2 100644 --- a/module/plugins/hoster/EdiskCz.py +++ b/module/plugins/hoster/EdiskCz.py @@ -11,6 +11,7 @@ class EdiskCz(SimpleHoster):      __version__ = "0.23"      __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Edisk.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py index 9a2f50ed4..46d0fac6a 100644 --- a/module/plugins/hoster/EgoFilesCom.py +++ b/module/plugins/hoster/EgoFilesCom.py @@ -9,6 +9,7 @@ class EgoFilesCom(DeadHoster):      __version__ = "0.16"      __pattern__ = r'https?://(?:www\.)?egofiles\.com/\w+' +    __config__  = []      __description__ = """Egofiles.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/EnteruploadCom.py b/module/plugins/hoster/EnteruploadCom.py index bbd613f57..b2306ce69 100644 --- a/module/plugins/hoster/EnteruploadCom.py +++ b/module/plugins/hoster/EnteruploadCom.py @@ -9,6 +9,7 @@ class EnteruploadCom(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?enterupload\.com/\w+' +    __config__  = []      __description__ = """EnterUpload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/EpicShareNet.py b/module/plugins/hoster/EpicShareNet.py index 8ac8cdaf2..e2a44b172 100644 --- a/module/plugins/hoster/EpicShareNet.py +++ b/module/plugins/hoster/EpicShareNet.py @@ -9,6 +9,7 @@ class EpicShareNet(DeadHoster):      __version__ = "0.02"      __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}' +    __config__  = []      __description__ = """EpicShare.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 9b71ddfc1..c5059e69e 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -11,6 +11,7 @@ class EuroshareEu(SimpleHoster):      __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Euroshare.eu hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index 68695faad..e0c02e08e 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -14,6 +14,7 @@ class ExtabitCom(SimpleHoster):      __version__ = "0.65"      __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Extabit.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 2d36ad4a4..0dc12568d 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -15,6 +15,7 @@ class FastixRu(MultiHoster):      __version__ = "0.11"      __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Fastix multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 2822d93d5..cede2e906 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -13,6 +13,7 @@ class FastshareCz(SimpleHoster):      __version__ = "0.29"      __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FastShare.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py index db843586b..314f069f9 100644 --- a/module/plugins/hoster/FileApeCom.py +++ b/module/plugins/hoster/FileApeCom.py @@ -9,6 +9,7 @@ class FileApeCom(DeadHoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+' +    __config__  = []      __description__ = """FileApe.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py index df54997d8..63475958a 100644 --- a/module/plugins/hoster/FileSharkPl.py +++ b/module/plugins/hoster/FileSharkPl.py @@ -13,6 +13,7 @@ class FileSharkPl(SimpleHoster):      __version__ = "0.09"      __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FileShark.pl hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py index ad3feba1b..3262b73ad 100644 --- a/module/plugins/hoster/FileStoreTo.py +++ b/module/plugins/hoster/FileStoreTo.py @@ -11,6 +11,7 @@ class FileStoreTo(SimpleHoster):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FileStore.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilebeerInfo.py b/module/plugins/hoster/FilebeerInfo.py index 885010a2c..77ee367a7 100644 --- a/module/plugins/hoster/FilebeerInfo.py +++ b/module/plugins/hoster/FilebeerInfo.py @@ -9,6 +9,7 @@ class FilebeerInfo(DeadHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)' +    __config__  = []      __description__ = """Filebeer.info plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index bb91da7d5..f4c8fedd6 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -13,6 +13,7 @@ class FilecloudIo(SimpleHoster):      __version__ = "0.08"      __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Filecloud.io hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index c71a7d1fb..606fb25f0 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -24,6 +24,7 @@ class FilefactoryCom(SimpleHoster):      __version__ = "0.54"      __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Filefactory.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index f8e4e0dbd..610de51f8 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -14,6 +14,7 @@ class FilepostCom(SimpleHoster):      __version__ = "0.33"      __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Filepost.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilepupNet.py b/module/plugins/hoster/FilepupNet.py index a53773f81..874fde3c8 100644 --- a/module/plugins/hoster/FilepupNet.py +++ b/module/plugins/hoster/FilepupNet.py @@ -15,6 +15,7 @@ class FilepupNet(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Filepup.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index a37decb69..22ca3725a 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -19,6 +19,7 @@ class FilerNet(SimpleHoster):      __version__ = "0.19"      __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Filer.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FileshareInUa.py b/module/plugins/hoster/FileshareInUa.py index 08e10dccb..c636375f5 100644 --- a/module/plugins/hoster/FileshareInUa.py +++ b/module/plugins/hoster/FileshareInUa.py @@ -9,6 +9,7 @@ class FileshareInUa(DeadHoster):      __version__ = "0.02"      __pattern__ = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}' +    __config__  = []      __description__ = """Fileshare.in.ua hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py index 8bfa0fa2e..16b4dee14 100644 --- a/module/plugins/hoster/FilesonicCom.py +++ b/module/plugins/hoster/FilesonicCom.py @@ -9,6 +9,7 @@ class FilesonicCom(DeadHoster):      __version__ = "0.35"      __pattern__ = r'http://(?:www\.)?filesonic\.com/file/\w+' +    __config__  = []      __description__ = """Filesonic.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py index 4197a2858..2a6ba2722 100644 --- a/module/plugins/hoster/FilezyNet.py +++ b/module/plugins/hoster/FilezyNet.py @@ -9,6 +9,7 @@ class FilezyNet(DeadHoster):      __version__ = "0.20"      __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}' +    __config__  = []      __description__ = """Filezy.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FiredriveCom.py b/module/plugins/hoster/FiredriveCom.py index 0e3a4e847..612b9ceca 100644 --- a/module/plugins/hoster/FiredriveCom.py +++ b/module/plugins/hoster/FiredriveCom.py @@ -9,6 +9,7 @@ class FiredriveCom(DeadHoster):      __version__ = "0.05"      __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __config__  = []      __description__ = """Firedrive.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py index 636e02acf..bcfaaab69 100644 --- a/module/plugins/hoster/FlyFilesNet.py +++ b/module/plugins/hoster/FlyFilesNet.py @@ -14,6 +14,7 @@ class FlyFilesNet(SimpleHoster):      __version__ = "0.10"      __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FlyFiles.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py index a3f53ac5e..79eb1fb83 100644 --- a/module/plugins/hoster/FourSharedCom.py +++ b/module/plugins/hoster/FourSharedCom.py @@ -11,6 +11,7 @@ class FourSharedCom(SimpleHoster):      __version__ = "0.31"      __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """4Shared.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 76ffca505..1cca24c3b 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -9,6 +9,7 @@ class FreeWayMe(MultiHoster):      __version__ = "0.16"      __pattern__ = r'https://(?:www\.)?free-way\.me/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FreeWayMe multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FreevideoCz.py b/module/plugins/hoster/FreevideoCz.py index e56d1a299..f47c07c7e 100644 --- a/module/plugins/hoster/FreevideoCz.py +++ b/module/plugins/hoster/FreevideoCz.py @@ -9,6 +9,7 @@ class FreevideoCz(DeadHoster):      __version__ = "0.30"      __pattern__ = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+' +    __config__  = []      __description__ = """Freevideo.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 77515f191..77d122e8e 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -28,6 +28,7 @@ class FshareVn(SimpleHoster):      __version__ = "0.20"      __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """FshareVn hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index 9d3ace3b2..bb53a12ee 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -14,6 +14,7 @@ class GigapetaCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """GigaPeta.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py index 1e1ffbc08..c6d8ce83d 100644 --- a/module/plugins/hoster/GooIm.py +++ b/module/plugins/hoster/GooIm.py @@ -14,6 +14,7 @@ class GooIm(SimpleHoster):      __version__ = "0.04"      __pattern__ = r'https?://(?:www\.)?goo\.im/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Goo.im hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py index 0c8ca9c52..d07b5121e 100644 --- a/module/plugins/hoster/GoogledriveCom.py +++ b/module/plugins/hoster/GoogledriveCom.py @@ -15,6 +15,7 @@ class GoogledriveCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Drive.google.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py index 05caf052d..2e156c464 100644 --- a/module/plugins/hoster/HellshareCz.py +++ b/module/plugins/hoster/HellshareCz.py @@ -11,6 +11,7 @@ class HellshareCz(SimpleHoster):      __version__ = "0.85"      __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Hellshare.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/HellspyCz.py b/module/plugins/hoster/HellspyCz.py index 2b9b76b8a..49fb9e829 100644 --- a/module/plugins/hoster/HellspyCz.py +++ b/module/plugins/hoster/HellspyCz.py @@ -9,6 +9,7 @@ class HellspyCz(DeadHoster):      __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)' +    __config__  = []      __description__ = """HellSpy.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py index f7724faf2..6c6a4fa89 100644 --- a/module/plugins/hoster/HotfileCom.py +++ b/module/plugins/hoster/HotfileCom.py @@ -9,6 +9,7 @@ class HotfileCom(DeadHoster):      __version__ = "0.37"      __pattern__ = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+' +    __config__  = []      __description__ = """Hotfile.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/IFileWs.py b/module/plugins/hoster/IFileWs.py index b4f225c4b..7d2a76a60 100644 --- a/module/plugins/hoster/IFileWs.py +++ b/module/plugins/hoster/IFileWs.py @@ -9,6 +9,7 @@ class IFileWs(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?ifile\.ws/\w{12}' +    __config__  = []      __description__ = """Ifile.ws hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/IcyFilesCom.py b/module/plugins/hoster/IcyFilesCom.py index 921b64207..ca0f6441b 100644 --- a/module/plugins/hoster/IcyFilesCom.py +++ b/module/plugins/hoster/IcyFilesCom.py @@ -9,6 +9,7 @@ class IcyFilesCom(DeadHoster):      __version__ = "0.06"      __pattern__ = r'http://(?:www\.)?icyfiles\.com/(.+)' +    __config__  = []      __description__ = """IcyFiles.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py index 056b05a65..f13065f86 100644 --- a/module/plugins/hoster/IfileIt.py +++ b/module/plugins/hoster/IfileIt.py @@ -9,6 +9,7 @@ class IfileIt(DeadHoster):      __version__ = "0.29"      __pattern__ = r'^unmatchable$' +    __config__  = []      __description__ = """Ifile.it"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py index 04c08ef0a..6ebde9063 100644 --- a/module/plugins/hoster/IfolderRu.py +++ b/module/plugins/hoster/IfolderRu.py @@ -11,6 +11,7 @@ class IfolderRu(SimpleHoster):      __version__ = "0.39"      __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Ifolder.ru hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py index 7adc1a029..a9bf14c6d 100644 --- a/module/plugins/hoster/JumbofilesCom.py +++ b/module/plugins/hoster/JumbofilesCom.py @@ -11,6 +11,7 @@ class JumbofilesCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """JumboFiles.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py index 6b7b422c5..6916797bd 100644 --- a/module/plugins/hoster/Keep2ShareCc.py +++ b/module/plugins/hoster/Keep2ShareCc.py @@ -14,6 +14,7 @@ class Keep2ShareCc(SimpleHoster):      __version__ = "0.21"      __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Keep2Share.cc hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/KickloadCom.py b/module/plugins/hoster/KickloadCom.py index 1c39db46c..df43b0fca 100644 --- a/module/plugins/hoster/KickloadCom.py +++ b/module/plugins/hoster/KickloadCom.py @@ -9,6 +9,7 @@ class KickloadCom(DeadHoster):      __version__ = "0.21"      __pattern__ = r'http://(?:www\.)?kickload\.com/get/.+' +    __config__  = []      __description__ = """Kickload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py index 0030513cf..99f309d00 100644 --- a/module/plugins/hoster/KingfilesNet.py +++ b/module/plugins/hoster/KingfilesNet.py @@ -12,6 +12,7 @@ class KingfilesNet(SimpleHoster):      __version__ = "0.07"      __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Kingfiles.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LemUploadsCom.py b/module/plugins/hoster/LemUploadsCom.py index 22fbd60dd..c7aae3bf9 100644 --- a/module/plugins/hoster/LemUploadsCom.py +++ b/module/plugins/hoster/LemUploadsCom.py @@ -9,6 +9,7 @@ class LemUploadsCom(DeadHoster):      __version__ = "0.02"      __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}' +    __config__  = []      __description__ = """LemUploads.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py index 42adaee31..27f2cadb8 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -39,6 +39,7 @@ class LetitbitNet(SimpleHoster):      __version__ = "0.30"      __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Letitbit.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py index 5b0fab43a..87207ab40 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -14,6 +14,7 @@ class LinksnappyCom(MultiHoster):      __version__ = "0.08"      __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Linksnappy.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index be330e246..8f4f8808c 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -16,6 +16,7 @@ class LoadTo(SimpleHoster):      __version__ = "0.22"      __pattern__ = r'http://(?:www\.)?load\.to/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """ Load.to hoster plugin """      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LomafileCom.py b/module/plugins/hoster/LomafileCom.py index 475cdacaa..4dd092f45 100644 --- a/module/plugins/hoster/LomafileCom.py +++ b/module/plugins/hoster/LomafileCom.py @@ -9,6 +9,7 @@ class LomafileCom(DeadHoster):      __version__ = "0.52"      __pattern__ = r'http://lomafile\.com/\w{12}' +    __config__  = []      __description__ = """Lomafile.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py index 74bf877f1..980072744 100644 --- a/module/plugins/hoster/LuckyShareNet.py +++ b/module/plugins/hoster/LuckyShareNet.py @@ -14,6 +14,7 @@ class LuckyShareNet(SimpleHoster):      __version__ = "0.06"      __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """LuckyShare.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py index f9ad2502d..3b39e2420 100644 --- a/module/plugins/hoster/MediafireCom.py +++ b/module/plugins/hoster/MediafireCom.py @@ -10,6 +10,7 @@ class MediafireCom(SimpleHoster):      __version__ = "0.85"      __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Mediafire.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py index 05102d60f..3a8d8b080 100644 --- a/module/plugins/hoster/MegaDebridEu.py +++ b/module/plugins/hoster/MegaDebridEu.py @@ -14,6 +14,7 @@ class MegaDebridEu(MultiHoster):      __version__ = "0.47"      __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__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """mega-debrid.eu multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegaFilesSe.py b/module/plugins/hoster/MegaFilesSe.py index c3de57914..795b74a78 100644 --- a/module/plugins/hoster/MegaFilesSe.py +++ b/module/plugins/hoster/MegaFilesSe.py @@ -9,6 +9,7 @@ class MegaFilesSe(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}' +    __config__  = []      __description__ = """MegaFiles.se hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py index 7d8a25c03..d03225d8e 100644 --- a/module/plugins/hoster/MegaRapidCz.py +++ b/module/plugins/hoster/MegaRapidCz.py @@ -26,6 +26,7 @@ class MegaRapidCz(SimpleHoster):      __version__ = "0.56"      __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """MegaRapid.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py index 1b0e4ffb6..b38374646 100644 --- a/module/plugins/hoster/MegaRapidoNet.py +++ b/module/plugins/hoster/MegaRapidoNet.py @@ -26,6 +26,7 @@ class MegaRapidoNet(MultiHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """MegaRapido.net multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegareleaseOrg.py b/module/plugins/hoster/MegareleaseOrg.py index 60796c1ee..1460ac868 100644 --- a/module/plugins/hoster/MegareleaseOrg.py +++ b/module/plugins/hoster/MegareleaseOrg.py @@ -9,6 +9,7 @@ class MegareleaseOrg(DeadHoster):      __version__ = "0.02"      __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}' +    __config__  = []      __description__ = """Megarelease.org hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py index 34b75e8fd..473675b64 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -12,6 +12,7 @@ class MegasharesCom(SimpleHoster):      __version__ = "0.28"      __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Megashares.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py index 7f51a8a46..7fe305834 100644 --- a/module/plugins/hoster/MegauploadCom.py +++ b/module/plugins/hoster/MegauploadCom.py @@ -9,6 +9,7 @@ class MegauploadCom(DeadHoster):      __version__ = "0.31"      __pattern__ = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+' +    __config__  = []      __description__ = """Megaupload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MegavideoCom.py b/module/plugins/hoster/MegavideoCom.py index 24905ce62..0b4523e03 100644 --- a/module/plugins/hoster/MegavideoCom.py +++ b/module/plugins/hoster/MegavideoCom.py @@ -9,6 +9,7 @@ class MegavideoCom(DeadHoster):      __version__ = "0.21"      __pattern__ = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+' +    __config__  = []      __description__ = """Megavideo.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index 7a6e73252..5dc53ecbc 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -13,6 +13,7 @@ class MultishareCz(SimpleHoster):      __version__ = "0.40"      __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """MultiShare.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index dd6294ff1..662638843 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -12,6 +12,7 @@ class MyfastfileCom(MultiHoster):      __version__ = "0.08"      __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Myfastfile.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/MystoreTo.py b/module/plugins/hoster/MystoreTo.py index 3bb424d4d..531368134 100644 --- a/module/plugins/hoster/MystoreTo.py +++ b/module/plugins/hoster/MystoreTo.py @@ -14,6 +14,7 @@ class MystoreTo(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Mystore.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NahrajCz.py b/module/plugins/hoster/NahrajCz.py index 6b5699408..5f5003e22 100644 --- a/module/plugins/hoster/NahrajCz.py +++ b/module/plugins/hoster/NahrajCz.py @@ -9,6 +9,7 @@ class NahrajCz(DeadHoster):      __version__ = "0.21"      __pattern__ = r'http://(?:www\.)?nahraj\.cz/content/download/.+' +    __config__  = []      __description__ = """Nahraj.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py index 8b56c0908..7de041f36 100644 --- a/module/plugins/hoster/NarodRu.py +++ b/module/plugins/hoster/NarodRu.py @@ -13,6 +13,7 @@ class NarodRu(SimpleHoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Narod.ru hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index cffa0e9a5..40bf0749f 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -12,6 +12,7 @@ class NitroflareCom(SimpleHoster):      __version__ = "0.09"      __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Nitroflare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index 43ae8b3cc..c3313c525 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -10,6 +10,7 @@ class NoPremiumPl(MultiHoster):      __version__ = "0.02"      __pattern__ = r'https?://direct\.nopremium\.pl.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """NoPremium.pl multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index ee9f520b4..2fd9293c7 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -12,6 +12,7 @@ class NowDownloadSx(SimpleHoster):      __version__ = "0.09"      __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """NowDownload.sx hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/NowVideoSx.py b/module/plugins/hoster/NowVideoSx.py index 18c3ffd1d..04274ed82 100644 --- a/module/plugins/hoster/NowVideoSx.py +++ b/module/plugins/hoster/NowVideoSx.py @@ -11,6 +11,7 @@ class NowVideoSx(SimpleHoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """NowVideo.sx hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 431c14b26..2586fb622 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -11,6 +11,7 @@ class OneFichierCom(SimpleHoster):      __version__ = "0.79"      __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\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)(?:/\?(?P<ID2>\w+))?' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """1fichier.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py index 7e8423ec9..7002d26ab 100644 --- a/module/plugins/hoster/OronCom.py +++ b/module/plugins/hoster/OronCom.py @@ -9,6 +9,7 @@ class OronCom(DeadHoster):      __version__ = "0.14"      __pattern__ = r'https?://(?:www\.)?oron\.com/\w{12}' +    __config__  = []      __description__ = """Oron.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 4e88710b8..398946e43 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -16,6 +16,7 @@ class OverLoadMe(MultiHoster):      __version__ = "0.11"      __pattern__ = r'https?://.*overload\.me/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Over-Load.me multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PandaplaNet.py b/module/plugins/hoster/PandaplaNet.py index 78a1ed177..a5716e4d4 100644 --- a/module/plugins/hoster/PandaplaNet.py +++ b/module/plugins/hoster/PandaplaNet.py @@ -9,6 +9,7 @@ class PandaplaNet(DeadHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}' +    __config__  = []      __description__ = """Pandapla.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py index d6261af3a..0eed158a4 100644 --- a/module/plugins/hoster/PotloadCom.py +++ b/module/plugins/hoster/PotloadCom.py @@ -9,6 +9,7 @@ class PotloadCom(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}' +    __config__  = []      __description__ = """Potload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py index 164530e57..f48f68e1b 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -14,6 +14,7 @@ class PremiumTo(MultiHoster):      __version__ = "0.22"      __pattern__ = r'^unmatchable$' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Premium.to multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 3d19c88ac..3227fb001 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -10,6 +10,7 @@ class PremiumizeMe(MultiHoster):      __version__ = "0.16"      __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Premiumize.me multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 412a7bf2d..97edbd48e 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -11,6 +11,7 @@ class PromptfileCom(SimpleHoster):      __version__ = "0.13"      __pattern__ = r'https?://(?:www\.)?promptfile\.com/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Promptfile.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/PrzeklejPl.py b/module/plugins/hoster/PrzeklejPl.py index 3a59a2c9e..68fd6ca6d 100644 --- a/module/plugins/hoster/PrzeklejPl.py +++ b/module/plugins/hoster/PrzeklejPl.py @@ -9,6 +9,7 @@ class PrzeklejPl(DeadHoster):      __version__ = "0.11"      __pattern__ = r'http://(?:www\.)?przeklej\.pl/plik/.+' +    __config__  = []      __description__ = """Przeklej.pl hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 210bf4cb2..c9ed1c024 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -13,6 +13,7 @@ class QuickshareCz(SimpleHoster):      __version__ = "0.56"      __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Quickshare.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index 8ab8cb7c4..710faf25c 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -11,10 +11,11 @@ class RPNetBiz(MultiHoster):      __type__    = "hoster"      __version__ = "0.14" +    __pattern__ = r'https?://.+rpnet\.biz' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] +      __description__ = """RPNet.biz multi-hoster plugin"""      __license__     = "GPLv3" - -    __pattern__ = r'https?://.+rpnet\.biz'      __authors__     = [("Dman", "dmanugm@gmail.com")] diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py index 85591f51f..50804e8cd 100644 --- a/module/plugins/hoster/RapideoPl.py +++ b/module/plugins/hoster/RapideoPl.py @@ -10,6 +10,7 @@ class RapideoPl(MultiHoster):      __version__ = "0.02"      __pattern__ = r'^unmatchable$' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Rapideo.pl multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 761d7ff99..19c77f15d 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -16,6 +16,7 @@ class RapidgatorNet(SimpleHoster):      __version__ = "0.33"      __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Rapidgator.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py index b455f556f..f43eda0cb 100644 --- a/module/plugins/hoster/RapiduNet.py +++ b/module/plugins/hoster/RapiduNet.py @@ -16,6 +16,7 @@ class RapiduNet(SimpleHoster):      __version__ = "0.07"      __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Rapidu.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 01d8bbb5d..1a8715e0e 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -17,6 +17,7 @@ class RealdebridCom(MultiHoster):      __version__ = "0.67"      __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", 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 28de35d08..1c53fbc92 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -11,6 +11,7 @@ class RehostTo(MultiHoster):      __version__ = "0.21"      __pattern__ = r'https?://.*rehost\.to\..+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Rehost.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index ed64b6a89..803256d86 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -19,6 +19,7 @@ class RemixshareCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Remixshare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py index aa4830563..9a8a340ec 100644 --- a/module/plugins/hoster/RgHostNet.py +++ b/module/plugins/hoster/RgHostNet.py @@ -11,6 +11,7 @@ class RgHostNet(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """RgHost.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index ffd2995b8..c3130135b 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -11,6 +11,7 @@ class SendspaceCom(SimpleHoster):      __version__ = "0.17"      __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Sendspace.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/Share76Com.py b/module/plugins/hoster/Share76Com.py index 1ac8a64e7..01bbc5ac2 100644 --- a/module/plugins/hoster/Share76Com.py +++ b/module/plugins/hoster/Share76Com.py @@ -9,6 +9,7 @@ class Share76Com(DeadHoster):      __version__ = "0.04"      __pattern__ = r'http://(?:www\.)?share76\.com/\w{12}' +    __config__  = []      __description__ = """Share76.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ShareFilesCo.py b/module/plugins/hoster/ShareFilesCo.py index 4996014d8..2fd1fc7cf 100644 --- a/module/plugins/hoster/ShareFilesCo.py +++ b/module/plugins/hoster/ShareFilesCo.py @@ -9,6 +9,7 @@ class ShareFilesCo(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}' +    __config__  = []      __description__ = """Sharefiles.co hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SharebeesCom.py b/module/plugins/hoster/SharebeesCom.py index c0fd22c91..347ae97e6 100644 --- a/module/plugins/hoster/SharebeesCom.py +++ b/module/plugins/hoster/SharebeesCom.py @@ -9,6 +9,7 @@ class SharebeesCom(DeadHoster):      __version__ = "0.02"      __pattern__ = r'http://(?:www\.)?sharebees\.com/\w{12}' +    __config__  = []      __description__ = """ShareBees hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 5ed8ca793..102e91276 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -17,6 +17,7 @@ class ShareonlineBiz(SimpleHoster):      __version__ = "0.49"      __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Shareonline.biz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SharingmatrixCom.py b/module/plugins/hoster/SharingmatrixCom.py index fa08a4a8f..925c6af8d 100644 --- a/module/plugins/hoster/SharingmatrixCom.py +++ b/module/plugins/hoster/SharingmatrixCom.py @@ -9,6 +9,7 @@ class SharingmatrixCom(DeadHoster):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/file/\w+' +    __config__  = []      __description__ = """Sharingmatrix.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py index bec30f6f2..9a4a259d8 100644 --- a/module/plugins/hoster/ShragleCom.py +++ b/module/plugins/hoster/ShragleCom.py @@ -9,6 +9,7 @@ class ShragleCom(DeadHoster):      __version__ = "0.22"      __pattern__ = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/' +    __config__  = []      __description__ = """Cloudnator.com (Shragle.com) hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py index 978aba11a..b3f52bc8c 100644 --- a/module/plugins/hoster/SimplyPremiumCom.py +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -12,6 +12,7 @@ class SimplyPremiumCom(MultiHoster):      __version__ = "0.08"      __pattern__ = r'https?://.+simply-premium\.com' +    __config__  = [("use_premium", "bool", "Use premium account if available", 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 8af1c204d..aae71d983 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -11,6 +11,7 @@ class SimplydebridCom(MultiHoster):      __version__ = "0.17"      __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Simply-debrid.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index fdb764151..5d453cf57 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -10,6 +10,7 @@ class SmoozedCom(MultiHoster):      __version__ = "0.04"      __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Smoozed.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SockshareCom.py b/module/plugins/hoster/SockshareCom.py index aabb8dcd1..574c66d5b 100644 --- a/module/plugins/hoster/SockshareCom.py +++ b/module/plugins/hoster/SockshareCom.py @@ -9,6 +9,7 @@ class SockshareCom(DeadHoster):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __config__  = []      __description__ = """Sockshare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py index c559b392b..8dff4f42a 100644 --- a/module/plugins/hoster/SoundcloudCom.py +++ b/module/plugins/hoster/SoundcloudCom.py @@ -12,7 +12,8 @@ class SoundcloudCom(SimpleHoster):      __version__ = "0.11"      __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+' -    __config__  = [("quality", "Lower;Higher", "Quality", "Higher")] +    __config__  = [("use_premium", "bool"        , "Use premium account if available", True    ), +                   ("quality"    , "Lower;Higher", "Quality"                         , "Higher")]      __description__ = """SoundCloud.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py index a13220eab..08a87e455 100644 --- a/module/plugins/hoster/SpeedLoadOrg.py +++ b/module/plugins/hoster/SpeedLoadOrg.py @@ -9,6 +9,7 @@ class SpeedLoadOrg(DeadHoster):      __version__ = "1.02"      __pattern__ = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)' +    __config__  = []      __description__ = """Speedload.org hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SpeedfileCz.py b/module/plugins/hoster/SpeedfileCz.py index f23c8d4c7..d3d627505 100644 --- a/module/plugins/hoster/SpeedfileCz.py +++ b/module/plugins/hoster/SpeedfileCz.py @@ -9,6 +9,7 @@ class SpeedfileCz(DeadHoster):      __version__ = "0.32"      __pattern__ = r'http://(?:www\.)?speedfile\.cz/.+' +    __config__  = []      __description__ = """Speedfile.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py index f21b0a3a7..1649abbe6 100644 --- a/module/plugins/hoster/SpeedyshareCom.py +++ b/module/plugins/hoster/SpeedyshareCom.py @@ -16,6 +16,7 @@ class SpeedyshareCom(SimpleHoster):      __version__ = "0.05"      __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Speedyshare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py index bedc2934f..f9bba7822 100644 --- a/module/plugins/hoster/StorageTo.py +++ b/module/plugins/hoster/StorageTo.py @@ -9,6 +9,7 @@ class StorageTo(DeadHoster):      __version__ = "0.01"      __pattern__ = r'http://(?:www\.)?storage\.to/get/.+' +    __config__  = []      __description__ = """Storage.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index fbd054713..f4eaa90cc 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -20,6 +20,7 @@ class TurbobitNet(SimpleHoster):      __version__ = "0.19"      __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """ Turbobit.net hoster plugin """      __license__     = "GPLv3" diff --git a/module/plugins/hoster/TurbouploadCom.py b/module/plugins/hoster/TurbouploadCom.py index f0893cef6..4b4d0c2e3 100644 --- a/module/plugins/hoster/TurbouploadCom.py +++ b/module/plugins/hoster/TurbouploadCom.py @@ -9,6 +9,7 @@ class TurbouploadCom(DeadHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?turboupload\.com/(\w+)' +    __config__  = []      __description__ = """Turboupload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index c6ca2ab29..086228637 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -11,6 +11,7 @@ class TwoSharedCom(SimpleHoster):      __version__ = "0.13"      __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """2Shared.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index 3fd88bfb0..89596512e 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -18,6 +18,7 @@ class UlozTo(SimpleHoster):      __version__ = "1.04"      __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Uloz.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py index 0267d4b61..e8355500c 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -11,6 +11,7 @@ class UloziskoSk(SimpleHoster):      __version__ = "0.25"      __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Ulozisko.sk hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py index 16b1f82ab..93e060b6e 100644 --- a/module/plugins/hoster/UnibytesCom.py +++ b/module/plugins/hoster/UnibytesCom.py @@ -15,6 +15,7 @@ class UnibytesCom(SimpleHoster):      __version__ = "0.12"      __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """UniBytes.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py index 8205ba0d3..dab5abd44 100644 --- a/module/plugins/hoster/UnrestrictLi.py +++ b/module/plugins/hoster/UnrestrictLi.py @@ -13,6 +13,7 @@ class UnrestrictLi(MultiHoster):      __version__ = "0.22"      __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Unrestrict.li multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py index d987770fe..90c177d71 100644 --- a/module/plugins/hoster/UploadStationCom.py +++ b/module/plugins/hoster/UploadStationCom.py @@ -9,6 +9,7 @@ class UploadStationCom(DeadHoster):      __version__ = "0.52"      __pattern__ = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)' +    __config__  = []      __description__ = """UploadStation.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py index cd13a1468..2907bd825 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -12,6 +12,7 @@ class UploadableCh(SimpleHoster):      __version__ = "0.09"      __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Uploadable.ch hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadboxCom.py b/module/plugins/hoster/UploadboxCom.py index 031c5f761..5a3856c6b 100644 --- a/module/plugins/hoster/UploadboxCom.py +++ b/module/plugins/hoster/UploadboxCom.py @@ -9,6 +9,7 @@ class UploadboxCom(DeadHoster):      __version__ = "0.05"      __pattern__ = r'http://(?:www\.)?uploadbox\.com/files/.+' +    __config__  = []      __description__ = """UploadBox.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 5c6160c8d..cd1cee6d7 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -14,6 +14,7 @@ class UploadedTo(SimpleHoster):      __version__ = "0.85"      __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Uploaded.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadhereCom.py b/module/plugins/hoster/UploadhereCom.py index 8da30be46..d3b095c15 100644 --- a/module/plugins/hoster/UploadhereCom.py +++ b/module/plugins/hoster/UploadhereCom.py @@ -9,6 +9,7 @@ class UploadhereCom(DeadHoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?uploadhere\.com/\w{10}' +    __config__  = []      __description__ = """Uploadhere.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index 12729ee8b..6c8747b58 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -16,6 +16,7 @@ class UploadheroCom(SimpleHoster):      __version__ = "0.18"      __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """UploadHero.co plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UploadkingCom.py b/module/plugins/hoster/UploadkingCom.py index 743e700eb..6c24fe51a 100644 --- a/module/plugins/hoster/UploadkingCom.py +++ b/module/plugins/hoster/UploadkingCom.py @@ -9,6 +9,7 @@ class UploadkingCom(DeadHoster):      __version__ = "0.14"      __pattern__ = r'http://(?:www\.)?uploadking\.com/\w{10}' +    __config__  = []      __description__ = """UploadKing.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index 13119eefd..d5d30177a 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -12,6 +12,7 @@ class UpstoreNet(SimpleHoster):      __version__ = "0.05"      __pattern__ = r'https?://(?:www\.)?upstore\.net/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Upstore.Net File Download Hoster"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py index d894dab24..e240df912 100644 --- a/module/plugins/hoster/VeehdCom.py +++ b/module/plugins/hoster/VeehdCom.py @@ -11,8 +11,8 @@ class VeehdCom(Hoster):      __version__ = "0.23"      __pattern__ = r'http://veehd\.com/video/\d+_\S+' -    __config__ = [("filename_spaces", "bool", "Allow spaces in filename", False), -                  ("replacement_char", "str", "Filename replacement character", "_")] +    __config__  = [("filename_spaces", "bool", "Allow spaces in filename", False), +                   ("replacement_char", "str", "Filename replacement character", "_")]      __description__ = """Veehd.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index 567f8e867..2f79f5aa4 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -11,7 +11,8 @@ class VeohCom(SimpleHoster):      __version__ = "0.22"      __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' -    __config__ = [("quality", "Low;High;Auto", "Quality", "Auto")] +    __config__  = [("use_premium", "bool"         , "Use premium account if available", True  ), +                   ("quality"    , "Low;High;Auto", "Quality"                         , "Auto")]      __description__ = """Veoh.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index e47751c65..02aef98ec 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -11,8 +11,9 @@ class VimeoCom(SimpleHoster):      __version__ = "0.04"      __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' -    __config__ = [("quality", "Lowest;Mobile;SD;HD;Highest", "Quality", "Highest"), -                  ("original", "bool", "Try to download the original file first", True)] +    __config__  = [("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     )]      __description__ = """Vimeo.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/Vipleech4UCom.py b/module/plugins/hoster/Vipleech4UCom.py index 2ae41b942..1a7ec2810 100644 --- a/module/plugins/hoster/Vipleech4UCom.py +++ b/module/plugins/hoster/Vipleech4UCom.py @@ -9,6 +9,7 @@ class Vipleech4UCom(DeadHoster):      __version__ = "0.20"      __pattern__ = r'http://(?:www\.)?vipleech4u\.com/manager\.php' +    __config__  = []      __description__ = """Vipleech4u.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py index c83d5c03e..a8ae99a1b 100644 --- a/module/plugins/hoster/WarserverCz.py +++ b/module/plugins/hoster/WarserverCz.py @@ -9,6 +9,7 @@ class WarserverCz(DeadHoster):      __version__ = "0.13"      __pattern__ = r'http://(?:www\.)?warserver\.cz/stahnout/\d+' +    __config__  = []      __description__ = """Warserver.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 98187d46a..59f61dc87 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -12,6 +12,7 @@ class WebshareCz(SimpleHoster):      __version__ = "0.16"      __pattern__ = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """WebShare.cz hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index 457e72865..0d78058d7 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -13,6 +13,7 @@ class WrzucTo(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Wrzuc.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py index 75ce59353..14c56aba3 100644 --- a/module/plugins/hoster/WuploadCom.py +++ b/module/plugins/hoster/WuploadCom.py @@ -9,6 +9,7 @@ class WuploadCom(DeadHoster):      __version__ = "0.23"      __pattern__ = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?' +    __config__  = []      __description__ = """Wupload.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/X7To.py b/module/plugins/hoster/X7To.py index a4e4b04bd..15e011720 100644 --- a/module/plugins/hoster/X7To.py +++ b/module/plugins/hoster/X7To.py @@ -9,6 +9,7 @@ class X7To(DeadHoster):      __version__ = "0.41"      __pattern__ = r'http://(?:www\.)?x7\.to/' +    __config__  = []      __description__ = """X7.to hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index d68f46283..fd494e099 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -22,7 +22,7 @@ class XHamsterCom(Hoster):      __version__ = "0.12"      __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' -    __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] +    __config__  = [("type", ".mp4;.flv", "Preferred type", ".mp4")]      __description__ = """XHamster.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/XdadevelopersCom.py b/module/plugins/hoster/XdadevelopersCom.py index 7d50d4f57..45d1e92cb 100644 --- a/module/plugins/hoster/XdadevelopersCom.py +++ b/module/plugins/hoster/XdadevelopersCom.py @@ -14,6 +14,7 @@ class XdadevelopersCom(SimpleHoster):      __version__ = "0.03"      __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Xda-developers.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index cf1550ebc..44f2b7b83 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -12,6 +12,7 @@ class YibaishiwuCom(SimpleHoster):      __version__ = "0.14"      __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """115.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 4fccbba65..06f135c60 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -36,13 +36,13 @@ class YoutubeCom(Hoster):      __version__ = "0.41"      __pattern__ = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+' -    __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ), -                  ("fmt"    , "int"                                         , "FMT/ITAG Number (0 for auto)", 0    ), -                  (".mp4"   , "bool"                                        , "Allow .mp4"                  , True ), -                  (".flv"   , "bool"                                        , "Allow .flv"                  , True ), -                  (".webm"  , "bool"                                        , "Allow .webm"                 , False), -                  (".3gp"   , "bool"                                        , "Allow .3gp"                  , False), -                  ("3d"     , "bool"                                        , "Prefer 3D"                   , False)] +    __config__  = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ), +                   ("fmt"    , "int"                                         , "FMT/ITAG Number (0 for auto)", 0    ), +                   (".mp4"   , "bool"                                        , "Allow .mp4"                  , True ), +                   (".flv"   , "bool"                                        , "Allow .flv"                  , True ), +                   (".webm"  , "bool"                                        , "Allow .webm"                 , False), +                   (".3gp"   , "bool"                                        , "Allow .3gp"                  , False), +                   ("3d"     , "bool"                                        , "Prefer 3D"                   , False)]      __description__ = """Youtube.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py index dc96facbe..8142136bb 100644 --- a/module/plugins/hoster/ZShareNet.py +++ b/module/plugins/hoster/ZShareNet.py @@ -9,6 +9,7 @@ class ZShareNet(DeadHoster):      __version__ = "0.21"      __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+' +    __config__  = []      __description__ = """ZShare.net hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 79505601d..e0362ce36 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -13,6 +13,7 @@ class ZeveraCom(MultiHoster):      __version__ = "0.29"      __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Zevera.com multi-hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 8da0f4942..3f392133a 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -14,6 +14,7 @@ class ZippyshareCom(SimpleHoster):      __version__ = "0.77"      __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)]      __description__ = """Zippyshare.com hoster plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py index ef7f47ed1..5855f7ece 100644 --- a/module/plugins/internal/MultiHook.py +++ b/module/plugins/internal/MultiHook.py @@ -12,10 +12,10 @@ class MultiHook(Hook):      __type__    = "hook"      __version__ = "0.40" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"), -                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ), -                  ("reload"        , "bool"               , "Reload plugin list"           , True ), -                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )] +    __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"), +                   ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ), +                   ("reload"        , "bool"               , "Reload plugin list"           , True ), +                   ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]      __description__ = """Hook plugin for multi hoster/crypter"""      __license__     = "GPLv3" diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index ef6d3fc0e..9946bb115 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -15,8 +15,8 @@ class SimpleCrypter(Crypter, SimpleHoster):      __version__ = "0.43"      __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder"        , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package'] -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package'] +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Simple decrypter plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index 577d56f75..360cd7c30 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -14,8 +14,8 @@ class SimpleDereferer(Crypter):      __version__ = "0.08"      __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), -                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] +    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True), +                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]      __description__ = """Simple dereferer plugin"""      __license__     = "GPLv3" diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index a42947970..bcdd1cbef 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -148,7 +148,7 @@ def getFileURL(self, url, follow_location=None):      if type(follow_location) is int:          redirect = max(follow_location, 1)      else: -        redirect = 5 +        redirect = 10      for i in xrange(redirect):          try: @@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):  class SimpleHoster(Hoster):      __name__    = "SimpleHoster"      __type__    = "hoster" -    __version__ = "1.30" +    __version__ = "1.31"      __pattern__ = r'^unmatchable$'      __config__  = [("use_premium", "bool", "Use premium account if available", True)] | 
