diff options
Diffstat (limited to 'module')
462 files changed, 988 insertions, 762 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index cf28665ca..12d0582a8 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class AlldebridCom(Account): - __name = "AlldebridCom" + __name__ = "AlldebridCom" __type__ = "account" __version__ = "0.28" __status__ = "testing" diff --git a/module/plugins/accounts/AniStreamCom.py b/module/plugins/accounts/AniStreamCom.py index b96af61e9..5c7ac9fff 100644 --- a/module/plugins/accounts/AniStreamCom.py +++ b/module/plugins/accounts/AniStreamCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class AniStreamCom(XFSAccount): - __name = "AniStreamCom" + __name__ = "AniStreamCom" __type__ = "account" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/accounts/BackinNet.py b/module/plugins/accounts/BackinNet.py index b8f55db55..d903f020c 100644 --- a/module/plugins/accounts/BackinNet.py +++ b/module/plugins/accounts/BackinNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class BackinNet(XFSAccount): - __name = "BackinNet" + __name__ = "BackinNet" __type__ = "account" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index 34f4e2bc0..e8028b9d0 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class BitshareCom(Account): - __name = "BitshareCom" + __name__ = "BitshareCom" __type__ = "account" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py index 5c16ff2ee..6e11064a6 100644 --- a/module/plugins/accounts/CatShareNet.py +++ b/module/plugins/accounts/CatShareNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class CatShareNet(Account): - __name = "CatShareNet" + __name__ = "CatShareNet" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/CloudsixMe.py b/module/plugins/accounts/CloudsixMe.py index 979f2977e..3410af002 100644 --- a/module/plugins/accounts/CloudsixMe.py +++ b/module/plugins/accounts/CloudsixMe.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class CloudsixMe(XFSAccount): - __name = "CloudsixMe" + __name__ = "CloudsixMe" __type__ = "account" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/accounts/CloudzillaTo.py b/module/plugins/accounts/CloudzillaTo.py index b40a79243..821975ef0 100644 --- a/module/plugins/accounts/CloudzillaTo.py +++ b/module/plugins/accounts/CloudzillaTo.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class CloudzillaTo(Account): - __name = "CloudzillaTo" + __name__ = "CloudzillaTo" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index 584cec4ea..084aa79a6 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class CramitIn(XFSAccount): - __name = "CramitIn" + __name__ = "CramitIn" __type__ = "account" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 1dfcb30bd..fd02abe0f 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class CzshareCom(Account): - __name = "CzshareCom" + __name__ = "CzshareCom" __type__ = "account" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index f7c5fc562..50d849a98 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class DebridItaliaCom(Account): - __name = "DebridItaliaCom" + __name__ = "DebridItaliaCom" __type__ = "account" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index 1b542b836..35df3f939 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class DepositfilesCom(Account): - __name = "DepositfilesCom" + __name__ = "DepositfilesCom" __type__ = "account" __version__ = "0.36" __status__ = "testing" diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index c1abfeb14..9340f49e6 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class EasybytezCom(XFSAccount): - __name = "EasybytezCom" + __name__ = "EasybytezCom" __type__ = "account" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index 8ff0b2c2d..e5a05cd7f 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class EuroshareEu(Account): - __name = "EuroshareEu" + __name__ = "EuroshareEu" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/ExashareCom.py b/module/plugins/accounts/ExashareCom.py index 50564aedb..6b352e40e 100644 --- a/module/plugins/accounts/ExashareCom.py +++ b/module/plugins/accounts/ExashareCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class ExashareCom(XFSAccount): - __name = "ExashareCom" + __name__ = "ExashareCom" __type__ = "account" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index a11061d2d..83a02d76b 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class FastixRu(Account): - __name = "FastixRu" + __name__ = "FastixRu" __type__ = "account" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py index 5f28a02d6..68c65bd3f 100644 --- a/module/plugins/accounts/FastshareCz.py +++ b/module/plugins/accounts/FastshareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import set_cookie class FastshareCz(Account): - __name = "FastshareCz" + __name__ = "FastshareCz" __type__ = "account" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/accounts/File4SafeCom.py b/module/plugins/accounts/File4SafeCom.py index 78b69a5be..8e5f437b3 100644 --- a/module/plugins/accounts/File4SafeCom.py +++ b/module/plugins/accounts/File4SafeCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class File4SafeCom(XFSAccount): - __name = "File4SafeCom" + __name__ = "File4SafeCom" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py index 4d474fedc..86183f4d3 100644 --- a/module/plugins/accounts/FileParadoxIn.py +++ b/module/plugins/accounts/FileParadoxIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FileParadoxIn(XFSAccount): - __name = "FileParadoxIn" + __name__ = "FileParadoxIn" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index 32a50cee8..d80a8b9d6 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -6,7 +6,7 @@ from module.plugins.internal.Plugin import set_cookie class FilecloudIo(Account): - __name = "FilecloudIo" + __name__ = "FilecloudIo" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 6dda0c786..0f8f709c6 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class FilefactoryCom(Account): - __name = "FilefactoryCom" + __name__ = "FilefactoryCom" __type__ = "account" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index b6e2d7c0a..230aa9939 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class FilejungleCom(Account): - __name = "FilejungleCom" + __name__ = "FilejungleCom" __type__ = "account" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py index 08373a717..0bd0b60cf 100644 --- a/module/plugins/accounts/FileomCom.py +++ b/module/plugins/accounts/FileomCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FileomCom(XFSAccount): - __name = "FileomCom" + __name__ = "FileomCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 76b35e939..96bdebd81 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class FilerNet(Account): - __name = "FilerNet" + __name__ = "FilerNet" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index c0f13e0eb..d843dd605 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FilerioCom(XFSAccount): - __name = "FilerioCom" + __name__ = "FilerioCom" __type__ = "account" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index d729d4789..551a7b8e5 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class FilesMailRu(Account): - __name = "FilesMailRu" + __name__ = "FilesMailRu" __type__ = "account" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index b4a683050..bc56d4b96 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class FileserveCom(Account): - __name = "FileserveCom" + __name__ = "FileserveCom" __type__ = "account" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index a81b45104..08640dfa7 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -5,9 +5,9 @@ from module.plugins.internal.Plugin import set_cookie class FourSharedCom(Account): - __name = "4shared" + __name__ = "FourSharedCom" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __description__ = """FourShared.com account plugin""" diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 8c261046e..8cb0436fc 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class FreakshareCom(Account): - __name = "FreakshareCom" + __name__ = "FreakshareCom" __type__ = "account" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index c11e76eb6..5e214db35 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class FreeWayMe(Account): - __name = "FreeWayMe" + __name__ = "FreeWayMe" __type__ = "account" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 2143a2b67..e692394ef 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class FshareVn(Account): - __name = "FshareVn" + __name__ = "FshareVn" __type__ = "account" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index 0096e034e..d73b557ef 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class Ftp(Account): - __name = "Ftp" + __name__ = "Ftp" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index d96ba9399..b0cd87938 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class HellshareCz(Account): - __name = "HellshareCz" + __name__ = "HellshareCz" __type__ = "account" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index d722e0e52..3b39b7da6 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -5,7 +5,7 @@ from module.plugins.internal.Account import Account class HighWayMe(Account): - __name = "HighWayMe.py" + __name__ = "HighWayMe.py" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 421c3bcdd..261b3b240 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class Http(Account): - __name = "Http" + __name__ = "Http" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py index dadcea0ab..a5920f4a4 100644 --- a/module/plugins/accounts/HugefilesNet.py +++ b/module/plugins/accounts/HugefilesNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class HugefilesNet(XFSAccount): - __name = "HugefilesNet" + __name__ = "HugefilesNet" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py index 4d0a8b548..8b757de61 100644 --- a/module/plugins/accounts/HundredEightyUploadCom.py +++ b/module/plugins/accounts/HundredEightyUploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): - __name = "HundredEightyUploadCom" + __name__ = "HundredEightyUploadCom" __type__ = "account" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/accounts/JunkyvideoCom.py b/module/plugins/accounts/JunkyvideoCom.py index 98a4b8755..316332fd9 100644 --- a/module/plugins/accounts/JunkyvideoCom.py +++ b/module/plugins/accounts/JunkyvideoCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class JunkyvideoCom(XFSAccount): - __name = "JunkyvideoCom" + __name__ = "JunkyvideoCom" __type__ = "account" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py index cbe1b51af..95bc57640 100644 --- a/module/plugins/accounts/JunocloudMe.py +++ b/module/plugins/accounts/JunocloudMe.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class JunocloudMe(XFSAccount): - __name = "JunocloudMe" + __name__ = "JunocloudMe" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py index f5eda553e..494f2938f 100644 --- a/module/plugins/accounts/Keep2ShareCc.py +++ b/module/plugins/accounts/Keep2ShareCc.py @@ -8,7 +8,7 @@ from module.plugins.internal.Plugin import set_cookie class Keep2ShareCc(Account): - __name = "Keep2ShareCc" + __name__ = "Keep2ShareCc" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index cbdf92da1..f7350e547 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -5,7 +5,7 @@ from module.plugins.internal.Account import Account class LetitbitNet(Account): - __name = "LetitbitNet" + __name__ = "LetitbitNet" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py index def388b44..6953f311c 100644 --- a/module/plugins/accounts/LinksnappyCom.py +++ b/module/plugins/accounts/LinksnappyCom.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class LinksnappyCom(Account): - __name = "LinksnappyCom" + __name__ = "LinksnappyCom" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index e3c6a0d8e..46375716f 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class MegaDebridEu(Account): - __name = "MegaDebridEu" + __name__ = "MegaDebridEu" __type__ = "account" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py index 09791a184..050e3e4c6 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/module/plugins/accounts/MegaRapidCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class MegaRapidCz(Account): - __name = "MegaRapidCz" + __name__ = "MegaRapidCz" __type__ = "account" __version__ = "0.39" __status__ = "testing" diff --git a/module/plugins/accounts/MegaRapidoNet.py b/module/plugins/accounts/MegaRapidoNet.py index 6108a309d..d8291e0e2 100644 --- a/module/plugins/accounts/MegaRapidoNet.py +++ b/module/plugins/accounts/MegaRapidoNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class MegaRapidoNet(Account): - __name = "MegaRapidoNet" + __name__ = "MegaRapidoNet" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index 467c5a018..9b4fda9f7 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class MegasharesCom(Account): - __name = "MegasharesCom" + __name__ = "MegasharesCom" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py index 14d300d34..1594a2b6a 100644 --- a/module/plugins/accounts/MovReelCom.py +++ b/module/plugins/accounts/MovReelCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class MovReelCom(XFSAccount): - __name = "MovReelCom" + __name__ = "MovReelCom" __type__ = "account" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/accounts/MultihostersCom.py b/module/plugins/accounts/MultihostersCom.py index 978f75df8..1ede88574 100644 --- a/module/plugins/accounts/MultihostersCom.py +++ b/module/plugins/accounts/MultihostersCom.py @@ -4,7 +4,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class MultihostersCom(ZeveraCom): - __name = "MultihostersCom" + __name__ = "MultihostersCom" __type__ = "account" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 0fe1137f3..16fa57948 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class MultishareCz(Account): - __name = "MultishareCz" + __name__ = "MultishareCz" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py index c07166ad8..eff112a2f 100644 --- a/module/plugins/accounts/MyfastfileCom.py +++ b/module/plugins/accounts/MyfastfileCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class MyfastfileCom(Account): - __name = "MyfastfileCom" + __name__ = "MyfastfileCom" __type__ = "account" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py index f6ce7018d..0b9e67a7c 100644 --- a/module/plugins/accounts/NitroflareCom.py +++ b/module/plugins/accounts/NitroflareCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class NitroflareCom(Account): - __name = "NitroflareCom" + __name__ = "NitroflareCom" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py index 6f5d5d3c7..f8236c978 100644 --- a/module/plugins/accounts/NoPremiumPl.py +++ b/module/plugins/accounts/NoPremiumPl.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class NoPremiumPl(Account): - __name = "NoPremiumPl" + __name__ = "NoPremiumPl" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py index 715096bf2..65ac8d4fc 100644 --- a/module/plugins/accounts/NosuploadCom.py +++ b/module/plugins/accounts/NosuploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class NosuploadCom(XFSAccount): - __name = "NosuploadCom" + __name__ = "NosuploadCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py index 13a90c528..1506ec315 100644 --- a/module/plugins/accounts/NovafileCom.py +++ b/module/plugins/accounts/NovafileCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class NovafileCom(XFSAccount): - __name = "NovafileCom" + __name__ = "NovafileCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py index 228202c45..3375207d9 100644 --- a/module/plugins/accounts/NowVideoSx.py +++ b/module/plugins/accounts/NowVideoSx.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class NowVideoSx(Account): - __name = "NowVideoSx" + __name__ = "NowVideoSx" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index bbb913081..c19396854 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -21,7 +21,7 @@ from module.plugins.internal.Account import Account class OboomCom(Account): - __name = "OboomCom" + __name__ = "OboomCom" __type__ = "account" __version__ = "0.29" __status__ = "testing" diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index d87f4f937..01db3b088 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -8,9 +8,9 @@ from module.plugins.internal.Account import Account class OneFichierCom(Account): - __name = "1fichier.com" + __name__ = "OneFichierCom" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __description__ = """1fichier.com account plugin""" diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index a82dcf689..02d0d2649 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class OverLoadMe(Account): - __name = "OverLoadMe" + __name__ = "OverLoadMe" __type__ = "account" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py index 35dc1d3ed..74859d8a5 100644 --- a/module/plugins/accounts/PremiumTo.py +++ b/module/plugins/accounts/PremiumTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class PremiumTo(Account): - __name = "PremiumTo" + __name__ = "PremiumTo" __type__ = "account" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index b35b06c9f..2dc9b8a71 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -5,7 +5,7 @@ from module.plugins.internal.Account import Account class PremiumizeMe(Account): - __name = "PremiumizeMe" + __name__ = "PremiumizeMe" __type__ = "account" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/accounts/PutdriveCom.py b/module/plugins/accounts/PutdriveCom.py index ca34836fc..4da71f41b 100644 --- a/module/plugins/accounts/PutdriveCom.py +++ b/module/plugins/accounts/PutdriveCom.py @@ -4,7 +4,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class PutdriveCom(ZeveraCom): - __name = "PutdriveCom" + __name__ = "PutdriveCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index e77f29c1e..19cde51c4 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class QuickshareCz(Account): - __name = "QuickshareCz" + __name__ = "QuickshareCz" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index ea179dc76..3b814debc 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class RPNetBiz(Account): - __name = "RPNetBiz" + __name__ = "RPNetBiz" __type__ = "account" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py index 58969cb85..fc17622b0 100644 --- a/module/plugins/accounts/RapideoPl.py +++ b/module/plugins/accounts/RapideoPl.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class RapideoPl(Account): - __name = "RapideoPl" + __name__ = "RapideoPl" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py index faaf7e134..a28c61b36 100644 --- a/module/plugins/accounts/RapidfileshareNet.py +++ b/module/plugins/accounts/RapidfileshareNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RapidfileshareNet(XFSAccount): - __name = "RapidfileshareNet" + __name__ = "RapidfileshareNet" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 6160b8504..ea6da4c4b 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class RapidgatorNet(Account): - __name = "RapidgatorNet" + __name__ = "RapidgatorNet" __type__ = "account" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index a192acffc..c11eb9214 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -8,7 +8,7 @@ from module.common.json_layer import json_loads class RapiduNet(Account): - __name = "RapiduNet" + __name__ = "RapiduNet" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index 52712478a..0004c0f79 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RarefileNet(XFSAccount): - __name = "RarefileNet" + __name__ = "RarefileNet" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 4fcbe80cf..63ef62da0 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class RealdebridCom(Account): - __name = "RealdebridCom" + __name__ = "RealdebridCom" __type__ = "account" __version__ = "0.50" __status__ = "testing" diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 6414e564f..4ff3f15a8 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class RehostTo(Account): - __name = "RehostTo" + __name__ = "RehostTo" __type__ = "account" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index 4a822b399..84b786bac 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): - __name = "RyushareCom" + __name__ = "RyushareCom" __type__ = "account" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/accounts/SafesharingEu.py b/module/plugins/accounts/SafesharingEu.py index 7eabc50e4..632b2bff8 100644 --- a/module/plugins/accounts/SafesharingEu.py +++ b/module/plugins/accounts/SafesharingEu.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SafesharingEu(XFSAccount): - __name = "SafesharingEu" + __name__ = "SafesharingEu" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py index 47ba9b929..e3f2dbc4f 100644 --- a/module/plugins/accounts/SecureUploadEu.py +++ b/module/plugins/accounts/SecureUploadEu.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SecureUploadEu(XFSAccount): - __name = "SecureUploadEu" + __name__ = "SecureUploadEu" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py index 0ec6d0c98..a1675b654 100644 --- a/module/plugins/accounts/SendmywayCom.py +++ b/module/plugins/accounts/SendmywayCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SendmywayCom(XFSAccount): - __name = "SendmywayCom" + __name__ = "SendmywayCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/SharebeastCom.py b/module/plugins/accounts/SharebeastCom.py index 3283981e9..b8ddbe34d 100644 --- a/module/plugins/accounts/SharebeastCom.py +++ b/module/plugins/accounts/SharebeastCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SharebeastCom(XFSAccount): - __name = "SharebeastCom" + __name__ = "SharebeastCom" __type__ = "account" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 5a91a8b10..f5d213ecd 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import set_cookie class ShareonlineBiz(Account): - __name = "ShareonlineBiz" + __name__ = "ShareonlineBiz" __type__ = "account" __version__ = "0.41" __status__ = "testing" diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index 95a6b71a8..2be8782ce 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Plugin import set_cookie class SimplyPremiumCom(Account): - __name = "SimplyPremiumCom" + __name__ = "SimplyPremiumCom" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index dfb99b434..bd56dd5ec 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class SimplydebridCom(Account): - __name = "SimplydebridCom" + __name__ = "SimplydebridCom" __type__ = "account" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py index 4204ac136..1c3da5269 100644 --- a/module/plugins/accounts/SmoozedCom.py +++ b/module/plugins/accounts/SmoozedCom.py @@ -24,7 +24,7 @@ from module.plugins.internal.Account import Account class SmoozedCom(Account): - __name = "SmoozedCom" + __name__ = "SmoozedCom" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py index 4435c6ded..54dd8e2fe 100644 --- a/module/plugins/accounts/StreamcloudEu.py +++ b/module/plugins/accounts/StreamcloudEu.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class StreamcloudEu(XFSAccount): - __name = "StreamcloudEu" + __name__ = "StreamcloudEu" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 3b2fe9a73..c3edd0c09 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -8,7 +8,7 @@ from module.plugins.internal.Plugin import set_cookie class TurbobitNet(Account): - __name = "TurbobitNet" + __name__ = "TurbobitNet" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py index 259f01b90..d826e5a3d 100644 --- a/module/plugins/accounts/TusfilesNet.py +++ b/module/plugins/accounts/TusfilesNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class TusfilesNet(XFSAccount): - __name = "TusfilesNet" + __name__ = "TusfilesNet" __type__ = "account" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 5b95878d7..8380099e1 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class UlozTo(Account): - __name = "UlozTo" + __name__ = "UlozTo" __type__ = "account" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/accounts/UploadableCh.py b/module/plugins/accounts/UploadableCh.py index 024f20576..eefa1f3a0 100644 --- a/module/plugins/accounts/UploadableCh.py +++ b/module/plugins/accounts/UploadableCh.py @@ -4,7 +4,7 @@ from module.plugins.internal.Account import Account class UploadableCh(Account): - __name = "UploadableCh" + __name__ = "UploadableCh" __type__ = "account" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py index 2fcde9950..dbad01858 100644 --- a/module/plugins/accounts/UploadcCom.py +++ b/module/plugins/accounts/UploadcCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class UploadcCom(XFSAccount): - __name = "UploadcCom" + __name__ = "UploadcCom" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 096b0503d..1e92195a1 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -7,7 +7,7 @@ from module.plugins.internal.Account import Account class UploadedTo(Account): - __name = "UploadedTo" + __name__ = "UploadedTo" __type__ = "account" __version__ = "0.38" __status__ = "testing" diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index 63aa22856..c5e684033 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class UploadheroCom(Account): - __name = "UploadheroCom" + __name__ = "UploadheroCom" __type__ = "account" __version__ = "0.25" __status__ = "testing" diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index 0eeeafcfa..6c7103b21 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Plugin import set_cookies class UploadingCom(Account): - __name = "UploadingCom" + __name__ = "UploadingCom" __type__ = "account" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index 75c880119..8df558e2a 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): - __name = "UptoboxCom" + __name__ = "UptoboxCom" __type__ = "account" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py index 2ca8bb1d0..e54515faf 100644 --- a/module/plugins/accounts/VidPlayNet.py +++ b/module/plugins/accounts/VidPlayNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class VidPlayNet(XFSAccount): - __name = "VidPlayNet" + __name__ = "VidPlayNet" __type__ = "account" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py index 115a33109..484ea06ce 100644 --- a/module/plugins/accounts/WebshareCz.py +++ b/module/plugins/accounts/WebshareCz.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class WebshareCz(Account): - __name = "WebshareCz" + __name__ = "WebshareCz" __type__ = "account" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/accounts/WorldbytezCom.py b/module/plugins/accounts/WorldbytezCom.py index 61bcb56cb..6987bc0cc 100644 --- a/module/plugins/accounts/WorldbytezCom.py +++ b/module/plugins/accounts/WorldbytezCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class WorldbytezCom(XFSAccount): - __name = "WorldbytezCom" + __name__ = "WorldbytezCom" __type__ = "account" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 966718ab6..68797b7f0 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): - __name = "XFileSharingPro" + __name__ = "XFileSharingPro" __type__ = "account" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index faf6bef04..695dd79cd 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class YibaishiwuCom(Account): - __name = "YibaishiwuCom" + __name__ = "YibaishiwuCom" __type__ = "account" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index 4e187b17a..c94ad6db7 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class ZeveraCom(Account): - __name = "ZeveraCom" + __name__ = "ZeveraCom" __type__ = "account" __version__ = "0.30" __status__ = "testing" diff --git a/module/plugins/captcha/AdYouLike.py b/module/plugins/captcha/AdYouLike.py index 2fbd28011..b10d2c399 100644 --- a/module/plugins/captcha/AdYouLike.py +++ b/module/plugins/captcha/AdYouLike.py @@ -7,7 +7,7 @@ from module.plugins.internal.CaptchaService import CaptchaService class AdYouLike(CaptchaService): - __name = "AdYouLike" + __name__ = "AdYouLike" __type__ = "captcha" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/captcha/AdsCaptcha.py b/module/plugins/captcha/AdsCaptcha.py index bafcb8950..7dc51565f 100644 --- a/module/plugins/captcha/AdsCaptcha.py +++ b/module/plugins/captcha/AdsCaptcha.py @@ -7,7 +7,7 @@ from module.plugins.internal.CaptchaService import CaptchaService class AdsCaptcha(CaptchaService): - __name = "AdsCaptcha" + __name__ = "AdsCaptcha" __type__ = "captcha" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/captcha/CircleCaptcha.py b/module/plugins/captcha/CircleCaptcha.py index 7f2cb739f..dc04a04c8 100644 --- a/module/plugins/captcha/CircleCaptcha.py +++ b/module/plugins/captcha/CircleCaptcha.py @@ -29,7 +29,7 @@ class ImageSequence: class CircleCaptcha(OCR): - __name = "CircleCaptcha" + __name__ = "CircleCaptcha" __type__ = "ocr" __version__ = "1.04" __status__ = "testing" diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py index 192628cba..12f123c41 100644 --- a/module/plugins/captcha/GigasizeCom.py +++ b/module/plugins/captcha/GigasizeCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.OCR import OCR class GigasizeCom(OCR): - __name = "GigasizeCom" + __name__ = "GigasizeCom" __type__ = "ocr" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py index 4a8ffef2b..a9ccecf3c 100644 --- a/module/plugins/captcha/LinksaveIn.py +++ b/module/plugins/captcha/LinksaveIn.py @@ -13,7 +13,7 @@ from module.plugins.internal.OCR import OCR class LinksaveIn(OCR): - __name = "LinksaveIn" + __name__ = "LinksaveIn" __type__ = "ocr" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py index 62ae14a67..50174684d 100644 --- a/module/plugins/captcha/NetloadIn.py +++ b/module/plugins/captcha/NetloadIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.OCR import OCR class NetloadIn(OCR): - __name = "NetloadIn" + __name__ = "NetloadIn" __type__ = "ocr" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py index c1927e41e..379956be6 100644 --- a/module/plugins/captcha/ReCaptcha.py +++ b/module/plugins/captcha/ReCaptcha.py @@ -11,7 +11,7 @@ from module.plugins.internal.CaptchaService import CaptchaService class ReCaptcha(CaptchaService): - __name = "ReCaptcha" + __name__ = "ReCaptcha" __type__ = "captcha" __version__ = "0.18" __status__ = "testing" diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py index 29f669fce..19db6c4cd 100644 --- a/module/plugins/captcha/ShareonlineBiz.py +++ b/module/plugins/captcha/ShareonlineBiz.py @@ -4,7 +4,7 @@ from module.plugins.internal.OCR import OCR class ShareonlineBiz(OCR): - __name = "ShareonlineBiz" + __name__ = "ShareonlineBiz" __type__ = "ocr" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/captcha/SolveMedia.py b/module/plugins/captcha/SolveMedia.py index cab99cb62..6629656b2 100644 --- a/module/plugins/captcha/SolveMedia.py +++ b/module/plugins/captcha/SolveMedia.py @@ -7,7 +7,7 @@ from module.plugins.internal.CaptchaService import CaptchaService class SolveMedia(CaptchaService): - __name = "SolveMedia" + __name__ = "SolveMedia" __type__ = "captcha" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 49458fcb9..7e0e962b3 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -11,12 +11,13 @@ from module.utils import fs_encode, save_join as fs_join class CCF(Container): - __name = "CCF" + __name__ = "CCF" __type__ = "container" __version__ = "0.25" __status__ = "testing" __pattern__ = r'.+\.ccf$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """CCF container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index b924b0c6a..24300b358 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -12,12 +12,13 @@ from module.utils import decode, fs_encode class DLC(Container): - __name = "DLC" + __name__ = "DLC" __type__ = "container" __version__ = "0.26" __status__ = "testing" __pattern__ = r'(.+\.dlc|[\w+^_]+==[\w+^_/]+==)$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """DLC container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index c9b3eea8a..f156cf1eb 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -12,12 +12,13 @@ from module.utils import fs_encode class RSDF(Container): - __name = "RSDF" + __name__ = "RSDF" __type__ = "container" __version__ = "0.31" __status__ = "testing" __pattern__ = r'.+\.rsdf$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """RSDF container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index f8ff3ebfa..555c13b51 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -7,13 +7,14 @@ from module.utils import fs_encode class TXT(Container): - __name = "TXT" + __name__ = "TXT" __type__ = "container" __version__ = "0.17" __status__ = "testing" __pattern__ = r'.+\.(txt|text)$' - __config__ = [("flush" , "bool" , "Flush list after adding", False ), + __config__ = [("activated", "bool", "Activated", True), + ("flush" , "bool" , "Flush list after adding", False ), ("encoding", "string", "File encoding" , "utf-8")] __description__ = """Read link lists in plain text formats""" diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index c34313389..eb094dd2a 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class BitshareComFolder(SimpleCrypter): - __name = "BitshareCom" + __name__ = "BitshareCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 3d40c9c0c..09acace63 100644 --- a/module/plugins/crypter/C1NeonCom.py +++ b/module/plugins/crypter/C1NeonCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class C1NeonCom(DeadCrypter): - __name = "C1NeonCom" + __name__ = "C1NeonCom" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 847490786..3b02ccef0 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class ChipDe(Crypter): - __name = "ChipDe" + __name__ = "ChipDe" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Chip.de decrypter plugin""" diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index 79a52fbfa..26fccde7b 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CloudzillaToFolder(SimpleHoster): - __name = "CloudzillaTo" + __name__ = "CloudzillaTo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Cloudzilla.to folder decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 926396192..6bcef85d1 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CrockoComFolder(SimpleCrypter): - __name = "CrockoCom" + __name__ = "CrockoCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 1613232d1..be0094747 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class CryptItCom(DeadCrypter): - __name = "CryptItCom" + __name__ = "CryptItCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 7728f236e..d39f7d2a2 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): - __name = "CzshareCom" + __name__ = "CzshareCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index de3dddfc3..0abc720f1 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -9,13 +9,14 @@ from module.utils import save_join as fs_join class DailymotionComFolder(Crypter): - __name = "DailymotionCom" + __name__ = "DailymotionCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Dailymotion.com channel & playlist decrypter""" diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index cec612deb..1a961111d 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DataHuFolder(SimpleCrypter): - __name = "DataHu" + __name__ = "DataHu" __type__ = "crypter" __version__ = "0.08" __status__ = "testing" __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index c462db795..bdd076b16 100644 --- a/module/plugins/crypter/DdlstorageComFolder.py +++ b/module/plugins/crypter/DdlstorageComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DdlstorageComFolder(DeadCrypter): - __name = "DdlstorageCom" + __name__ = "DdlstorageCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 2ea6a3655..70b397db3 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DepositfilesComFolder(SimpleCrypter): - __name = "DepositfilesCom" + __name__ = "DepositfilesCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 631032018..6ce2e7248 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class Dereferer(SimpleCrypter): - __name = "Dereferer" + __name__ = "Dereferer" __type__ = "crypter" __version__ = "0.19" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Crypter for dereferers""" @@ -31,11 +32,11 @@ class Dereferer(SimpleCrypter): def init(self): super(Dereferer, self).init() - self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] #@TODO: Recheck in 0.4.10 + self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.classname]['pattern'] #@TODO: Recheck in 0.4.10 - self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.PLUGIN_DOMAIN) if part != '.') def get_links(self): - return [re.match(self.__pattern, self.pyfile.url).group('LINK')] + return [re.match(self.__pattern__, self.pyfile.url).group('LINK')] diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 92952c57d..92a50f580 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DevhostStFolder(SimpleCrypter): - __name = "DevhostSt" + __name__ = "DevhostSt" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index fccd385f5..760cbfaa6 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DlProtectCom(SimpleCrypter): - __name = "DlProtectCom" + __name__ = "DlProtectCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 5bb7208af..eae58d60c 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): - __name = "DuckCryptInfo" + __name__ = "DuckCryptInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """DuckCrypt.info decrypter plugin""" @@ -28,7 +29,7 @@ class DuckCryptInfo(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern, url) + m = re.match(self.__pattern__, url) if m is None: self.fail(_("Weird error in link")) if str(m.group(1)) == "link": @@ -39,7 +40,7 @@ class DuckCryptInfo(Crypter): def handle_folder(self, m): html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2))) - m = re.match(self.__pattern, html) + m = re.match(self.__pattern__, html) self.log_debug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup.BeautifulSoup(html) diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index 0cc810ea6..36e7790ae 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class DuploadOrgFolder(DeadCrypter): - __name = "DuploadOrg" + __name__ = "DuploadOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 96c546ebc..bbeef30bc 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): - __name = "EasybytezCom" + __name__ = "EasybytezCom" __type__ = "crypter" __version__ = "0.11" __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Easybytez.com folder decrypter plugin""" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 8bf5aa787..96eb92f7e 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -6,13 +6,14 @@ from module.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name = "EmbeduploadCom" + __name__ = "EmbeduploadCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True ), ("preferedHoster" , "str" , "Prefered hoster list (bar-separated)", "embedupload"), ("ignoredHoster" , "str" , "Ignored hoster list (bar-separated)" , "" )] diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 0c072d07f..f775c8695 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilebeerInfoFolder(DeadCrypter): - __name = "FilebeerInfo" + __name__ = "FilebeerInfo" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 89495e8c7..63f6ad677 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilecloudIoFolder(SimpleCrypter): - __name = "FilecloudIo" + __name__ = "FilecloudIo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 720d20e01..a516392f1 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -15,12 +15,13 @@ from module.plugins.captcha.SolveMedia import SolveMedia class FilecryptCc(Crypter): - __name = "FilecryptCc" + __name__ = "FilecryptCc" __type__ = "crypter" __version__ = "0.20" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filecrypt.cc decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index e7d6b4771..2d3634a1f 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilefactoryComFolder(SimpleCrypter): - __name = "FilefactoryCom" + __name__ = "FilefactoryCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 9151e43c3..5a79b17e3 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilerNetFolder(SimpleCrypter): - __name = "FilerNet" + __name__ = "FilerNet" __type__ = "crypter" __version__ = "0.43" __status__ = "testing" __pattern__ = r'https?://filer\.net/folder/\w{16}' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 7a64ac451..af01338cb 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): - __name = "FileserveCom" + __name__ = "FileserveCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """FileServe.com folder decrypter plugin""" diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index c749c74b2..00ceb31f1 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FilesonicComFolder(DeadCrypter): - __name = "FilesonicCom" + __name__ = "FilesonicCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 2dff23b11..c65296e8b 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilestubeCom(SimpleCrypter): - __name = "FilestubeCom" + __name__ = "FilestubeCom" __type__ = "crypter" __version__ = "0.07" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 4edb85371..18960f605 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FiletramCom(SimpleCrypter): - __name = "FiletramCom" + __name__ = "FiletramCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 47a9d96e4..4a352d942 100644 --- a/module/plugins/crypter/FiredriveComFolder.py +++ b/module/plugins/crypter/FiredriveComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class FiredriveComFolder(DeadCrypter): - __name = "FiredriveCom" + __name__ = "FiredriveCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index a2fdb99d1..519fb75c4 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -9,13 +9,14 @@ from module.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): - __name = "4chan" + __name__ = "FourChanOrg" __type__ = "crypter" - __version__ = "0.33" + __version__ = "0.34" __status__ = "testing" __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """4chan.org folder decrypter plugin""" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 7ea7ae6ad..1f78470e2 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreakhareComFolder(SimpleCrypter): - __name = "FreakhareCom" + __name__ = "FreakhareCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index 8920c6c15..246d9ede9 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreetexthostCom(SimpleCrypter): - __name = "FreetexthostCom" + __name__ = "FreetexthostCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 6da2cccf9..3b947a057 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FshareVnFolder(SimpleCrypter): - __name = "FshareVn" + __name__ = "FshareVn" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index 9ff8ca218..6f19bdbce 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FurLy(SimpleCrypter): - __name = "FurLy" + __name__ = "FurLy" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fur\.ly/(\d/)?\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Fur.ly decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index 9ea5b333e..6aed6ffba 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -8,13 +8,14 @@ import json class Go4UpCom(SimpleCrypter): - __name = "Go4UpCom" + __name__ = "Go4UpCom" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True), ("preferred_hoster" , "int" , "Id of preferred hoster or 0 for all", 0)] diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 8298701d3..cbe44a5b3 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -5,12 +5,13 @@ from module.common.json_layer import json_loads class GooGl(SimpleCrypter): - __name = "GooGl" + __name__ = "GooGl" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?goo\.gl/([a-zA-Z]+/)?\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Goo.gl decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index 774e768f9..2a687937e 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class GoogledriveComFolder(SimpleCrypter): - __name = "GoogledriveCom" + __name__ = "GoogledriveCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?drive\.google\.com/folderview\?.*id=\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Drive.google.com folder decrypter plugin""" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 23ec42064..f99b66f40 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): - __name = "HoerbuchIn" + __name__ = "HoerbuchIn" __type__ = "crypter" __version__ = "0.62" __status__ = "testing" __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Hoerbuch.in decrypter plugin""" diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index a489e4309..c5eab0490 100644 --- a/module/plugins/crypter/HotfileComFolder.py +++ b/module/plugins/crypter/HotfileComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class HotfileComFolder(DeadCrypter): - __name = "HotfileCom" + __name__ = "HotfileCom" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index bebdbef55..7d73b898f 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class ILoadTo(DeadCrypter): - __name = "ILoadTo" + __name__ = "ILoadTo" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index a2bb4c9f7..6ae70df79 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -5,13 +5,14 @@ from module.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name = "ImgurComAlbum" + __name__ = "ImgurComAlbum" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index b9107ef95..82e3a818f 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): - __name = "LetitbitNet" + __name__ = "LetitbitNet" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Letitbit.net folder decrypter plugin""" diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 8fff032a0..4f3cceebb 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -12,12 +12,13 @@ from module.utils import html_unescape class LinkCryptWs(Crypter): - __name = "LinkCryptWs" + __name__ = "LinkCryptWs" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """LinkCrypt.ws decrypter plugin""" __license__ = "GPLv3" @@ -37,7 +38,7 @@ class LinkCryptWs(Crypter): def prepare(self): #: Init - self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID') + self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 1cce479ac..e4701a62a 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class LinkSaveIn(SimpleCrypter): - __name = "LinkSaveIn" + __name__ = "LinkSaveIn" __type__ = "crypter" __version__ = "2.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """LinkSave.in decrypter plugin""" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 589f21bd2..999adcc79 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiCrypter import MultiCrypter class LinkdecrypterCom(MultiCrypter): - __name = "LinkdecrypterCom" + __name__ = "LinkdecrypterCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Linkdecrypter.com decrypter plugin""" diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 49ca7e020..853240b44 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -7,13 +7,14 @@ from module.plugins.internal.Crypter import Crypter class LixIn(Crypter): - __name = "LixIn" + __name__ = "LixIn" __type__ = "crypter" __version__ = "0.24" __status__ = "testing" __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Lix.in decrypter plugin""" @@ -29,7 +30,7 @@ class LixIn(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern, url) + m = re.match(self.__pattern__, url) if m is None: self.error(_("Unable to identify file ID")) diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index 93ed91450..b25c9485a 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class LofCc(DeadCrypter): - __name = "LofCc" + __name__ = "LofCc" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py index 03e6377d6..98c63b9d4 100644 --- a/module/plugins/crypter/MBLinkInfo.py +++ b/module/plugins/crypter/MBLinkInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MBLinkInfo(DeadCrypter): - __name = "MBLinkInfo" + __name__ = "MBLinkInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index c541a0505..4ef330a3f 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class MediafireComFolder(Crypter): - __name = "MediafireCom" + __name__ = "MediafireCom" __type__ = "crypter" __version__ = "0.16" __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Mediafire.com folder decrypter plugin""" diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index aefdd8532..abdecff30 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.Crypter import Crypter class MegaCoNzFolder(Crypter): - __name = "MegaCoNz" + __name__ = "MegaCoNz" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Mega.co.nz folder decrypter plugin""" @@ -25,6 +26,6 @@ class MegaCoNzFolder(Crypter): def decrypt(self, pyfile): - url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern, pyfile.url).groups() + url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.html) diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py index 11f9622c8..d7e79db34 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MegaRapidCzFolder(SimpleCrypter): - __name = "MegaRapidCz" + __name__ = "MegaRapidCz" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index 2d21ff55b..f1ac8ddf7 100644 --- a/module/plugins/crypter/MegauploadComFolder.py +++ b/module/plugins/crypter/MegauploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MegauploadComFolder(DeadCrypter): - __name = "MegauploadCom" + __name__ = "MegauploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index 6c582ed9a..53636cda3 100644 --- a/module/plugins/crypter/Movie2KTo.py +++ b/module/plugins/crypter/Movie2KTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class Movie2KTo(DeadCrypter): - __name = "Movie2KTo" + __name__ = "Movie2KTo" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index 183b4b472..8c512da28 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MultiUpOrg(SimpleCrypter): - __name = "MultiUpOrg" + __name__ = "MultiUpOrg" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|mirror)/\w+(/\w+)?' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -26,7 +27,7 @@ class MultiUpOrg(SimpleCrypter): def get_links(self): - m_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') + m_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') if m_type == "project": pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 10cc5a3d7..034fdec0c 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): - __name = "MultiloadCz" + __name__ = "MultiloadCz" __type__ = "crypter" __version__ = "0.42" __status__ = "testing" __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True), ("usedHoster" , "str" , "Prefered hoster list (bar-separated)", "" ), ("ignoredHoster" , "str" , "Ignored hoster list (bar-separated)" , "" )] @@ -28,7 +29,7 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): self.html = self.load(pyfile.url) - if re.match(self.__pattern, pyfile.url).group(1) == "slozka": + if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": m = re.search(self.FOLDER_PATTERN, self.html) if m is not None: self.urls.extend(m.group(1).split()) diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 325ffc153..358758b7a 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class MultiuploadCom(DeadCrypter): - __name = "MultiuploadCom" + __name__ = "MultiuploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 756adc379..fe26aec52 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -10,13 +10,14 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class NCryptIn(Crypter): - __name = "NCryptIn" + __name__ = "NCryptIn" __type__ = "crypter" __version__ = "1.37" __status__ = "testing" __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """NCrypt.in decrypter plugin""" @@ -80,7 +81,7 @@ class NCryptIn(Crypter): def is_single_link(self): - link_type = re.match(self.__pattern, self.pyfile.url).group('TYPE') + link_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') return link_type in ("link", "frame") diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py index 49cf3716a..5b992bf58 100644 --- a/module/plugins/crypter/NetfolderIn.py +++ b/module/plugins/crypter/NetfolderIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class NetfolderIn(DeadCrypter): - __name = "NetfolderIn" + __name__ = "NetfolderIn" __type__ = "crypter" __version__ = "0.74" __status__ = "testing" diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py index 431ed0104..d6bdd6b98 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NitroflareComFolder(SimpleCrypter): - __name = "NitroflareCom" + __name__ = "NitroflareCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/folder/(?P<USER>\d+)/(?P<ID>[\w=]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Nitroflare.com folder decrypter plugin""" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index a48672a45..d186dd635 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NosvideoCom(SimpleCrypter): - __name = "NosvideoCom" + __name__ = "NosvideoCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index ca6a92508..054a8c902 100644 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class OronComFolder(DeadCrypter): - __name = "OronCom" + __name__ = "OronCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index eeb605dd7..ed52a49cc 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class PastebinCom(SimpleCrypter): - __name = "PastebinCom" + __name__ = "PastebinCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https://(?:www\.)?pastebin\.com/(.+i=)?(?P<ID>\w{8})' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -19,7 +20,7 @@ class PastebinCom(SimpleCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - URL_REPLACEMENTS = [(__pattern + '.*', r'http://www.pastebin.com/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + '.*', r'http://www.pastebin.com/\g<ID>')] NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)"' LINK_PATTERN = r'<div class="de\d+">(.+?)<' diff --git a/module/plugins/crypter/PastedCo.py b/module/plugins/crypter/PastedCo.py index 781b60166..c57d4e6c5 100644 --- a/module/plugins/crypter/PastedCo.py +++ b/module/plugins/crypter/PastedCo.py @@ -6,12 +6,13 @@ import re class PastedCo(Crypter): - __name = "PastedCo" + __name__ = "PastedCo" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://pasted\.co/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Pasted.co decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 575e18427..cb51392f2 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): - __name = "QuickshareCz" + __name__ = "QuickshareCz" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Quickshare.cz folder decrypter plugin""" diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 34d8e19b6..c8637279b 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class RSLayerCom(DeadCrypter): - __name = "RSLayerCom" + __name__ = "RSLayerCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 3e40b554d..ea0ce6072 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -12,13 +12,14 @@ from module.utils import save_join as fs_join class RelinkUs(Crypter): - __name = "RelinkUs" + __name__ = "RelinkUs" __type__ = "crypter" __version__ = "3.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Relink.us decrypter plugin""" @@ -100,7 +101,7 @@ class RelinkUs(Crypter): def init_package(self, pyfile): - self.fileid = re.match(self.__pattern, pyfile.url).group('ID') + self.fileid = re.match(self.__pattern__, pyfile.url).group('ID') self.package = pyfile.package() diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index c90a67773..734f62e6d 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -10,13 +10,14 @@ from module.plugins.captcha.SolveMedia import SolveMedia class SafelinkingNet(Crypter): - __name = "SafelinkingNet" + __name__ = "SafelinkingNet" __type__ = "crypter" __version__ = "0.17" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Safelinking.net decrypter plugin""" @@ -30,7 +31,7 @@ class SafelinkingNet(Crypter): def decrypt(self, pyfile): url = pyfile.url - if re.match(self.__pattern, url).group(1) == "d": + if re.match(self.__pattern__, url).group(1) == "d": header = self.load(url, just_header=True) if 'location' in header: diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 7247d3169..4731e41f4 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SecuredIn(DeadCrypter): - __name = "SecuredIn" + __name__ = "SecuredIn" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 6e224e694..42a322dd3 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -4,13 +4,14 @@ import re from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): - __name = "SexuriaCom" + __name__ = "SexuriaCom" __type__ = "crypter" __version__ = "0.10" __status__ = "testing" __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """Sexuria.com decrypter plugin""" diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 77331e065..99c2f0db1 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -7,12 +7,13 @@ import re class ShSt(Crypter): - __name = "ShSt" + __name__ = "ShSt" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://sh\.st/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Sh.St decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 448ad3b15..124a3a5b4 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -8,13 +8,14 @@ from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): - __name = "ShareLinksBiz" + __name__ = "ShareLinksBiz" __type__ = "crypter" __version__ = "1.18" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Share-Links.biz decrypter plugin""" @@ -70,12 +71,12 @@ class ShareLinksBiz(Crypter): if 's2l.biz' in url: url = self.load(url, just_header=True)['location'] - if re.match(self.__pattern, url): - self.base_url = "http://www.%s.biz" % re.match(self.__pattern, url).group(1) - self.file_id = re.match(self.__pattern, url).group('ID') + if re.match(self.__pattern__, url): + self.base_url = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1) + self.file_id = re.match(self.__pattern__, url).group('ID') else: - self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern)) + self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern__)) self.fail(_("Unsupported download link")) self.package = pyfile.package() diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py index b8519bad5..d7c467933 100644 --- a/module/plugins/crypter/SharingmatrixComFolder.py +++ b/module/plugins/crypter/SharingmatrixComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SharingmatrixComFolder(DeadCrypter): - __name = "SharingmatrixCom" + __name__ = "SharingmatrixCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index ff1cb0c73..fcf2cea05 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class SpeedLoadOrgFolder(DeadCrypter): - __name = "SpeedLoadOrg" + __name__ = "SpeedLoadOrg" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 79e41a66b..3a175cd87 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class StealthTo(DeadCrypter): - __name = "StealthTo" + __name__ = "StealthTo" __type__ = "crypter" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/crypter/TNTVillageScambioeticoOrg.py b/module/plugins/crypter/TNTVillageScambioeticoOrg.py index 6df634cf8..567e7f752 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TNTVillageScambioeticoOrg(SimpleCrypter): - __name = "TNTVillageScambioeticoOrg" + __name__ = "TNTVillageScambioeticoOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?forum\.tntvillage\.scambioetico\.org/index\.php\?.*showtopic=\d+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """TNTVillage.scambioetico.org decrypter plugin""" diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index d4d86ff3d..b630cd86e 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TinyurlCom(SimpleCrypter): - __name = "TinyurlCom" + __name__ = "TinyurlCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(preview\.)?tinyurl\.com/[\w\-]+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Tinyurl.com decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index 8ab613fef..07cfeb728 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TnyCz(SimpleCrypter): - __name = "TnyCz" + __name__ = "TnyCz" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 9ecd958e1..03ab004a3 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class TrailerzoneInfo(DeadCrypter): - __name = "TrailerzoneInfo" + __name__ = "TrailerzoneInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index cd1a57691..ac18a7399 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class TurbobitNetFolder(SimpleCrypter): - __name = "TurbobitNet" + __name__ = "TurbobitNet" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index f351707e5..640b4bdfb 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -8,13 +8,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class TusfilesNetFolder(XFSCrypter): - __name = "TusfilesNet" + __name__ = "TusfilesNet" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Tusfiles.net folder decrypter plugin""" @@ -25,7 +26,7 @@ class TusfilesNetFolder(XFSCrypter): PAGES_PATTERN = r'>\((\d+) \w+\)<' - URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] def load_page(self, page_n): diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index c2b8e106a..b78838cea 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -5,13 +5,14 @@ from module.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): - __name = "UlozTo" + __name__ = "UlozTo" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Uloz.to folder decrypter plugin""" diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index e1d29cbdf..0809b0f37 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadableChFolder(SimpleCrypter): - __name = "UploadableCh" + __name__ = "UploadableCh" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index f1e217e92..0d4e621b2 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadedToFolder(SimpleCrypter): - __name = "UploadedTo" + __name__ = "UploadedTo" __type__ = "crypter" __version__ = "0.44" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """UploadedTo decrypter plugin""" diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 90b7c5c6b..7679836d2 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WiiReloadedOrg(DeadCrypter): - __name = "WiiReloadedOrg" + __name__ = "WiiReloadedOrg" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py index ffe08b30d..2cf6f81fd 100644 --- a/module/plugins/crypter/WuploadComFolder.py +++ b/module/plugins/crypter/WuploadComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo class WuploadComFolder(DeadCrypter): - __name = "WuploadCom" + __name__ = "WuploadCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index aa65ccd12..50b462e93 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -6,13 +6,14 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class XFileSharingProFolder(XFSCrypter): - __name = "XFileSharingPro" + __name__ = "XFileSharingPro" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """XFileSharingPro dummy folder decrypter plugin for hook""" @@ -30,14 +31,14 @@ class XFileSharingProFolder(XFSCrypter): def init(self): super(XFileSharingProFolder, self).init() - self.__pattern = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] + self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.classname]['pattern'] - self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.') def _setup(self): - account_name = self.__name__ if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME + account_name = self.classname if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME self.chunk_limit = 1 self.multiDL = True @@ -59,7 +60,7 @@ class XFileSharingProFolder(XFSCrypter): self.account = self.pyload.accountManager.getAccountPlugin(self.PLUGIN_NAME) if not self.account: - self.account = self.pyload.accountManager.getAccountPlugin(self.__name__) + self.account = self.pyload.accountManager.getAccountPlugin(self.classname) if self.account: if not self.account.PLUGIN_DOMAIN: diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 230988318..41abc861e 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -4,13 +4,14 @@ from module.plugins.internal.Crypter import Crypter class XupPl(Crypter): - __name = "XupPl" + __name__ = "XupPl" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description__ = """Xup.pl decrypter plugin""" diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index a8d79d863..3c794e956 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -9,13 +9,14 @@ from module.utils import save_join as fs_join class YoutubeComFolder(Crypter): - __name = "YoutubeCom" + __name__ = "YoutubeCom" __type__ = "crypter" __version__ = "1.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_subfolder" , "bool", "Save package to subfolder" , True ), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ), ("likes" , "bool", "Grab user (channel) liked videos" , False), ("favorites" , "bool", "Grab user (channel) favorite videos", False), @@ -95,7 +96,7 @@ class YoutubeComFolder(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) m_id = m.group('ID') m_type = m.group('TYPE') diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py index 59c212b36..60e9297e1 100644 --- a/module/plugins/hooks/AndroidPhoneNotify.py +++ b/module/plugins/hooks/AndroidPhoneNotify.py @@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon, Expose class AndroidPhoneNotify(Addon): - __name = "AndroidPhoneNotify" + __name__ = "AndroidPhoneNotify" __type__ = "hook" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hooks/AntiStandby.py b/module/plugins/hooks/AntiStandby.py index 4ae0c2ea6..aa7a028a5 100644 --- a/module/plugins/hooks/AntiStandby.py +++ b/module/plugins/hooks/AntiStandby.py @@ -25,7 +25,7 @@ class Kernel32(object): class AntiStandby(Addon): - __name = "AntiStandby" + __name__ = "AntiStandby" __type__ = "hook" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py index fcdca4e43..c68e86c77 100644 --- a/module/plugins/hooks/AntiVirus.py +++ b/module/plugins/hooks/AntiVirus.py @@ -15,7 +15,7 @@ from module.utils import fs_encode, save_join as fs_join class AntiVirus(Addon): - __name = "AntiVirus" + __name__ = "AntiVirus" __type__ = "hook" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py index 2e1831860..df8562431 100644 --- a/module/plugins/hooks/BypassCaptcha.py +++ b/module/plugins/hooks/BypassCaptcha.py @@ -26,7 +26,7 @@ class BypassCaptchaException(Exception): class BypassCaptcha(Addon): - __name = "BypassCaptcha" + __name__ = "BypassCaptcha" __type__ = "hook" __version__ = "0.08" __status__ = "testing" @@ -106,7 +106,7 @@ class BypassCaptcha(Addon): if self.get_credits() > 0: task.handler.append(self) - task.data['service'] = self.__name__ + task.data['service'] = self.classname task.setWaiting(100) self._process_captcha(task) @@ -115,12 +115,12 @@ class BypassCaptcha(Addon): def captcha_correct(self, task): - if task.data['service'] is self.__name__ and "ticket" in task.data: + if task.data['service'] is self.classname and "ticket" in task.data: self.respond(task.data['ticket'], True) def captcha_invalid(self, task): - if task.data['service'] is self.__name__ and "ticket" in task.data: + if task.data['service'] is self.classname and "ticket" in task.data: self.respond(task.data['ticket'], False) diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py index 16a76a792..b2883534d 100644 --- a/module/plugins/hooks/Captcha9Kw.py +++ b/module/plugins/hooks/Captcha9Kw.py @@ -12,7 +12,7 @@ from module.plugins.internal.Addon import Addon, threaded class Captcha9Kw(Addon): - __name = "Captcha9Kw" + __name__ = "Captcha9Kw" __type__ = "hook" __version__ = "0.30" __status__ = "testing" diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py index 642bd23e6..24254ffbb 100644 --- a/module/plugins/hooks/CaptchaBrotherhood.py +++ b/module/plugins/hooks/CaptchaBrotherhood.py @@ -36,7 +36,7 @@ class CaptchaBrotherhoodException(Exception): class CaptchaBrotherhood(Addon): - __name = "CaptchaBrotherhood" + __name__ = "CaptchaBrotherhood" __type__ = "hook" __version__ = "0.10" __status__ = "testing" @@ -146,7 +146,7 @@ class CaptchaBrotherhood(Addon): if self.get_credits() > 10: task.handler.append(self) - task.data['service'] = self.__name__ + task.data['service'] = self.classname task.setWaiting(100) self._process_captcha(task) else: @@ -154,7 +154,7 @@ class CaptchaBrotherhood(Addon): def captcha_invalid(self, task): - if task.data['service'] is self.__name__ and "ticket" in task.data: + if task.data['service'] is self.classname and "ticket" in task.data: res = self.api_response("complainCaptcha", task.data['ticket']) diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py index 4b351f76f..4d0493212 100644 --- a/module/plugins/hooks/Checksum.py +++ b/module/plugins/hooks/Checksum.py @@ -36,7 +36,7 @@ def compute_checksum(local_file, algorithm): class Checksum(Addon): - __name = "Checksum" + __name__ = "Checksum" __type__ = "hook" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hooks/ClickNLoad.py b/module/plugins/hooks/ClickNLoad.py index 8f2c1f36c..fa99ac12c 100644 --- a/module/plugins/hooks/ClickNLoad.py +++ b/module/plugins/hooks/ClickNLoad.py @@ -27,7 +27,7 @@ def forward(source, destination): #@TODO: IPv6 support class ClickNLoad(Addon): - __name = "ClickNLoad" + __name__ = "ClickNLoad" __type__ = "hook" __version__ = "0.48" __status__ = "testing" diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py index c1f33be6d..00d6453a4 100644 --- a/module/plugins/hooks/DeathByCaptcha.py +++ b/module/plugins/hooks/DeathByCaptcha.py @@ -49,7 +49,7 @@ class DeathByCaptchaException(Exception): class DeathByCaptcha(Addon): - __name = "DeathByCaptcha" + __name__ = "DeathByCaptcha" __type__ = "hook" __version__ = "0.08" __status__ = "testing" @@ -187,13 +187,13 @@ class DeathByCaptcha(Addon): if balance > rate: task.handler.append(self) - task.data['service'] = self.__name__ + task.data['service'] = self.classname task.setWaiting(180) self._process_captcha(task) def captcha_invalid(self, task): - if task.data['service'] is self.__name__ and "ticket" in task.data: + if task.data['service'] is self.classname and "ticket" in task.data: try: res = self.api_response("captcha/%d/report" % task.data['ticket'], True) diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 489591d1a..e72439c0a 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -5,7 +5,7 @@ from module.plugins.internal.Addon import Addon class DeleteFinished(Addon): - __name = "DeleteFinished" + __name__ = "DeleteFinished" __type__ = "hook" __version__ = "1.16" __status__ = "testing" diff --git a/module/plugins/hooks/DownloadScheduler.py b/module/plugins/hooks/DownloadScheduler.py index f93410bc3..8454438a1 100644 --- a/module/plugins/hooks/DownloadScheduler.py +++ b/module/plugins/hooks/DownloadScheduler.py @@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon class DownloadScheduler(Addon): - __name = "DownloadScheduler" + __name__ = "DownloadScheduler" __type__ = "hook" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py index 993a66067..e94a966f2 100644 --- a/module/plugins/hooks/ExpertDecoders.py +++ b/module/plugins/hooks/ExpertDecoders.py @@ -13,7 +13,7 @@ from module.plugins.internal.Addon import Addon, threaded class ExpertDecoders(Addon): - __name = "ExpertDecoders" + __name__ = "ExpertDecoders" __type__ = "hook" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index 694da4262..3459eb3aa 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -9,7 +9,7 @@ from module.utils import fs_encode, save_join as fs_join class ExternalScripts(Addon): - __name = "ExternalScripts" + __name__ = "ExternalScripts" __type__ = "hook" __version__ = "0.49" __status__ = "testing" diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index 48ac029e5..034a4b81a 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -97,7 +97,7 @@ class ArchiveQueue(object): class ExtractArchive(Addon): - __name = "ExtractArchive" + __name__ = "ExtractArchive" __type__ = "hook" __version__ = "1.52" __status__ = "testing" @@ -162,7 +162,7 @@ class ExtractArchive(Addon): self.log_warning(_("Could not activate: %s") % p, e) if self.extractors: - self.log_debug(*["Found %s %s" % (Extractor.__name, Extractor.VERSION) for Extractor in self.extractors]) + self.log_debug(*["Found %s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors]) self.extract_queued() #: Resume unfinished extractions else: self.log_info(_("No Extract plugins activated")) @@ -293,7 +293,7 @@ class ExtractArchive(Addon): for Extractor in self.extractors: targets = Extractor.get_targets(files_ids) if targets: - self.log_debug("Targets for %s: %s" % (Extractor.__name, targets)) + self.log_debug("Targets for %s: %s" % (Extractor.__name__, targets)) matched = True for fname, fid, fout in targets: diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py index 8863af871..c7631a1fc 100644 --- a/module/plugins/hooks/HotFolder.py +++ b/module/plugins/hooks/HotFolder.py @@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join as fs_join class HotFolder(Addon): - __name = "HotFolder" + __name__ = "HotFolder" __type__ = "hook" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py index 9760d5afa..16640df0b 100644 --- a/module/plugins/hooks/IRCInterface.py +++ b/module/plugins/hooks/IRCInterface.py @@ -16,7 +16,7 @@ from module.utils import formatSize class IRCInterface(Thread, Addon): - __name = "IRCInterface" + __name__ = "IRCInterface" __type__ = "hook" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py index 5fec52eb7..86b1dae2b 100644 --- a/module/plugins/hooks/ImageTyperz.py +++ b/module/plugins/hooks/ImageTyperz.py @@ -30,7 +30,7 @@ class ImageTyperzException(Exception): class ImageTyperz(Addon): - __name = "ImageTyperz" + __name__ = "ImageTyperz" __type__ = "hook" __version__ = "0.08" __status__ = "testing" @@ -122,7 +122,7 @@ class ImageTyperz(Addon): if self.get_credits() > 0: task.handler.append(self) - task.data['service'] = self.__name__ + task.data['service'] = self.classname task.setWaiting(100) self._process_captcha(task) @@ -131,7 +131,7 @@ class ImageTyperz(Addon): def captcha_invalid(self, task): - if task.data['service'] is self.__name__ and "ticket" in task.data: + if task.data['service'] is self.classname and "ticket" in task.data: res = self.load(self.RESPOND_URL, post={'action': "SETBADIMAGE", 'username': self.get_config('username'), diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py index f33bcd015..f4c48cfa9 100644 --- a/module/plugins/hooks/JustPremium.py +++ b/module/plugins/hooks/JustPremium.py @@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon class JustPremium(Addon): - __name = "JustPremium" + __name__ = "JustPremium" __type__ = "hook" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py index 077f132d4..1ef5bb72a 100644 --- a/module/plugins/hooks/LinkdecrypterComHook.py +++ b/module/plugins/hooks/LinkdecrypterComHook.py @@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon class LinkdecrypterComHook(Addon): - __name = "LinkdecrypterCom" + __name__ = "LinkdecrypterCom" __type__ = "hook" __version__ = "1.08" __status__ = "testing" diff --git a/module/plugins/hooks/LogMarker.py b/module/plugins/hooks/LogMarker.py index b4269164a..0efab602f 100644 --- a/module/plugins/hooks/LogMarker.py +++ b/module/plugins/hooks/LogMarker.py @@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import seconds_to_nexthour class LogMarker(Addon): - __name = "LogMarker" + __name__ = "LogMarker" __type__ = "hook" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index f25380c18..a7d6fc7ba 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -10,7 +10,7 @@ from module.utils import save_join as fs_join class MergeFiles(Addon): - __name = "MergeFiles" + __name__ = "MergeFiles" __type__ = "hook" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 3ca3bf74d..90e8a60d2 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -42,7 +42,7 @@ class Interface(object): class MultiHome(Addon): - __name = "MultiHome" + __name__ = "MultiHome" __type__ = "hook" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py index f85ad51fd..74d570425 100644 --- a/module/plugins/hooks/RestartFailed.py +++ b/module/plugins/hooks/RestartFailed.py @@ -4,7 +4,7 @@ from module.plugins.internal.Addon import Addon class RestartFailed(Addon): - __name = "RestartFailed" + __name__ = "RestartFailed" __type__ = "hook" __version__ = "1.62" __status__ = "testing" diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index fcf6a4a9d..891d2db6d 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -10,7 +10,7 @@ from module.plugins.internal.Addon import Addon class SkipRev(Addon): - __name = "SkipRev" + __name__ = "SkipRev" __type__ = "hook" __version__ = "0.34" __status__ = "testing" diff --git a/module/plugins/hooks/TransmissionRPC.py b/module/plugins/hooks/TransmissionRPC.py index 7a1ad1659..9df19e320 100644 --- a/module/plugins/hooks/TransmissionRPC.py +++ b/module/plugins/hooks/TransmissionRPC.py @@ -12,7 +12,7 @@ from module.plugins.internal.Addon import Addon class TransmissionRPC(Addon): - __name = "TransmissionRPC" + __name__ = "TransmissionRPC" __type__ = "hook" __version__ = "0.12" __status__ = "testing" @@ -31,7 +31,7 @@ class TransmissionRPC(Addon): def links_added(self, links, pid): - pattern = re.compile(self.__pattern) + pattern = re.compile(self.__pattern__) urls = [link for link in links if pattern.match(link)] for url in urls: @@ -42,7 +42,7 @@ class TransmissionRPC(Addon): def send_to_transmission(self, url): transmission_rpc_url = self.get_config('rpc_url') - client_request_id = self.__name__ + "".join(random.choice('0123456789ABCDEF') for _i in xrange(4)) + client_request_id = self.classname + "".join(random.choice('0123456789ABCDEF') for _i in xrange(4)) req = get_request() try: diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py index a0a2681aa..d467b8a01 100644 --- a/module/plugins/hooks/UnSkipOnFail.py +++ b/module/plugins/hooks/UnSkipOnFail.py @@ -5,7 +5,7 @@ from module.plugins.internal.Addon import Addon class UnSkipOnFail(Addon): - __name = "UnSkipOnFail" + __name__ = "UnSkipOnFail" __type__ = "hook" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 34b992d5b..caebdaa9b 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -256,7 +256,7 @@ class UpdateManager(Addon): if blacklist: #@NOTE: Protect UpdateManager from self-removing type_plugins = [(plugin['type'], plugin['name']) for plugin in blacklist \ - if plugin['name'] is not self.__name__ and plugin['type'] is not self.__type__] + if plugin['name'] is not self.classname and plugin['type'] is not self.__type__] c = 1 l = len(type_plugins) diff --git a/module/plugins/hooks/UserAgentSwitcher.py b/module/plugins/hooks/UserAgentSwitcher.py index 4e714bf60..52f542268 100644 --- a/module/plugins/hooks/UserAgentSwitcher.py +++ b/module/plugins/hooks/UserAgentSwitcher.py @@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import encode class UserAgentSwitcher(Addon): - __name = "UserAgentSwitcher" + __name__ = "UserAgentSwitcher" __type__ = "hook" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hooks/WindowsPhoneNotify.py b/module/plugins/hooks/WindowsPhoneNotify.py index 62a8619c2..4343d16f2 100644 --- a/module/plugins/hooks/WindowsPhoneNotify.py +++ b/module/plugins/hooks/WindowsPhoneNotify.py @@ -7,7 +7,7 @@ from module.plugins.internal.Addon import Addon, Expose class WindowsPhoneNotify(Addon): - __name = "WindowsPhoneNotify" + __name__ = "WindowsPhoneNotify" __type__ = "hook" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index ccb8980ed..92933fb11 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -6,7 +6,7 @@ from module.plugins.internal.Addon import Addon class XFileSharingPro(Addon): - __name = "XFileSharingPro" + __name__ = "XFileSharingPro" __type__ = "hook" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py index 0103fdcd6..811e2f5f4 100644 --- a/module/plugins/hooks/XMPPInterface.py +++ b/module/plugins/hooks/XMPPInterface.py @@ -10,7 +10,7 @@ from module.plugins.hooks.IRCInterface import IRCInterface class XMPPInterface(IRCInterface, JabberClient): - __name = "XMPPInterface" + __name__ = "XMPPInterface" __type__ = "hook" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 557a50b60..c6c4365c7 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -5,17 +5,18 @@ import urllib from module.common.json_layer import json_loads from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo -from module.utils import parseFileSize as parse_size +from module.plugins.internal.Plugin import parse_size class AlldebridCom(MultiHoster): - __name = "AlldebridCom" + __name__ = "AlldebridCom" __type__ = "hoster" __version__ = "0.48" __status__ = "testing" __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Alldebrid.com multi-hoster plugin""" diff --git a/module/plugins/hoster/AndroidfilehostCom.py b/module/plugins/hoster/AndroidfilehostCom.py index 5de7b49bf..910e09533 100644 --- a/module/plugins/hoster/AndroidfilehostCom.py +++ b/module/plugins/hoster/AndroidfilehostCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class AndroidfilehostCom(SimpleHoster): - __name = "AndroidfilehostCom" + __name__ = "AndroidfilehostCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Androidfilehost.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index d7fa48e08..be53a33c2 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -10,12 +10,13 @@ from module.plugins.internal.Hoster import Hoster class BasePlugin(Hoster): - __name = "BasePlugin" + __name__ = "BasePlugin" __type__ = "hoster" __version__ = "0.46" __status__ = "testing" __pattern__ = r'^unmatchable$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Base Plugin when any other didnt fit""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BasketbuildCom.py b/module/plugins/hoster/BasketbuildCom.py index 76ea0bffa..95d665715 100644 --- a/module/plugins/hoster/BasketbuildCom.py +++ b/module/plugins/hoster/BasketbuildCom.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BasketbuildCom(SimpleHoster): - __name = "BasketbuildCom" + __name__ = "BasketbuildCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 8b88ad6a0..6e9397d4f 100644 --- a/module/plugins/hoster/BayfilesCom.py +++ b/module/plugins/hoster/BayfilesCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class BayfilesCom(DeadHoster): - __name = "BayfilesCom" + __name__ = "BayfilesCom" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index c01dba7bd..f557d3b39 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BezvadataCz(SimpleHoster): - __name = "BezvadataCz" + __name__ = "BezvadataCz" __type__ = "hoster" __version__ = "0.30" __status__ = "testing" __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """BezvaData.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py index 1342619d0..a142f4ab3 100644 --- a/module/plugins/hoster/BillionuploadsCom.py +++ b/module/plugins/hoster/BillionuploadsCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class BillionuploadsCom(DeadHoster): - __name = "BillionuploadsCom" + __name__ = "BillionuploadsCom" __type__ = "hoster" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 118a0a833..94e16c617 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BitshareCom(SimpleHoster): - __name = "BitshareCom" + __name__ = "BitshareCom" __type__ = "hoster" __version__ = "0.56" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Bitshare.com hoster plugin""" __license__ = "GPLv3" @@ -42,7 +43,7 @@ class BitshareCom(SimpleHoster): self.account.relogin() #: File id - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) self.file_id = max(m.group('ID1'), m.group('ID2')) self.log_debug("File id is [%s]" % self.file_id) @@ -60,7 +61,7 @@ class BitshareCom(SimpleHoster): self.retry() #: File name - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) name1 = m.group('NAME') if m else None m = re.search(self.INFO_PATTERN, self.html) diff --git a/module/plugins/hoster/BoltsharingCom.py b/module/plugins/hoster/BoltsharingCom.py index e7d6d3581..c33049e01 100644 --- a/module/plugins/hoster/BoltsharingCom.py +++ b/module/plugins/hoster/BoltsharingCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class BoltsharingCom(DeadHoster): - __name = "BoltsharingCom" + __name__ = "BoltsharingCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index bf748f54c..8a9a42669 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -7,13 +7,14 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class CatShareNet(SimpleHoster): - __name = "CatShareNet" + __name__ = "CatShareNet" __type__ = "hoster" __version__ = "0.17" __status__ = "testing" __pattern__ = r'http://(?:www\.)?catshare\.net/\w{15,16}' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """CatShare.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index 8983b4ab4..fa0bccba3 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class CloudzerNet(DeadHoster): - __name = "CloudzerNet" + __name__ = "CloudzerNet" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/CloudzillaTo.py b/module/plugins/hoster/CloudzillaTo.py index 4bd4a495d..5c6c5158e 100644 --- a/module/plugins/hoster/CloudzillaTo.py +++ b/module/plugins/hoster/CloudzillaTo.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CloudzillaTo(SimpleHoster): - __name = "CloudzillaTo" + __name__ = "CloudzillaTo" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Cloudzilla.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index e23bc5836..9dcb94ca8 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class CramitIn(XFSHoster): - __name = "CramitIn" + __name__ = "CramitIn" __type__ = "hoster" __version__ = "0.08" __status__ = "testing" __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Cramit.in hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index 1a84ba920..1ec9bd85b 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CrockoCom(SimpleHoster): - __name = "CrockoCom" + __name__ = "CrockoCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Crocko hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py index 56916e261..8cb9f7851 100644 --- a/module/plugins/hoster/CyberlockerCh.py +++ b/module/plugins/hoster/CyberlockerCh.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class CyberlockerCh(DeadHoster): - __name = "CyberlockerCh" + __name__ = "CyberlockerCh" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 252ce18fe..ea56caef4 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -5,18 +5,19 @@ import re +from module.plugins.internal.Plugin import parse_size from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.utils import parseFileSize as parse_size class CzshareCom(SimpleHoster): - __name = "CzshareCom" + __name__ = "CzshareCom" __type__ = "hoster" __version__ = "1.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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/DailymotionCom.py b/module/plugins/hoster/DailymotionCom.py index 051b09fc3..1634bb12d 100644 --- a/module/plugins/hoster/DailymotionCom.py +++ b/module/plugins/hoster/DailymotionCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Hoster import Hoster def get_info(urls): result = [] - regex = re.compile(DailymotionCom.__pattern) + regex = re.compile(DailymotionCom.__pattern__) apiurl = "https://api.dailymotion.com/video/%s" request = {'fields': "access_error,status,title"} @@ -42,13 +42,14 @@ def get_info(urls): class DailymotionCom(Hoster): - __name = "DailymotionCom" + __name__ = "DailymotionCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)' - __config__ = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] + __config__ = [("activated", "bool", "Activated", True), + ("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] __description__ = """Dailymotion.com hoster plugin""" __license__ = "GPLv3" @@ -121,7 +122,7 @@ class DailymotionCom(Hoster): def process(self, pyfile): self.check_info(pyfile) - id = re.match(self.__pattern, pyfile.url).group('ID') + id = re.match(self.__pattern__, pyfile.url).group('ID') self.html = self.load("http://www.dailymotion.com/embed/video/" + id) streams = self.get_streams() diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py index 41b5a008f..295e60873 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataHu(SimpleHoster): - __name = "DataHu" + __name__ = "DataHu" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Data.hu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 611d27fef..d5ab0787f 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataportCz(SimpleHoster): - __name = "DataportCz" + __name__ = "DataportCz" __type__ = "hoster" __version__ = "0.43" __status__ = "testing" __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 417a17c81..23aeff47b 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DateiTo(SimpleHoster): - __name = "DateiTo" + __name__ = "DateiTo" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 d4d0dd41e..5a826452b 100644 --- a/module/plugins/hoster/DdlstorageCom.py +++ b/module/plugins/hoster/DdlstorageCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class DdlstorageCom(DeadHoster): - __name = "DdlstorageCom" + __name__ = "DdlstorageCom" __type__ = "hoster" __version__ = "1.03" __status__ = "testing" diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 69ccd274e..e18d86323 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): - __name = "DebridItaliaCom" + __name__ = "DebridItaliaCom" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Debriditalia.com multi-hoster plugin""" diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index d1aa63f9d..352a38dd2 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DepositfilesCom(SimpleHoster): - __name = "DepositfilesCom" + __name__ = "DepositfilesCom" __type__ = "hoster" __version__ = "0.58" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Depositfiles.com hoster plugin""" __license__ = "GPLv3" @@ -29,7 +30,7 @@ class DepositfilesCom(SimpleHoster): NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))), (r'.*<b title="(?P<N>.+?)".*', "\g<N>")] - URL_REPLACEMENTS = [(__pattern + ".*", "https://dfiles.eu/files/\g<ID>")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")] COOKIES = [("dfiles.eu", "lang_current", "en")] diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py index 62911383d..27e1ea85a 100644 --- a/module/plugins/hoster/DevhostSt.py +++ b/module/plugins/hoster/DevhostSt.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DevhostSt(SimpleHoster): - __name = "DevhostSt" + __name__ = "DevhostSt" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 5f28c68b4..b6e618235 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -33,13 +33,14 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): - __name = "DlFreeFr" + __name__ = "DlFreeFr" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Dl.free.fr hoster plugin""" __license__ = "GPLv3" @@ -99,7 +100,7 @@ class DlFreeFr(SimpleHoster): headers = self.get_last_headers() if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers: m = re.search("(.*?)=(.*?); path=(.*?); domain=(.*)", headers.get("set-cookie")) - cj = CookieJar(self.__name__) + cj = CookieJar(self.classname) if m is not None: cj.setCookie(m.group(4), m.group(1), m.group(2), m.group(3)) else: diff --git a/module/plugins/hoster/DodanePl.py b/module/plugins/hoster/DodanePl.py index 00304d69b..3a2c732d8 100644 --- a/module/plugins/hoster/DodanePl.py +++ b/module/plugins/hoster/DodanePl.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class DodanePl(DeadHoster): - __name = "DodanePl" + __name__ = "DodanePl" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py index ffc858ac9..265f61c6f 100644 --- a/module/plugins/hoster/DropboxCom.py +++ b/module/plugins/hoster/DropboxCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DropboxCom(SimpleHoster): - __name = "DropboxCom" + __name__ = "DropboxCom" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Dropbox.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/DuploadOrg.py b/module/plugins/hoster/DuploadOrg.py index ac473798d..124919d91 100644 --- a/module/plugins/hoster/DuploadOrg.py +++ b/module/plugins/hoster/DuploadOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class DuploadOrg(DeadHoster): - __name = "DuploadOrg" + __name__ = "DuploadOrg" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py index 8b7d5fcc7..272832e2f 100644 --- a/module/plugins/hoster/EasybytezCom.py +++ b/module/plugins/hoster/EasybytezCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class EasybytezCom(XFSHoster): - __name = "EasybytezCom" + __name__ = "EasybytezCom" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Easybytez.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py index 0baf7ce57..3b368ade7 100644 --- a/module/plugins/hoster/EdiskCz.py +++ b/module/plugins/hoster/EdiskCz.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EdiskCz(SimpleHoster): - __name = "EdiskCz" + __name__ = "EdiskCz" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 49950f25f..d91c70fdc 100644 --- a/module/plugins/hoster/EgoFilesCom.py +++ b/module/plugins/hoster/EgoFilesCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class EgoFilesCom(DeadHoster): - __name = "EgoFilesCom" + __name__ = "EgoFilesCom" __type__ = "hoster" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/hoster/EnteruploadCom.py b/module/plugins/hoster/EnteruploadCom.py index d57bd87ee..bc7d2415a 100644 --- a/module/plugins/hoster/EnteruploadCom.py +++ b/module/plugins/hoster/EnteruploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class EnteruploadCom(DeadHoster): - __name = "EnteruploadCom" + __name__ = "EnteruploadCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/EpicShareNet.py b/module/plugins/hoster/EpicShareNet.py index d82aeaf8c..498a43395 100644 --- a/module/plugins/hoster/EpicShareNet.py +++ b/module/plugins/hoster/EpicShareNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class EpicShareNet(DeadHoster): - __name = "EpicShareNet" + __name__ = "EpicShareNet" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index f4895f347..9ba9b2107 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EuroshareEu(SimpleHoster): - __name = "EuroshareEu" + __name__ = "EuroshareEu" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Euroshare.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ExashareCom.py b/module/plugins/hoster/ExashareCom.py index b94de0b9a..010314491 100644 --- a/module/plugins/hoster/ExashareCom.py +++ b/module/plugins/hoster/ExashareCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class ExashareCom(XFSHoster): - __name = "ExashareCom" + __name__ = "ExashareCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Exashare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index a91415113..0311ada4b 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, s class ExtabitCom(SimpleHoster): - __name = "ExtabitCom" + __name__ = "ExtabitCom" __type__ = "hoster" __version__ = "0.68" __status__ = "testing" __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Extabit.com hoster plugin""" __license__ = "GPLv3" @@ -42,7 +43,7 @@ class ExtabitCom(SimpleHoster): self.wait(seconds_to_midnight(), True) self.log_debug("URL: " + self.req.http.lastEffectiveURL) - m = re.match(self.__pattern, self.req.http.lastEffectiveURL) + m = re.match(self.__pattern__, self.req.http.lastEffectiveURL) fileID = m.group('ID') if m else self.info['pattern']['ID'] m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html) diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index c0043680f..dac8e9404 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -8,13 +8,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FastixRu(MultiHoster): - __name = "FastixRu" + __name__ = "FastixRu" __type__ = "hoster" __version__ = "0.16" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Fastix multi-hoster plugin""" diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 1888fb7fa..c53e42f1e 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FastshareCz(SimpleHoster): - __name = "FastshareCz" + __name__ = "FastshareCz" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """FastShare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py index 3c95eeb94..c91024824 100644 --- a/module/plugins/hoster/FileApeCom.py +++ b/module/plugins/hoster/FileApeCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FileApeCom(DeadHoster): - __name = "FileApeCom" + __name__ = "FileApeCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py index ce3f577d6..d3d7ebd40 100644 --- a/module/plugins/hoster/FileSharkPl.py +++ b/module/plugins/hoster/FileSharkPl.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileSharkPl(SimpleHoster): - __name = "FileSharkPl" + __name__ = "FileSharkPl" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """FileShark.pl hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py index f0140b205..e7ba300cd 100644 --- a/module/plugins/hoster/FileStoreTo.py +++ b/module/plugins/hoster/FileStoreTo.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileStoreTo(SimpleHoster): - __name = "FileStoreTo" + __name__ = "FileStoreTo" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """FileStore.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilebeerInfo.py b/module/plugins/hoster/FilebeerInfo.py index 83ad34763..9db53fe19 100644 --- a/module/plugins/hoster/FilebeerInfo.py +++ b/module/plugins/hoster/FilebeerInfo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FilebeerInfo(DeadHoster): - __name = "FilebeerInfo" + __name__ = "FilebeerInfo" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 2bd0c2f04..56432130a 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -7,12 +7,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileboomMe(SimpleHoster): - __name = "FileboomMe" + __name__ = "FileboomMe" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://f(?:ile)?boom\.me/file/(?P<ID>\w+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Fileboom.me hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index ab788e57e..c83813111 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilecloudIo(SimpleHoster): - __name = "FilecloudIo" + __name__ = "FilecloudIo" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Filecloud.io hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FiledropperCom.py b/module/plugins/hoster/FiledropperCom.py index 5800b00b3..df1000681 100644 --- a/module/plugins/hoster/FiledropperCom.py +++ b/module/plugins/hoster/FiledropperCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FiledropperCom(SimpleHoster): - __name = "FiledropperCom" + __name__ = "FiledropperCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filedropper\.com/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filedropper.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index b4e8aef0e..e608d6db0 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -11,7 +11,7 @@ def get_info(urls): h = get_url(url, just_header=True) m = re.search(r'Location: (.+)\r\n', h) - if m and not re.match(m.group(1), FilefactoryCom.__pattern): #: It's a direct link! Skipping + if m and not re.match(m.group(1), FilefactoryCom.__pattern__): #: It's a direct link! Skipping yield (url, 0, 3, url) else: #: It's a standard html page @@ -19,13 +19,14 @@ def get_info(urls): class FilefactoryCom(SimpleHoster): - __name = "FilefactoryCom" + __name__ = "FilefactoryCom" __type__ = "hoster" __version__ = "0.59" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Filefactory.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py index 18479371d..642f39c55 100644 --- a/module/plugins/hoster/FilejungleCom.py +++ b/module/plugins/hoster/FilejungleCom.py @@ -5,12 +5,13 @@ from module.plugins.internal.Plugin import chunks class FilejungleCom(FileserveCom): - __name = "FilejungleCom" + __name__ = "FilejungleCom" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filejungle\.com/f/(?P<ID>[^/]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Filejungle.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index fadc11d17..678351238 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileomCom(XFSHoster): - __name = "FileomCom" + __name__ = "FileomCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Fileom.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index 6105a8c29..10af73ff9 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepostCom(SimpleHoster): - __name = "FilepostCom" + __name__ = "FilepostCom" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 0e37c280e..7e0fd9c29 100644 --- a/module/plugins/hoster/FilepupNet.py +++ b/module/plugins/hoster/FilepupNet.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepupNet(SimpleHoster): - __name = "FilepupNet" + __name__ = "FilepupNet" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Filepup.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index 994c3c53a..a44728895 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -12,13 +12,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilerNet(SimpleHoster): - __name = "FilerNet" + __name__ = "FilerNet" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Filer.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py index 345a1956d..5d58ecf22 100644 --- a/module/plugins/hoster/FilerioCom.py +++ b/module/plugins/hoster/FilerioCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FilerioCom(XFSHoster): - __name = "FilerioCom" + __name__ = "FilerioCom" __type__ = "hoster" __version__ = "0.08" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """FileRio.in hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py index 2003c7f98..eae9ec1c4 100644 --- a/module/plugins/hoster/FilesMailRu.py +++ b/module/plugins/hoster/FilesMailRu.py @@ -31,12 +31,13 @@ def get_info(urls): class FilesMailRu(Hoster): - __name = "FilesMailRu" + __name__ = "FilesMailRu" __type__ = "hoster" __version__ = "0.35" __status__ = "testing" __pattern__ = r'http://(?:www\.)?files\.mail\.ru/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Files.mail.ru hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 8e8341e54..c6abbc843 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -4,11 +4,10 @@ import re from module.common.json_layer import json_loads from module.network.RequestFactory import getURL as get_url -from module.plugins.internal.Hoster import Hoster -from module.plugins.internal.Plugin import chunks from module.plugins.captcha.ReCaptcha import ReCaptcha +from module.plugins.internal.Hoster import Hoster +from module.plugins.internal.Plugin import chunks, parse_size from module.plugins.internal.SimpleHoster import seconds_to_midnight -from module.utils import parseFileSize as parse_size def check_file(plugin, urls): @@ -32,12 +31,13 @@ def check_file(plugin, urls): class FileserveCom(Hoster): - __name = "FileserveCom" + __name__ = "FileserveCom" __type__ = "hoster" __version__ = "0.62" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Fileserve.com hoster plugin""" __license__ = "GPLv3" @@ -63,7 +63,7 @@ class FileserveCom(Hoster): def setup(self): self.resume_download = self.multiDL = self.premium - self.file_id = re.match(self.__pattern, self.pyfile.url).group('ID') + self.file_id = re.match(self.__pattern__, self.pyfile.url).group('ID') self.url = "%s%s" % (self.URLS[0], self.file_id) self.log_debug("File ID: %s URL: %s" % (self.file_id, self.url)) @@ -146,7 +146,7 @@ class FileserveCom(Hoster): if "fail" in res: self.fail(_("Failed getting wait time")) - if self.__name == "FilejungleCom": + if self.__name__ == "FilejungleCom": m = re.search(r'"waitTime":(\d+)', res) if m is None: self.fail(_("Cannot get wait time")) @@ -180,7 +180,7 @@ class FileserveCom(Hoster): def handle_premium(self): premium_url = None - if self.__name == "FileserveCom": + if self.__name__ == "FileserveCom": #: Try api download res = self.load("http://app.fileserve.com/api/download/premium/", post={'username': self.account.user, diff --git a/module/plugins/hoster/FileshareInUa.py b/module/plugins/hoster/FileshareInUa.py index 32319482a..3fb181348 100644 --- a/module/plugins/hoster/FileshareInUa.py +++ b/module/plugins/hoster/FileshareInUa.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FileshareInUa(DeadHoster): - __name = "FileshareInUa" + __name__ = "FileshareInUa" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py index 97f689e69..59c0ea246 100644 --- a/module/plugins/hoster/FilesonicCom.py +++ b/module/plugins/hoster/FilesonicCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FilesonicCom(DeadHoster): - __name = "FilesonicCom" + __name__ = "FilesonicCom" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" diff --git a/module/plugins/hoster/FileuploadNet.py b/module/plugins/hoster/FileuploadNet.py index 9d5dc3278..0f1aa6420 100644 --- a/module/plugins/hoster/FileuploadNet.py +++ b/module/plugins/hoster/FileuploadNet.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileuploadNet(SimpleHoster): - __name = "FileuploadNet" + __name__ = "FileuploadNet" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(en\.)?file-upload\.net/download-\d+/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """File-upload.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py index 38cc8a277..249548d13 100644 --- a/module/plugins/hoster/FilezyNet.py +++ b/module/plugins/hoster/FilezyNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FilezyNet(DeadHoster): - __name = "FilezyNet" + __name__ = "FilezyNet" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/FiredriveCom.py b/module/plugins/hoster/FiredriveCom.py index ffd470682..cc530a3c5 100644 --- a/module/plugins/hoster/FiredriveCom.py +++ b/module/plugins/hoster/FiredriveCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FiredriveCom(DeadHoster): - __name = "FiredriveCom" + __name__ = "FiredriveCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py index 5351b44e8..76ff8d9b4 100644 --- a/module/plugins/hoster/FlyFilesNet.py +++ b/module/plugins/hoster/FlyFilesNet.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class FlyFilesNet(SimpleHoster): - __name = "FlyFilesNet" + __name__ = "FlyFilesNet" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 b1fe01467..d2c31c837 100644 --- a/module/plugins/hoster/FourSharedCom.py +++ b/module/plugins/hoster/FourSharedCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FourSharedCom(SimpleHoster): - __name = "4shared" + __name__ = "FourSharedCom" __type__ = "hoster" - __version__ = "0.32" + __version__ = "0.33" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """4Shared.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 46b100762..bb3daf35d 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -8,12 +8,13 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class FreakshareCom(Hoster): - __name = "FreakshareCom" + __name__ = "FreakshareCom" __type__ = "hoster" __version__ = "0.44" __status__ = "testing" __pattern__ = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Freakshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 2cec4d7b1..6a3476813 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -4,13 +4,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FreeWayMe(MultiHoster): - __name = "FreeWayMe" + __name__ = "FreeWayMe" __type__ = "hoster" __version__ = "0.20" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?free-way\.(bz|me)/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """FreeWayMe multi-hoster plugin""" diff --git a/module/plugins/hoster/FreevideoCz.py b/module/plugins/hoster/FreevideoCz.py index e0f3295e1..ec8734b6a 100644 --- a/module/plugins/hoster/FreevideoCz.py +++ b/module/plugins/hoster/FreevideoCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class FreevideoCz(DeadHoster): - __name = "FreevideoCz" + __name__ = "FreevideoCz" __type__ = "hoster" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 279ead2a2..e0220fff7 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -21,13 +21,14 @@ def double_decode(m): class FshareVn(SimpleHoster): - __name = "FshareVn" + __name__ = "FshareVn" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """FshareVn hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index 4373b5d01..c30ad3c37 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -9,12 +9,13 @@ from module.plugins.internal.Hoster import Hoster class Ftp(Hoster): - __name = "Ftp" + __name__ = "Ftp" __type__ = "hoster" __version__ = "0.55" __status__ = "testing" __pattern__ = r'(?:ftps?|sftp)://([\w\-.]+(:[\w\-.]+)?@)?[\w\-.]+(:\d+)?/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Download from ftp directory""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GamefrontCom.py b/module/plugins/hoster/GamefrontCom.py index b309854aa..ef50003fd 100644 --- a/module/plugins/hoster/GamefrontCom.py +++ b/module/plugins/hoster/GamefrontCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GamefrontCom(SimpleHoster): - __name = "GamefrontCom" + __name__ = "GamefrontCom" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" __pattern__ = r'http://(?:www\.)?gamefront\.com/files/(?P<ID>\d+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Gamefront.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index fec034543..2d1ffe7bf 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GigapetaCom(SimpleHoster): - __name = "GigapetaCom" + __name__ = "GigapetaCom" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """GigaPeta.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py index 84c082ed4..427d9630a 100644 --- a/module/plugins/hoster/GooIm.py +++ b/module/plugins/hoster/GooIm.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GooIm(SimpleHoster): - __name = "GooIm" + __name__ = "GooIm" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?goo\.im/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 1d30cf938..27141dbe8 100644 --- a/module/plugins/hoster/GoogledriveCom.py +++ b/module/plugins/hoster/GoogledriveCom.py @@ -11,13 +11,14 @@ from module.utils import html_unescape class GoogledriveCom(SimpleHoster): - __name = "GoogledriveCom" + __name__ = "GoogledriveCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(drive|docs)\.google\.com/(file/d/\w+|uc\?.*id=)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 7c3ddd41a..ca2e39b10 100644 --- a/module/plugins/hoster/HellshareCz.py +++ b/module/plugins/hoster/HellshareCz.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class HellshareCz(SimpleHoster): - __name = "HellshareCz" + __name__ = "HellshareCz" __type__ = "hoster" __version__ = "0.86" __status__ = "testing" __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Hellshare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HellspyCz.py b/module/plugins/hoster/HellspyCz.py index 43e8cedfe..499a94413 100644 --- a/module/plugins/hoster/HellspyCz.py +++ b/module/plugins/hoster/HellspyCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class HellspyCz(DeadHoster): - __name = "HellspyCz" + __name__ = "HellspyCz" __type__ = "hoster" __version__ = "0.29" __status__ = "testing" diff --git a/module/plugins/hoster/HighWayMe.py b/module/plugins/hoster/HighWayMe.py index 2c83042b9..baf80a4d0 100644 --- a/module/plugins/hoster/HighWayMe.py +++ b/module/plugins/hoster/HighWayMe.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class HighWayMe(MultiHoster): - __name = "HighWayMe" + __name__ = "HighWayMe" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" __pattern__ = r'https?://.+high-way\.my' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """High-Way.me multi-hoster plugin""" diff --git a/module/plugins/hoster/HostujeNet.py b/module/plugins/hoster/HostujeNet.py index bdfaeeabc..81bcecc58 100644 --- a/module/plugins/hoster/HostujeNet.py +++ b/module/plugins/hoster/HostujeNet.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class HostujeNet(SimpleHoster): - __name = "HostujeNet" + __name__ = "HostujeNet" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r'http://(?:www\.)?hostuje\.net/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Hostuje.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py index 5b91af329..032bd350e 100644 --- a/module/plugins/hoster/HotfileCom.py +++ b/module/plugins/hoster/HotfileCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class HotfileCom(DeadHoster): - __name = "HotfileCom" + __name__ = "HotfileCom" __type__ = "hoster" __version__ = "0.38" __status__ = "testing" diff --git a/module/plugins/hoster/HugefilesNet.py b/module/plugins/hoster/HugefilesNet.py index 123fcc1ac..050b8ab98 100644 --- a/module/plugins/hoster/HugefilesNet.py +++ b/module/plugins/hoster/HugefilesNet.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HugefilesNet(XFSHoster): - __name = "HugefilesNet" + __name__ = "HugefilesNet" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Hugefiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py index 637f9d51f..4dc397caa 100644 --- a/module/plugins/hoster/HundredEightyUploadCom.py +++ b/module/plugins/hoster/HundredEightyUploadCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HundredEightyUploadCom(XFSHoster): - __name = "HundredEightyUploadCom" + __name__ = "HundredEightyUploadCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """180upload.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/IFileWs.py b/module/plugins/hoster/IFileWs.py index a5dcbeda2..2444846d7 100644 --- a/module/plugins/hoster/IFileWs.py +++ b/module/plugins/hoster/IFileWs.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class IFileWs(DeadHoster): - __name = "IFileWs" + __name__ = "IFileWs" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/IcyFilesCom.py b/module/plugins/hoster/IcyFilesCom.py index 8e00b70ba..975e6bfc0 100644 --- a/module/plugins/hoster/IcyFilesCom.py +++ b/module/plugins/hoster/IcyFilesCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class IcyFilesCom(DeadHoster): - __name = "IcyFilesCom" + __name__ = "IcyFilesCom" __type__ = "hoster" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py index d33c64afc..a0c435762 100644 --- a/module/plugins/hoster/IfileIt.py +++ b/module/plugins/hoster/IfileIt.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class IfileIt(DeadHoster): - __name = "IfileIt" + __name__ = "IfileIt" __type__ = "hoster" __version__ = "0.30" __status__ = "testing" diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py index 0e1d1526f..76c6c669b 100644 --- a/module/plugins/hoster/IfolderRu.py +++ b/module/plugins/hoster/IfolderRu.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class IfolderRu(SimpleHoster): - __name = "IfolderRu" + __name__ = "IfolderRu" __type__ = "hoster" __version__ = "0.40" __status__ = "testing" __pattern__ = r'http://(?:www)?(files\.)?(ifolder\.ru|metalarea\.org|rusfolder\.(com|net|ru))/(files/)?(?P<ID>\d+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Ifolder.ru hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py index d2ae0977c..8784742eb 100644 --- a/module/plugins/hoster/JumbofilesCom.py +++ b/module/plugins/hoster/JumbofilesCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class JumbofilesCom(SimpleHoster): - __name = "JumbofilesCom" + __name__ = "JumbofilesCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """JumboFiles.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py index e3e5cba0e..37e06afab 100644 --- a/module/plugins/hoster/JunocloudMe.py +++ b/module/plugins/hoster/JunocloudMe.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class JunocloudMe(XFSHoster): - __name = "JunocloudMe" + __name__ = "JunocloudMe" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Junocloud.me hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py index 2e3959c63..f59821feb 100644 --- a/module/plugins/hoster/Keep2ShareCc.py +++ b/module/plugins/hoster/Keep2ShareCc.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class Keep2ShareCc(SimpleHoster): - __name = "Keep2ShareCc" + __name__ = "Keep2ShareCc" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Keep2Share.cc hoster plugin""" __license__ = "GPLv3" @@ -22,7 +23,7 @@ class Keep2ShareCc(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(__pattern + ".*", "http://keep2s.cc/file/\g<ID>")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "http://keep2s.cc/file/\g<ID>")] NAME_PATTERN = r'File: <span>(?P<N>.+?)</span>' SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>' diff --git a/module/plugins/hoster/KickloadCom.py b/module/plugins/hoster/KickloadCom.py index 888257c90..2b23b1616 100644 --- a/module/plugins/hoster/KickloadCom.py +++ b/module/plugins/hoster/KickloadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class KickloadCom(DeadHoster): - __name = "KickloadCom" + __name__ = "KickloadCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py index 2b5d4ec4e..e9b6d00c7 100644 --- a/module/plugins/hoster/KingfilesNet.py +++ b/module/plugins/hoster/KingfilesNet.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class KingfilesNet(SimpleHoster): - __name = "KingfilesNet" + __name__ = "KingfilesNet" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 0948c0397..1f4f96a1f 100644 --- a/module/plugins/hoster/LemUploadsCom.py +++ b/module/plugins/hoster/LemUploadsCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class LemUploadsCom(DeadHoster): - __name = "LemUploadsCom" + __name__ = "LemUploadsCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py index e5963479a..7ac1a7d71 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -33,13 +33,14 @@ def get_info(urls): class LetitbitNet(SimpleHoster): - __name = "LetitbitNet" + __name__ = "LetitbitNet" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 d006688f5..aa9d9bdcb 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class LinksnappyCom(MultiHoster): - __name = "LinksnappyCom" + __name__ = "LinksnappyCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Linksnappy.com multi-hoster plugin""" diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 06c664dcc..3066e3561 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -11,13 +11,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): - __name = "LoadTo" + __name__ = "LoadTo" __type__ = "hoster" __version__ = "0.25" __status__ = "testing" __pattern__ = r'http://(?:www\.)?load\.to/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Load.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LolabitsEs.py b/module/plugins/hoster/LolabitsEs.py index 040bd70e7..18c845d8e 100644 --- a/module/plugins/hoster/LolabitsEs.py +++ b/module/plugins/hoster/LolabitsEs.py @@ -7,12 +7,13 @@ from module.utils import html_unescape class LolabitsEs(SimpleHoster): - __name = "LolabitsEs" + __name__ = "LolabitsEs" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?lolabits\.es/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Lolabits.es hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/LomafileCom.py b/module/plugins/hoster/LomafileCom.py index 76cdb83d3..9e625a1eb 100644 --- a/module/plugins/hoster/LomafileCom.py +++ b/module/plugins/hoster/LomafileCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class LomafileCom(DeadHoster): - __name = "LomafileCom" + __name__ = "LomafileCom" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py index e7d5d243a..dc8f6448b 100644 --- a/module/plugins/hoster/LuckyShareNet.py +++ b/module/plugins/hoster/LuckyShareNet.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LuckyShareNet(SimpleHoster): - __name = "LuckyShareNet" + __name__ = "LuckyShareNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 3191d93c7..9418b4996 100644 --- a/module/plugins/hoster/MediafireCom.py +++ b/module/plugins/hoster/MediafireCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MediafireCom(SimpleHoster): - __name = "MediafireCom" + __name__ = "MediafireCom" __type__ = "hoster" __version__ = "0.91" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Mediafire.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py index 2179dac70..36ad929f4 100644 --- a/module/plugins/hoster/MegaCoNz.py +++ b/module/plugins/hoster/MegaCoNz.py @@ -46,12 +46,13 @@ from module.utils import decode, fs_decode, fs_encode class MegaCoNz(Hoster): - __name = "MegaCoNz" + __name__ = "MegaCoNz" __type__ = "hoster" __version__ = "0.31" __status__ = "testing" __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w\-,]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Mega.co.nz hoster plugin""" __license__ = "GPLv3" @@ -188,7 +189,7 @@ class MegaCoNz(Hoster): def process(self, pyfile): - pattern = re.match(self.__pattern, pyfile.url).groupdict() + pattern = re.match(self.__pattern__, pyfile.url).groupdict() id = pattern['ID'] key = pattern['KEY'] public = pattern['TYPE'] == "" diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py index 2ed94f853..b6c7c513c 100644 --- a/module/plugins/hoster/MegaDebridEu.py +++ b/module/plugins/hoster/MegaDebridEu.py @@ -8,13 +8,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class MegaDebridEu(MultiHoster): - __name = "MegaDebridEu" + __name__ = "MegaDebridEu" __type__ = "hoster" __version__ = "0.50" __status__ = "testing" __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Mega-debrid.eu multi-hoster plugin""" diff --git a/module/plugins/hoster/MegaFilesSe.py b/module/plugins/hoster/MegaFilesSe.py index 499b269ac..03c684751 100644 --- a/module/plugins/hoster/MegaFilesSe.py +++ b/module/plugins/hoster/MegaFilesSe.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegaFilesSe(DeadHoster): - __name = "MegaFilesSe" + __name__ = "MegaFilesSe" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py index f04b343e7..429902307 100644 --- a/module/plugins/hoster/MegaRapidCz.py +++ b/module/plugins/hoster/MegaRapidCz.py @@ -20,13 +20,14 @@ def get_info(urls): class MegaRapidCz(SimpleHoster): - __name = "MegaRapidCz" + __name__ = "MegaRapidCz" __type__ = "hoster" __version__ = "0.59" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """MegaRapid.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py index 13f4f0212..caee97fd8 100644 --- a/module/plugins/hoster/MegaRapidoNet.py +++ b/module/plugins/hoster/MegaRapidoNet.py @@ -21,13 +21,14 @@ def random_with_n_digits(n): class MegaRapidoNet(MultiHoster): - __name = "MegaRapidoNet" + __name__ = "MegaRapidoNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """MegaRapido.net multi-hoster plugin""" diff --git a/module/plugins/hoster/MegacrypterCom.py b/module/plugins/hoster/MegacrypterCom.py index 206a8e8ce..655258e1d 100644 --- a/module/plugins/hoster/MegacrypterCom.py +++ b/module/plugins/hoster/MegacrypterCom.py @@ -8,12 +8,13 @@ from module.plugins.hoster.MegaCoNz import MegaCoNz class MegacrypterCom(MegaCoNz): - __name = "MegacrypterCom" + __name__ = "MegacrypterCom" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" __pattern__ = r'https?://\w{0,10}\.?megacrypter\.com/[\w\-!]+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Megacrypter.com decrypter plugin""" __license__ = "GPLv3" @@ -36,7 +37,7 @@ class MegacrypterCom(MegaCoNz): def process(self, pyfile): #: Match is guaranteed because plugin was chosen to handle url - node = re.match(self.__pattern, pyfile.url).group(0) + node = re.match(self.__pattern__, pyfile.url).group(0) #: get Mega.co.nz link info info = self.api_response(link=node, m="info") diff --git a/module/plugins/hoster/MegareleaseOrg.py b/module/plugins/hoster/MegareleaseOrg.py index 5a7543ef8..ab9a864c9 100644 --- a/module/plugins/hoster/MegareleaseOrg.py +++ b/module/plugins/hoster/MegareleaseOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegareleaseOrg(DeadHoster): - __name = "MegareleaseOrg" + __name__ = "MegareleaseOrg" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py index 0130a4edd..7673032ec 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MegasharesCom(SimpleHoster): - __name = "MegasharesCom" + __name__ = "MegasharesCom" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("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 4fe15f0ff..468734c35 100644 --- a/module/plugins/hoster/MegauploadCom.py +++ b/module/plugins/hoster/MegauploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegauploadCom(DeadHoster): - __name = "MegauploadCom" + __name__ = "MegauploadCom" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" diff --git a/module/plugins/hoster/MegavideoCom.py b/module/plugins/hoster/MegavideoCom.py index a862acfea..a3339a932 100644 --- a/module/plugins/hoster/MegavideoCom.py +++ b/module/plugins/hoster/MegavideoCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class MegavideoCom(DeadHoster): - __name = "MegavideoCom" + __name__ = "MegavideoCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index c94593a7a..f4f32c25c 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class MovReelCom(XFSHoster): - __name = "MovReelCom" + __name__ = "MovReelCom" __type__ = "hoster" __version__ = "1.25" __status__ = "testing" __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """MovReel.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MultihostersCom.py b/module/plugins/hoster/MultihostersCom.py index 020bb0a62..d951b086b 100644 --- a/module/plugins/hoster/MultihostersCom.py +++ b/module/plugins/hoster/MultihostersCom.py @@ -4,12 +4,13 @@ from module.plugins.hoster.ZeveraCom import ZeveraCom class MultihostersCom(ZeveraCom): - __name = "MultihostersCom" + __name__ = "MultihostersCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Multihosters.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index b6aad0f7d..d6c31dcb0 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MultishareCz(SimpleHoster): - __name = "MultishareCz" + __name__ = "MultishareCz" __type__ = "hoster" __version__ = "0.43" __status__ = "testing" __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """MultiShare.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index 0b19a950c..2885a5634 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -7,13 +7,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class MyfastfileCom(MultiHoster): - __name = "MyfastfileCom" + __name__ = "MyfastfileCom" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Myfastfile.com multi-hoster plugin""" diff --git a/module/plugins/hoster/MystoreTo.py b/module/plugins/hoster/MystoreTo.py index 15fdbd27c..433537e5a 100644 --- a/module/plugins/hoster/MystoreTo.py +++ b/module/plugins/hoster/MystoreTo.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MystoreTo(SimpleHoster): - __name = "MystoreTo" + __name__ = "MystoreTo" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Mystore.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py index be50ea760..5df1669b8 100644 --- a/module/plugins/hoster/MyvideoDe.py +++ b/module/plugins/hoster/MyvideoDe.py @@ -7,12 +7,13 @@ from module.utils import html_unescape class MyvideoDe(Hoster): - __name = "MyvideoDe" + __name__ = "MyvideoDe" __type__ = "hoster" __version__ = "0.92" __status__ = "testing" __pattern__ = r'http://(?:www\.)?myvideo\.de/watch/' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Myvideo.de hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NahrajCz.py b/module/plugins/hoster/NahrajCz.py index ac20e2cc7..0d710c9b0 100644 --- a/module/plugins/hoster/NahrajCz.py +++ b/module/plugins/hoster/NahrajCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class NahrajCz(DeadHoster): - __name = "NahrajCz" + __name__ = "NahrajCz" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py index 4fd0755f9..1802f058d 100644 --- a/module/plugins/hoster/NarodRu.py +++ b/module/plugins/hoster/NarodRu.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NarodRu(SimpleHoster): - __name = "NarodRu" + __name__ = "NarodRu" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Narod.ru hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 2e355b803..ff9e75c72 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class NetloadIn(DeadHoster): - __name = "NetloadIn" + __name__ = "NetloadIn" __type__ = "hoster" __version__ = "0.51" __status__ = "testing" diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index ba182b6d6..7e704b8a2 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class NitroflareCom(SimpleHoster): - __name = "NitroflareCom" + __name__ = "NitroflareCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Nitroflare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index 8fed15e93..c4f07fbae 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -5,13 +5,14 @@ from module.plugins.internal.MultiHoster import MultiHoster class NoPremiumPl(MultiHoster): - __name = "NoPremiumPl" + __name__ = "NoPremiumPl" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://direct\.nopremium\.pl.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """NoPremium.pl multi-hoster plugin""" diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 86d93645c..18de2aeeb 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NosuploadCom(XFSHoster): - __name = "NosuploadCom" + __name__ = "NosuploadCom" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Nosupload.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 62ff73d00..a07de6802 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -8,12 +8,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NovafileCom(XFSHoster): - __name = "NovafileCom" + __name__ = "NovafileCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Novafile.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index 5da00c2a5..79e964236 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowDownloadSx(SimpleHoster): - __name = "NowDownloadSx" + __name__ = "NowDownloadSx" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("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 6b8d501c4..d209d6475 100644 --- a/module/plugins/hoster/NowVideoSx.py +++ b/module/plugins/hoster/NowVideoSx.py @@ -6,20 +6,21 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowVideoSx(SimpleHoster): - __name = "NowVideoSx" + __name__ = "NowVideoSx" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """NowVideo.sx hoster plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.nowvideo.sx/video/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.nowvideo.sx/video/\g<ID>')] NAME_PATTERN = r'<h4>(?P<N>.+?)<' OFFLINE_PATTERN = r'>This file no longer exists' diff --git a/module/plugins/hoster/OboomCom.py b/module/plugins/hoster/OboomCom.py index ec2b91957..a73d646e1 100644 --- a/module/plugins/hoster/OboomCom.py +++ b/module/plugins/hoster/OboomCom.py @@ -11,12 +11,13 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class OboomCom(Hoster): - __name = "OboomCom" + __name__ = "OboomCom" __type__ = "hoster" __version__ = "0.39" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?oboom\.com/(?:#(?:id=|/)?)?(?P<ID>\w{8})' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Oboom.com hoster plugin""" __license__ = "GPLv3" @@ -53,7 +54,7 @@ class OboomCom(Hoster): def get_file_id(self, url): - self.file_id = re.match(OboomCom.__pattern, url).group('ID') + self.file_id = re.match(OboomCom.__pattern__, url).group('ID') def get_session_token(self): diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 9ec4281b5..8de529643 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): - __name = "1fichier.com" + __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.92" + __version__ = "0.93" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """1fichier.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py index 485822fd6..8fff581fe 100644 --- a/module/plugins/hoster/OpenloadIo.py +++ b/module/plugins/hoster/OpenloadIo.py @@ -8,12 +8,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OpenloadIo(SimpleHoster): - __name = "OpenloadIo" + __name__ = "OpenloadIo" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?openload\.(co|io)/(f|embed)/(?P<ID>[\w\-]+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Openload.co hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py index 20b38f09d..e1887ce76 100644 --- a/module/plugins/hoster/OronCom.py +++ b/module/plugins/hoster/OronCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class OronCom(DeadHoster): - __name = "OronCom" + __name__ = "OronCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 86d316ff6..b03d263b9 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -5,17 +5,18 @@ import urllib from module.common.json_layer import json_loads from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo -from module.utils import parseFileSize as parse_size +from module.plugins.internal.Plugin import parse_size class OverLoadMe(MultiHoster): - __name = "OverLoadMe" + __name__ = "OverLoadMe" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" __pattern__ = r'https?://.*overload\.me/.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Over-Load.me multi-hoster plugin""" diff --git a/module/plugins/hoster/PandaplaNet.py b/module/plugins/hoster/PandaplaNet.py index 21fbbe4a1..4efe20b5a 100644 --- a/module/plugins/hoster/PandaplaNet.py +++ b/module/plugins/hoster/PandaplaNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class PandaplaNet(DeadHoster): - __name = "PandaplaNet" + __name__ = "PandaplaNet" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/PornhostCom.py b/module/plugins/hoster/PornhostCom.py index 37c2aaf3f..13a8dff4d 100644 --- a/module/plugins/hoster/PornhostCom.py +++ b/module/plugins/hoster/PornhostCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.Hoster import Hoster class PornhostCom(Hoster): - __name = "PornhostCom" + __name__ = "PornhostCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Pornhost.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py index 92a008a42..fb0299b85 100644 --- a/module/plugins/hoster/PornhubCom.py +++ b/module/plugins/hoster/PornhubCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.Hoster import Hoster class PornhubCom(Hoster): - __name = "PornhubCom" + __name__ = "PornhubCom" __type__ = "hoster" __version__ = "0.52" __status__ = "testing" __pattern__ = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Pornhub.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py index 1aa559a77..8279412e4 100644 --- a/module/plugins/hoster/PotloadCom.py +++ b/module/plugins/hoster/PotloadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class PotloadCom(DeadHoster): - __name = "PotloadCom" + __name__ = "PotloadCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py index 79d0ba618..874e19c93 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -9,13 +9,14 @@ from module.utils import fs_encode class PremiumTo(MultiHoster): - __name = "PremiumTo" + __name__ = "PremiumTo" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Premium.to multi-hoster plugin""" diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index beffcbd51..918526355 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -5,13 +5,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class PremiumizeMe(MultiHoster): - __name = "PremiumizeMe" + __name__ = "PremiumizeMe" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Premiumize.me multi-hoster plugin""" diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 07ca3054c..ed3daa18e 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class PromptfileCom(SimpleHoster): - __name = "PromptfileCom" + __name__ = "PromptfileCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?promptfile\.com/' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Promptfile.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/PrzeklejPl.py b/module/plugins/hoster/PrzeklejPl.py index 33206af41..b066444da 100644 --- a/module/plugins/hoster/PrzeklejPl.py +++ b/module/plugins/hoster/PrzeklejPl.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class PrzeklejPl(DeadHoster): - __name = "PrzeklejPl" + __name__ = "PrzeklejPl" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hoster/PutdriveCom.py b/module/plugins/hoster/PutdriveCom.py index 06480a5b1..d917bf812 100644 --- a/module/plugins/hoster/PutdriveCom.py +++ b/module/plugins/hoster/PutdriveCom.py @@ -4,12 +4,13 @@ from module.plugins.hoster.ZeveraCom import ZeveraCom class PutdriveCom(ZeveraCom): - __name = "PutdriveCom" + __name__ = "PutdriveCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Multihosters.com multi-hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 1d072dbce..b6600478d 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class QuickshareCz(SimpleHoster): - __name = "QuickshareCz" + __name__ = "QuickshareCz" __type__ = "hoster" __version__ = "0.58" __status__ = "testing" __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 3da5086fb..af3d41946 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class RPNetBiz(MultiHoster): - __name = "RPNetBiz" + __name__ = "RPNetBiz" __type__ = "hoster" __version__ = "0.17" __status__ = "testing" __pattern__ = r'https?://.+rpnet\.biz' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """RPNet.biz multi-hoster plugin""" diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py index 4e21ef299..7a5c25297 100644 --- a/module/plugins/hoster/RapideoPl.py +++ b/module/plugins/hoster/RapideoPl.py @@ -5,13 +5,14 @@ from module.plugins.internal.MultiHoster import MultiHoster class RapideoPl(MultiHoster): - __name = "RapideoPl" + __name__ = "RapideoPl" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Rapideo.pl multi-hoster plugin""" diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py index 0bfb693b2..9c91ab9b8 100644 --- a/module/plugins/hoster/RapidfileshareNet.py +++ b/module/plugins/hoster/RapidfileshareNet.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RapidfileshareNet(XFSHoster): - __name = "RapidfileshareNet" + __name__ = "RapidfileshareNet" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Rapidfileshare.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 5676d74c5..bb4622386 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -12,13 +12,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapidgatorNet(SimpleHoster): - __name = "RapidgatorNet" + __name__ = "RapidgatorNet" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Rapidgator.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py index f96a5df8a..d86cb4184 100644 --- a/module/plugins/hoster/RapiduNet.py +++ b/module/plugins/hoster/RapiduNet.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapiduNet(SimpleHoster): - __name = "RapiduNet" + __name__ = "RapiduNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Rapidu.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py index 82115fc7c..326476076 100644 --- a/module/plugins/hoster/RarefileNet.py +++ b/module/plugins/hoster/RarefileNet.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RarefileNet(XFSHoster): - __name = "RarefileNet" + __name__ = "RarefileNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Rarefile.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 342ab72de..a8685d0f8 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -6,17 +6,18 @@ import urllib from module.common.json_layer import json_loads from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo -from module.utils import parseFileSize as parse_size +from module.plugins.internal.Plugin import parse_size class RealdebridCom(MultiHoster): - __name = "RealdebridCom" + __name__ = "RealdebridCom" __type__ = "hoster" __version__ = "0.69" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Real-Debrid.com multi-hoster plugin""" diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py index 2d20a9271..b5897ac80 100644 --- a/module/plugins/hoster/RedtubeCom.py +++ b/module/plugins/hoster/RedtubeCom.py @@ -7,12 +7,13 @@ from module.utils import html_unescape class RedtubeCom(Hoster): - __name = "RedtubeCom" + __name__ = "RedtubeCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?redtube\.com/\d+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Redtube.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index 1df19929b..9ec7e8ee6 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class RehostTo(MultiHoster): - __name = "RehostTo" + __name__ = "RehostTo" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" __pattern__ = r'https?://.*rehost\.to\..+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Rehost.com multi-hoster plugin""" diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index c950bead2..dd8072799 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -14,13 +14,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RemixshareCom(SimpleHoster): - __name = "RemixshareCom" + __name__ = "RemixshareCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Remixshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py index 9d527b8c8..24f398de0 100644 --- a/module/plugins/hoster/RgHostNet.py +++ b/module/plugins/hoster/RgHostNet.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RgHostNet(SimpleHoster): - __name = "RgHostNet" + __name__ = "RgHostNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'http://(?:www\.)?rghost\.(net|ru)/[\d\-]+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """RgHost.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SafesharingEu.py b/module/plugins/hoster/SafesharingEu.py index 3163fa2f0..80e289f69 100644 --- a/module/plugins/hoster/SafesharingEu.py +++ b/module/plugins/hoster/SafesharingEu.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SafesharingEu(XFSHoster): - __name = "SafesharingEu" + __name__ = "SafesharingEu" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Safesharing.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py index 3bfe12cd4..4e3dcc6a7 100644 --- a/module/plugins/hoster/SecureUploadEu.py +++ b/module/plugins/hoster/SecureUploadEu.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SecureUploadEu(XFSHoster): - __name = "SecureUploadEu" + __name__ = "SecureUploadEu" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """SecureUpload.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index a9e3cebd7..b5f8781a3 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SendspaceCom(SimpleHoster): - __name = "SendspaceCom" + __name__ = "SendspaceCom" __type__ = "hoster" __version__ = "0.18" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Sendspace.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Share4WebCom.py b/module/plugins/hoster/Share4WebCom.py index 0364ff6c8..4b1279407 100644 --- a/module/plugins/hoster/Share4WebCom.py +++ b/module/plugins/hoster/Share4WebCom.py @@ -5,12 +5,13 @@ from module.plugins.internal.SimpleHoster import create_getInfo class Share4WebCom(UnibytesCom): - __name = "Share4WebCom" + __name__ = "Share4WebCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?share4web\.com/get/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Share4web.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Share76Com.py b/module/plugins/hoster/Share76Com.py index 1147b556d..863fb0a7e 100644 --- a/module/plugins/hoster/Share76Com.py +++ b/module/plugins/hoster/Share76Com.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class Share76Com(DeadHoster): - __name = "Share76Com" + __name__ = "Share76Com" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/ShareFilesCo.py b/module/plugins/hoster/ShareFilesCo.py index 1b9e3bd0e..a42ceb91c 100644 --- a/module/plugins/hoster/ShareFilesCo.py +++ b/module/plugins/hoster/ShareFilesCo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class ShareFilesCo(DeadHoster): - __name = "ShareFilesCo" + __name__ = "ShareFilesCo" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/SharebeesCom.py b/module/plugins/hoster/SharebeesCom.py index 9d4bde36a..c987ac0f9 100644 --- a/module/plugins/hoster/SharebeesCom.py +++ b/module/plugins/hoster/SharebeesCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SharebeesCom(DeadHoster): - __name = "SharebeesCom" + __name__ = "SharebeesCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index e976337b3..1cf1d5508 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ShareonlineBiz(SimpleHoster): - __name = "ShareonlineBiz" + __name__ = "ShareonlineBiz" __type__ = "hoster" __version__ = "0.60" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Shareonline.biz hoster plugin""" __license__ = "GPLv3" @@ -26,7 +27,7 @@ class ShareonlineBiz(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(__pattern + ".*", "http://www.share-online.biz/dl/\g<ID>")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "http://www.share-online.biz/dl/\g<ID>")] CHECK_TRAFFIC = True @@ -41,7 +42,7 @@ class ShareonlineBiz(SimpleHoster): field = get_url("http://api.share-online.biz/linkcheck.php", get={'md5' : "1", - 'links': re.match(cls.__pattern, url).group("ID")}).split(";") + 'links': re.match(cls.__pattern__, url).group("ID")}).split(";") try: if field[1] == "OK": diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py index 3ac2370cb..56bec3002 100644 --- a/module/plugins/hoster/ShareplaceCom.py +++ b/module/plugins/hoster/ShareplaceCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.Hoster import Hoster class ShareplaceCom(Hoster): - __name = "ShareplaceCom" + __name__ = "ShareplaceCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Shareplace.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SharingmatrixCom.py b/module/plugins/hoster/SharingmatrixCom.py index f0ce063d7..e6d5d4ab8 100644 --- a/module/plugins/hoster/SharingmatrixCom.py +++ b/module/plugins/hoster/SharingmatrixCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SharingmatrixCom(DeadHoster): - __name = "SharingmatrixCom" + __name__ = "SharingmatrixCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py index 46b746b50..1313ba0e0 100644 --- a/module/plugins/hoster/ShragleCom.py +++ b/module/plugins/hoster/ShragleCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class ShragleCom(DeadHoster): - __name = "ShragleCom" + __name__ = "ShragleCom" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py index 20d7d77a5..750928ab0 100644 --- a/module/plugins/hoster/SimplyPremiumCom.py +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class SimplyPremiumCom(MultiHoster): - __name = "SimplyPremiumCom" + __name__ = "SimplyPremiumCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://.+simply-premium\.com' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Simply-Premium.com multi-hoster plugin""" diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py index 5d01a1e3a..60d35f211 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo, rep class SimplydebridCom(MultiHoster): - __name = "SimplydebridCom" + __name__ = "SimplydebridCom" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" __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), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Simply-debrid.com multi-hoster plugin""" diff --git a/module/plugins/hoster/SizedriveCom.py b/module/plugins/hoster/SizedriveCom.py index ba99bab13..e545b1d28 100644 --- a/module/plugins/hoster/SizedriveCom.py +++ b/module/plugins/hoster/SizedriveCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SizedriveCom(SimpleHoster): - __name = "SizedriveCom" + __name__ = "SizedriveCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?sizedrive\.com/[rd]/(?P<ID>\w+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Sizedrive.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index 1fffd5f6a..5676e6190 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -5,13 +5,14 @@ from module.plugins.internal.MultiHoster import MultiHoster class SmoozedCom(MultiHoster): - __name = "SmoozedCom" + __name__ = "SmoozedCom" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Smoozed.com hoster plugin""" diff --git a/module/plugins/hoster/SockshareCom.py b/module/plugins/hoster/SockshareCom.py index 207324543..b45a22b72 100644 --- a/module/plugins/hoster/SockshareCom.py +++ b/module/plugins/hoster/SockshareCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SockshareCom(DeadHoster): - __name = "SockshareCom" + __name__ = "SockshareCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/SolidfilesCom.py b/module/plugins/hoster/SolidfilesCom.py index 9e21852c2..ee2f12c92 100644 --- a/module/plugins/hoster/SolidfilesCom.py +++ b/module/plugins/hoster/SolidfilesCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SolidfilesCom(SimpleHoster): - __name = "SolidfilesCom" + __name__ = "SolidfilesCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" __pattern__ = r'http://(?:www\.)?solidfiles\.com\/d/\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Solidfiles.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py index 4a1d5045e..90c8acc11 100644 --- a/module/plugins/hoster/SoundcloudCom.py +++ b/module/plugins/hoster/SoundcloudCom.py @@ -7,13 +7,14 @@ from module.common.json_layer import json_loads class SoundcloudCom(SimpleHoster): - __name = "SoundcloudCom" + __name__ = "SoundcloudCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w\-]+/[\w\-]+' - __config__ = [("use_premium", "bool" , "Use premium account if available", True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool" , "Use premium account if available", True ), ("quality" , "Lower;Higher", "Quality" , "Higher")] __description__ = """SoundCloud.com hoster plugin""" diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py index d4d0efa0a..abba1be79 100644 --- a/module/plugins/hoster/SpeedLoadOrg.py +++ b/module/plugins/hoster/SpeedLoadOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SpeedLoadOrg(DeadHoster): - __name = "SpeedLoadOrg" + __name__ = "SpeedLoadOrg" __type__ = "hoster" __version__ = "1.03" __status__ = "testing" diff --git a/module/plugins/hoster/SpeedfileCz.py b/module/plugins/hoster/SpeedfileCz.py index 147bedb23..75a55d490 100644 --- a/module/plugins/hoster/SpeedfileCz.py +++ b/module/plugins/hoster/SpeedfileCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class SpeedfileCz(DeadHoster): - __name = "SpeedFileCz" + __name__ = "SpeedFileCz" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py index ffd3d96f6..727bafd3d 100644 --- a/module/plugins/hoster/SpeedyshareCom.py +++ b/module/plugins/hoster/SpeedyshareCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SpeedyshareCom(SimpleHoster): - __name = "SpeedyshareCom" + __name__ = "SpeedyshareCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Speedyshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py index 1625999b4..3d0852204 100644 --- a/module/plugins/hoster/StorageTo.py +++ b/module/plugins/hoster/StorageTo.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class StorageTo(DeadHoster): - __name = "StorageTo" + __name__ = "StorageTo" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/StreamCz.py b/module/plugins/hoster/StreamCz.py index 2f57e355c..b52998a15 100644 --- a/module/plugins/hoster/StreamCz.py +++ b/module/plugins/hoster/StreamCz.py @@ -21,12 +21,13 @@ def get_info(urls): class StreamCz(Hoster): - __name = "StreamCz" + __name__ = "StreamCz" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Stream.cz hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 336ee5fb2..f98e2fec9 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class StreamcloudEu(XFSHoster): - __name = "StreamcloudEu" + __name__ = "StreamcloudEu" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Streamcloud.eu hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index 4af620019..d6ec4b643 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -15,13 +15,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class TurbobitNet(SimpleHoster): - __name = "TurbobitNet" + __name__ = "TurbobitNet" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Turbobit.net hoster plugin""" __license__ = "GPLv3" @@ -29,7 +30,7 @@ class TurbobitNet(SimpleHoster): ("prOq", None)] - URL_REPLACEMENTS = [(__pattern + ".*", "http://turbobit.net/\g<ID>.html")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "http://turbobit.net/\g<ID>.html")] COOKIES = [("turbobit.net", "user_lang", "en")] @@ -99,7 +100,7 @@ class TurbobitNet(SimpleHoster): if rtUpdate: return rtUpdate - if self.retrieve("version") is not self.__version or \ + if self.retrieve("version") is not self.__version__ or \ int(self.retrieve("timestamp", 0)) + 86400000 < timestamp(): #: that's right, we are even using jdownloader updates rtUpdate = self.load("http://update0.jdownloader.org/pluginstuff/tbupdate.js") @@ -111,7 +112,7 @@ class TurbobitNet(SimpleHoster): self.store("rtUpdate", rtUpdate) self.store("timestamp", timestamp()) - self.store("version", self.__version) + self.store("version", self.__version__) else: self.log_error(_("Unable to download, wait for update...")) self.temp_offline() diff --git a/module/plugins/hoster/TurbouploadCom.py b/module/plugins/hoster/TurbouploadCom.py index df139e1b3..ffb88d53b 100644 --- a/module/plugins/hoster/TurbouploadCom.py +++ b/module/plugins/hoster/TurbouploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class TurbouploadCom(DeadHoster): - __name = "TurbouploadCom" + __name__ = "TurbouploadCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index 72fa7e1a0..74c402a6d 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class TusfilesNet(XFSHoster): - __name = "TusfilesNet" + __name__ = "TusfilesNet" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Tusfiles.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index b4436db3b..8125d0f1e 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class TwoSharedCom(SimpleHoster): - __name = "2Shared" + __name__ = "TwoSharedCom" __type__ = "hoster" - __version__ = "0.14" + __version__ = "0.15" __status__ = "testing" __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 8ec02dda3..ce63107e8 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -14,13 +14,14 @@ def convert_decimal_prefix(m): class UlozTo(SimpleHoster): - __name = "UlozTo" + __name__ = "UlozTo" __type__ = "hoster" __version__ = "1.16" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("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 bd4dde23d..1495cf25a 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UloziskoSk(SimpleHoster): - __name = "UloziskoSk" + __name__ = "UloziskoSk" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 3e6c72395..e0cf5ee1b 100644 --- a/module/plugins/hoster/UnibytesCom.py +++ b/module/plugins/hoster/UnibytesCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UnibytesCom(SimpleHoster): - __name = "UnibytesCom" + __name__ = "UnibytesCom" __type__ = "hoster" __version__ = "0.16" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w\- .]{11}B' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("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 75b327ef7..082ad3e02 100644 --- a/module/plugins/hoster/UnrestrictLi.py +++ b/module/plugins/hoster/UnrestrictLi.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UnrestrictLi(DeadHoster): - __name = "UnrestrictLi" + __name__ = "UnrestrictLi" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py index d64f5be9c..8d7a07047 100644 --- a/module/plugins/hoster/UpleaCom.py +++ b/module/plugins/hoster/UpleaCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UpleaCom(XFSHoster): - __name = "UpleaCom" + __name__ = "UpleaCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Uplea.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py index 519d252d0..36b766b7e 100644 --- a/module/plugins/hoster/UploadStationCom.py +++ b/module/plugins/hoster/UploadStationCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadStationCom(DeadHoster): - __name = "UploadStationCom" + __name__ = "UploadStationCom" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py index eaab4433f..c816278ed 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadableCh(SimpleHoster): - __name = "UploadableCh" + __name__ = "UploadableCh" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Uploadable.ch hoster plugin""" __license__ = "GPLv3" @@ -21,7 +22,7 @@ class UploadableCh(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.uploadable.ch/file/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.uploadable.ch/file/\g<ID>')] INFO_PATTERN = r'div id=\"file_name\" title=.*>(?P<N>.+)<span class=\"filename_normal\">\((?P<S>[\d.]+) (?P<U>\w+)\)</span><' diff --git a/module/plugins/hoster/UploadboxCom.py b/module/plugins/hoster/UploadboxCom.py index eaa8faf01..a1053a413 100644 --- a/module/plugins/hoster/UploadboxCom.py +++ b/module/plugins/hoster/UploadboxCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadboxCom(DeadHoster): - __name = "Uploadbox" + __name__ = "Uploadbox" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 28f29f778..c3c2ade08 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadedTo(SimpleHoster): - __name = "UploadedTo" + __name__ = "UploadedTo" __type__ = "hoster" __version__ = "0.97" __status__ = "testing" __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)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Uploaded.net hoster plugin""" __license__ = "GPLv3" @@ -24,7 +25,7 @@ class UploadedTo(SimpleHoster): CHECK_TRAFFIC = True - URL_REPLACEMENTS = [(__pattern + ".*", r'http://uploaded.net/file/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')] API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" @@ -46,7 +47,7 @@ class UploadedTo(SimpleHoster): for _i in xrange(5): html = get_url("http://uploaded.net/api/filemultiple", get={'apikey': cls.API_KEY, - 'id_0' : re.match(cls.__pattern, url).group('ID')}) + 'id_0' : re.match(cls.__pattern__, url).group('ID')}) if html != "can't find request": api = html.split(",", 4) diff --git a/module/plugins/hoster/UploadhereCom.py b/module/plugins/hoster/UploadhereCom.py index 6979dca6d..a3c41e824 100644 --- a/module/plugins/hoster/UploadhereCom.py +++ b/module/plugins/hoster/UploadhereCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadhereCom(DeadHoster): - __name = "UploadhereCom" + __name__ = "UploadhereCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index ec7ac4a71..d8f07b5f5 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadheroCom(SimpleHoster): - __name = "UploadheroCom" + __name__ = "UploadheroCom" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """UploadHero.co plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index 9635454fd..3ca91e652 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -9,12 +9,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadingCom(SimpleHoster): - __name = "UploadingCom" + __name__ = "UploadingCom" __type__ = "hoster" __version__ = "0.44" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Uploading.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UploadkingCom.py b/module/plugins/hoster/UploadkingCom.py index 61db31f6a..54fe47cc8 100644 --- a/module/plugins/hoster/UploadkingCom.py +++ b/module/plugins/hoster/UploadkingCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class UploadkingCom(DeadHoster): - __name = "UploadkingCom" + __name__ = "UploadkingCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index cdd7244d8..dcc156415 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UpstoreNet(SimpleHoster): - __name = "UpstoreNet" + __name__ = "UpstoreNet" __type__ = "hoster" __version__ = "0.07" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?upstore\.net/' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Upstore.Net File Download Hoster""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 1624219d7..08cc26bfd 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -4,12 +4,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UptoboxCom(XFSHoster): - __name = "UptoboxCom" + __name__ = "UptoboxCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Uptobox.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/UserscloudCom.py b/module/plugins/hoster/UserscloudCom.py index 7619f6f2b..f8b6d7703 100644 --- a/module/plugins/hoster/UserscloudCom.py +++ b/module/plugins/hoster/UserscloudCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UserscloudCom(SimpleHoster): - __name = "UserscloudCom" + __name__ = "UserscloudCom" __type__ = "hoster" __version__ = "0.01" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?userscloud\.com/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Userscloud.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py index 0d3c33f90..7f2ca4780 100644 --- a/module/plugins/hoster/VeehdCom.py +++ b/module/plugins/hoster/VeehdCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.Hoster import Hoster class VeehdCom(Hoster): - __name = "VeehdCom" + __name__ = "VeehdCom" __type__ = "hoster" __version__ = "0.25" __status__ = "testing" __pattern__ = r'http://veehd\.com/video/\d+_\S+' - __config__ = [("filename_spaces", "bool", "Allow spaces in filename", False), + __config__ = [("activated", "bool", "Activated", True), + ("filename_spaces", "bool", "Allow spaces in filename", False), ("replacement_char", "str", "Filename replacement character", "_")] __description__ = """Veehd.com hoster plugin""" diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index 7a7c4fa01..423db2dbe 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VeohCom(SimpleHoster): - __name = "VeohCom" + __name__ = "VeohCom" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' - __config__ = [("use_premium", "bool" , "Use premium account if available", True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool" , "Use premium account if available", True ), ("quality" , "Low;High;Auto", "Quality" , "Auto")] __description__ = """Veoh.com hoster plugin""" @@ -23,7 +24,7 @@ class VeohCom(SimpleHoster): NAME_PATTERN = r'<meta name="title" content="(?P<N>.*?)"' OFFLINE_PATTERN = r'>Sorry, we couldn\'t find the video you were looking for' - URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.veoh.com/watch/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.veoh.com/watch/\g<ID>')] COOKIES = [("veoh.com", "lassieLocale", "en")] diff --git a/module/plugins/hoster/VidPlayNet.py b/module/plugins/hoster/VidPlayNet.py index f6a3ee36c..e252535be 100644 --- a/module/plugins/hoster/VidPlayNet.py +++ b/module/plugins/hoster/VidPlayNet.py @@ -7,12 +7,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class VidPlayNet(XFSHoster): - __name = "VidPlayNet" + __name__ = "VidPlayNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """VidPlay.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index d7c9667ca..b206e5574 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VimeoCom(SimpleHoster): - __name = "VimeoCom" + __name__ = "VimeoCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' - __config__ = [("use_premium", "bool" , "Use premium account if available" , True ), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool" , "Use premium account if available" , True ), ("quality" , "Lowest;Mobile;SD;HD;Highest", "Quality" , "Highest"), ("original" , "bool" , "Try to download the original file", True )] @@ -25,7 +26,7 @@ class VimeoCom(SimpleHoster): OFFLINE_PATTERN = r'class="exception_header"' TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<' - URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.vimeo.com/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.vimeo.com/\g<ID>')] COOKIES = [("vimeo.com", "language", "en")] diff --git a/module/plugins/hoster/Vipleech4UCom.py b/module/plugins/hoster/Vipleech4UCom.py index 0f5b9a1a5..8eac61341 100644 --- a/module/plugins/hoster/Vipleech4UCom.py +++ b/module/plugins/hoster/Vipleech4UCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class Vipleech4UCom(DeadHoster): - __name = "Vipleech4UCom" + __name__ = "Vipleech4UCom" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/VkCom.py b/module/plugins/hoster/VkCom.py index a6a34c5b3..245cb8dff 100644 --- a/module/plugins/hoster/VkCom.py +++ b/module/plugins/hoster/VkCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VkCom(SimpleHoster): - __name = "VkCom" + __name__ = "VkCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r"https?://(?:www\.)?vk\.com/video_ext\.php/\?.+" - __config__ = [("quality", "Low;High;Auto", "Quality", "Auto")] + __config__ = [("activated", "bool", "Activated", True), + ("quality", "Low;High;Auto", "Quality", "Auto")] __description__ = """Vk.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py index 5da817968..a356dccdd 100644 --- a/module/plugins/hoster/WarserverCz.py +++ b/module/plugins/hoster/WarserverCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class WarserverCz(DeadHoster): - __name = "WarserverCz" + __name__ = "WarserverCz" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 0ca67359c..eb91974d7 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class WebshareCz(SimpleHoster): - __name = "WebshareCz" + __name__ = "WebshareCz" __type__ = "hoster" __version__ = "0.20" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(en\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """WebShare.cz hoster plugin""" __license__ = "GPLv3" @@ -25,7 +26,7 @@ class WebshareCz(SimpleHoster): def api_info(cls, url): info = super(WebshareCz, cls).api_info(url) - info['pattern'] = re.match(cls.__pattern, url).groupdict() + info['pattern'] = re.match(cls.__pattern__, url).groupdict() api_data = get_url("https://webshare.cz/api/file_info/", post={'ident': info['pattern']['ID'], 'wst': ""}) diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index b97a6cd5e..5ea3ad071 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class WrzucTo(SimpleHoster): - __name = "WrzucTo" + __name__ = "WrzucTo" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Wrzuc.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py index 4f8a2d0f7..028e557e9 100644 --- a/module/plugins/hoster/WuploadCom.py +++ b/module/plugins/hoster/WuploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class WuploadCom(DeadHoster): - __name = "WuploadCom" + __name__ = "WuploadCom" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/X7To.py b/module/plugins/hoster/X7To.py index c579b3842..285499807 100644 --- a/module/plugins/hoster/X7To.py +++ b/module/plugins/hoster/X7To.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class X7To(DeadHoster): - __name = "X7To" + __name__ = "X7To" __type__ = "hoster" __version__ = "0.42" __status__ = "testing" diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index 9b4c9aeb3..e202d23dd 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -6,12 +6,13 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class XFileSharingPro(XFSHoster): - __name = "XFileSharingPro" + __name__ = "XFileSharingPro" __type__ = "hoster" __version__ = "0.54" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """XFileSharingPro dummy hoster plugin for hook""" __license__ = "GPLv3" @@ -29,14 +30,14 @@ class XFileSharingPro(XFSHoster): def init(self): - self.__pattern = self.pyload.pluginManager.hosterPlugins[self.__name__]['pattern'] + self.__pattern__ = self.pyload.pluginManager.hosterPlugins[self.classname]['pattern'] - self.PLUGIN_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() + self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.') def _setup(self): - account_name = self.__name__ if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME + account_name = self.classname if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME self.chunk_limit = 1 self.multiDL = True @@ -58,7 +59,7 @@ class XFileSharingPro(XFSHoster): self.account = self.pyload.accountManager.getAccountPlugin(self.PLUGIN_NAME) if not self.account: - self.account = self.pyload.accountManager.getAccountPlugin(self.__name__) + self.account = self.pyload.accountManager.getAccountPlugin(self.classname) if self.account: if not self.account.PLUGIN_DOMAIN: diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 4df2465ee..1673797cc 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -16,13 +16,14 @@ def clean_json(json_expr): class XHamsterCom(Hoster): - __name = "XHamsterCom" + __name__ = "XHamsterCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' - __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] + __config__ = [("activated", "bool", "Activated", True), + ("type", ".mp4;.flv", "Preferred type", ".mp4")] __description__ = """XHamster.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/XVideosCom.py b/module/plugins/hoster/XVideosCom.py index 107193084..04fb6a57c 100644 --- a/module/plugins/hoster/XVideosCom.py +++ b/module/plugins/hoster/XVideosCom.py @@ -7,12 +7,13 @@ from module.plugins.internal.Hoster import Hoster class XVideosCom(Hoster): - __name = "XVideos.com" + __name__ = "XVideos.com" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" __pattern__ = r'http://(?:www\.)?xvideos\.com/video(\d+)' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """XVideos.com hoster plugin""" __license__ = "GPLv3" @@ -23,6 +24,6 @@ class XVideosCom(Hoster): site = self.load(pyfile.url) pyfile.name = "%s (%s).flv" % ( re.search(r"<h2>([^<]+)<span", site).group(1), - re.match(self.__pattern, pyfile.url).group(1), + re.match(self.__pattern__, pyfile.url).group(1), ) self.download(urllib.unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) diff --git a/module/plugins/hoster/XdadevelopersCom.py b/module/plugins/hoster/XdadevelopersCom.py index a8f15f31a..a5d2011fd 100644 --- a/module/plugins/hoster/XdadevelopersCom.py +++ b/module/plugins/hoster/XdadevelopersCom.py @@ -9,13 +9,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class XdadevelopersCom(SimpleHoster): - __name = "XdadevelopersCom" + __name__ = "XdadevelopersCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Xda-developers.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py index 1cee6f5df..e107caf51 100644 --- a/module/plugins/hoster/Xdcc.py +++ b/module/plugins/hoster/Xdcc.py @@ -14,7 +14,7 @@ from module.utils import save_join as fs_join class Xdcc(Hoster): - __name = "Xdcc" + __name__ = "Xdcc" __type__ = "hoster" __version__ = "0.34" __status__ = "testing" @@ -35,7 +35,7 @@ class Xdcc(Hoster): def process(self, pyfile): #: Change request type - self.req = self.pyload.requestFactory.getRequest(self.__name__, type="XDCC") + self.req = self.pyload.requestFactory.getRequest(self.classname, type="XDCC") self.pyfile = pyfile for _i in xrange(0, 3): diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py index 9f71927ac..4e582219d 100644 --- a/module/plugins/hoster/YadiSk.py +++ b/module/plugins/hoster/YadiSk.py @@ -8,12 +8,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class YadiSk(SimpleHoster): - __name = "YadiSk" + __name__ = "YadiSk" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" __pattern__ = r'https?://yadi\.sk/d/[\w\-]+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Yadi.sk hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index 1d9f7433c..11f907e33 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -8,13 +8,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class YibaishiwuCom(SimpleHoster): - __name = "YibaishiwuCom" + __name__ = "YibaishiwuCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """115.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py index 74636bf3c..060b196a6 100644 --- a/module/plugins/hoster/YoupornCom.py +++ b/module/plugins/hoster/YoupornCom.py @@ -6,12 +6,13 @@ from module.plugins.internal.Hoster import Hoster class YoupornCom(Hoster): - __name = "YoupornCom" + __name__ = "YoupornCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Youporn.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py index 2c27032f9..b03f574a1 100644 --- a/module/plugins/hoster/YourfilesTo.py +++ b/module/plugins/hoster/YourfilesTo.py @@ -7,12 +7,13 @@ from module.plugins.internal.Hoster import Hoster class YourfilesTo(Hoster): - __name = "YourfilesTo" + __name__ = "YourfilesTo" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" __pattern__ = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Youfiles.to hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index ed6a42b71..47317a029 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -11,13 +11,14 @@ from module.utils import html_unescape class YoutubeCom(Hoster): - __name = "YoutubeCom" + __name__ = "YoutubeCom" __type__ = "hoster" __version__ = "0.46" __status__ = "testing" __pattern__ = r'https?://(?:[^/]*\.)?(youtu\.be/|youtube\.com/watch\?(?:.*&)?v=)\w+' - __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting" , "hd" ), + __config__ = [("activated", "bool", "Activated", True), + ("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 ), diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 8bd48819a..0eb2aa06b 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -8,12 +8,13 @@ from module.plugins.internal.Hoster import Hoster # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/) class ZDF(Hoster): - __name = "ZDF Mediathek" + __name__ = "ZDF Mediathek" __type__ = "hoster" __version__ = "0.84" __status__ = "testing" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """ZDF.de hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py index a5e106c94..b5dd66769 100644 --- a/module/plugins/hoster/ZShareNet.py +++ b/module/plugins/hoster/ZShareNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo class ZShareNet(DeadHoster): - __name = "ZShareNet" + __name__ = "ZShareNet" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/ZahikiNet.py b/module/plugins/hoster/ZahikiNet.py index dcd2fbe7a..fe1b8e0eb 100644 --- a/module/plugins/hoster/ZahikiNet.py +++ b/module/plugins/hoster/ZahikiNet.py @@ -4,12 +4,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ZahikiNet(SimpleHoster): - __name = "ZahikiNet" + __name__ = "ZahikiNet" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?zahiki\.net/\w+/.+' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Zahiki.net hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index b205c893f..684221904 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -6,13 +6,14 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class ZeveraCom(MultiHoster): - __name = "ZeveraCom" + __name__ = "ZeveraCom" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated", "bool", "Activated", True), + ("use_premium" , "bool", "Use premium account if available" , True), ("revertfailed", "bool", "Revert to standard download if fails", True)] __description__ = """Zevera.com multi-hoster plugin""" diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 2ac4a850d..7b25d3ff9 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -10,13 +10,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ZippyshareCom(SimpleHoster): - __name = "ZippyshareCom" + __name__ = "ZippyshareCom" __type__ = "hoster" __version__ = "0.83" __status__ = "testing" __pattern__ = r'http://www\d{0,3}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated", "bool", "Activated", True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Zippyshare.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py index 410a02671..8b80a0d5c 100644 --- a/module/plugins/internal/Account.py +++ b/module/plugins/internal/Account.py @@ -11,7 +11,7 @@ from module.utils import compare_time, lock class Account(Plugin): - __name = "Account" + __name__ = "Account" __type__ = "account" __version__ = "0.61" __status__ = "testing" @@ -134,7 +134,7 @@ class Account(Plugin): self.log_info(_("Relogin user `%s`...") % self.user) self.clean() - self.req = self.pyload.requestFactory.getRequest(self.__name__, self.user) + self.req = self.pyload.requestFactory.getRequest(self.classname, self.user) self.sync() @@ -335,7 +335,7 @@ class Account(Plugin): 'premium' : None, 'timestamp' : 0, 'trafficleft': None, - 'type' : self.__name, + 'type' : self.__name__, 'valid' : None, 'validuntil' : None} @@ -451,7 +451,7 @@ class Account(Plugin): if not self.logged: self.relogin() else: - self.req = self.pyload.requestFactory.getRequest(self.__name__, self.user) + self.req = self.pyload.requestFactory.getRequest(self.classname, self.user) return True diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py index 12a4aed95..e41325a80 100644 --- a/module/plugins/internal/Addon.py +++ b/module/plugins/internal/Addon.py @@ -21,8 +21,7 @@ def threaded(fn): class Addon(Plugin): - __name = "Addon" - __type = "addon" + __name__ = "Addon" __type__ = "hook" #@TODO: Change to `addon` in 0.4.10 __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py index 578b12f7f..6f0a902f3 100644 --- a/module/plugins/internal/Base.py +++ b/module/plugins/internal/Base.py @@ -45,13 +45,14 @@ def check_abort(fn): class Base(Plugin): - __name = "Base" + __name__ = "Base" __type__ = "base" __version__ = "0.11" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium", "bool", "Use premium account if available", True)] + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium", "bool", "Use premium account if available", True)] __description__ = """Base plugin for Hoster and Crypter""" __license__ = "GPLv3" @@ -114,8 +115,7 @@ class Base(Plugin): @classmethod def get_info(cls, url="", html=""): - url = fixurl(url, unquote=True) - + url = fixurl(url, unquote=True) info = {'name' : parse_name(url), 'pattern': {}, 'size' : 0, @@ -123,7 +123,7 @@ class Base(Plugin): 'url' : replace_patterns(url, cls.URL_REPLACEMENTS)} try: - info['pattern'] = re.match(cls.__pattern, url).groupdict() + info['pattern'] = re.match(cls.__pattern__, url).groupdict() except Exception: pass @@ -170,10 +170,10 @@ class Base(Plugin): pass if self.account: - self.req = self.pyload.requestFactory.getRequest(self.__name__, self.account.user) + self.req = self.pyload.requestFactory.getRequest(self.classname, self.account.user) self.premium = self.account.info['data']['premium'] #@NOTE: Avoid one unnecessary get_info call by `self.account.premium` here else: - self.req = self.pyload.requestFactory.getRequest(self.__name__) + self.req = self.pyload.requestFactory.getRequest(self.classname) self.premium = False self.setup_base() @@ -182,7 +182,7 @@ class Base(Plugin): def load_account(self): if not self.account: - self.account = self.pyload.accountManager.getAccountPlugin(self.__name__) + self.account = self.pyload.accountManager.getAccountPlugin(self.classname) if not self.account: self.account = False @@ -209,7 +209,7 @@ class Base(Plugin): self.pyfile.setStatus("starting") self.log_debug("PROCESS URL " + self.pyfile.url, - "PLUGIN VERSION %s" % self.__version) + "PLUGIN VERSION %s" % self.__version__) self.process(self.pyfile) @@ -463,7 +463,7 @@ class Base(Plugin): except Exception: #: Bad bad bad... rewrite this part in 0.4.10 res = self.load(url, just_header=True, - req=self.pyload.requestFactory.getRequest(self.__name__)) + req=self.pyload.requestFactory.getRequest(self.classname)) header = {'code': req.code} for line in res.splitlines(): diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py index 070621249..a8f48b5e4 100644 --- a/module/plugins/internal/Captcha.py +++ b/module/plugins/internal/Captcha.py @@ -9,7 +9,7 @@ from module.plugins.internal.Plugin import Plugin class Captcha(Plugin): - __name = "Captcha" + __name__ = "Captcha" __type__ = "captcha" __version__ = "0.46" __status__ = "testing" @@ -38,8 +38,8 @@ class Captcha(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - self.plugin.__name, - (self.__name,) + messages) + self.plugin.__name__, + (self.__name__,) + messages) def recognize(self, image): diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py index 6870e4d81..20dc60427 100644 --- a/module/plugins/internal/CaptchaService.py +++ b/module/plugins/internal/CaptchaService.py @@ -4,7 +4,7 @@ from module.plugins.internal.Captcha import Captcha class CaptchaService(Captcha): - __name = "CaptchaService" + __name__ = "CaptchaService" __type__ = "captcha" __version__ = "0.32" __status__ = "testing" @@ -23,7 +23,7 @@ class CaptchaService(Captcha): if self.detect_key(data): return self.key else: - self.fail(_("%s key not found") % self.__name) + self.fail(_("%s key not found") % self.__name__) #@TODO: Recheck in 0.4.10, html is now pyfile.data @@ -31,7 +31,7 @@ class CaptchaService(Captcha): if hasattr(self.plugin, "html") and self.plugin.html: return self.plugin.html else: - self.fail(_("%s data not found") % self.__name) + self.fail(_("%s data not found") % self.__name__) def detect_key(self, data=None): diff --git a/module/plugins/internal/Container.py b/module/plugins/internal/Container.py index ffae0a990..96c7a450c 100644 --- a/module/plugins/internal/Container.py +++ b/module/plugins/internal/Container.py @@ -11,12 +11,13 @@ from module.utils import save_join as fs_join class Container(Crypter): - __name = "Container" + __name__ = "Container" __type__ = "container" __version__ = "0.07" __status__ = "testing" __pattern__ = r'^unmatchable$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Base container decrypter plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 151d66860..77b5d74e9 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -6,13 +6,14 @@ from module.utils import save_path as safe_filename class Crypter(Base): - __name = "Crypter" + __name__ = "Crypter" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), #: Overrides pyload.config.get("general", "folder_per_package") ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py index 911a7373b..28ae6ffdb 100644 --- a/module/plugins/internal/DeadCrypter.py +++ b/module/plugins/internal/DeadCrypter.py @@ -4,12 +4,13 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo class DeadCrypter(Crypter): - __name = "DeadCrypter" + __name__ = "DeadCrypter" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" __pattern__ = r'^unmatchable$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Crypter is no longer available""" __license__ = "GPLv3" diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py index 2aeceb52f..b7c90ffee 100644 --- a/module/plugins/internal/DeadHoster.py +++ b/module/plugins/internal/DeadHoster.py @@ -4,12 +4,13 @@ from module.plugins.internal.Hoster import Hoster, create_getInfo class DeadHoster(Hoster): - __name = "DeadHoster" + __name__ = "DeadHoster" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" __pattern__ = r'^unmatchable$' + __config__ = [("activated", "bool", "Activated", True)] __description__ = """Hoster is no longer available""" __license__ = "GPLv3" diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py index 7933a33a6..3ab5d6a0d 100644 --- a/module/plugins/internal/Extractor.py +++ b/module/plugins/internal/Extractor.py @@ -21,7 +21,7 @@ class PasswordError(Exception): class Extractor(Plugin): - __name = "Extractor" + __name__ = "Extractor" __type__ = "extractor" __version__ = "0.35" __status__ = "testing" @@ -116,8 +116,8 @@ class Extractor(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - self.plugin.__name, - (self.__name,) + messages) + self.plugin.__name__, + (self.__name__,) + messages) def verify(self, password=None): diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index 00bc3a4dd..b233f8755 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -11,13 +11,14 @@ from module.utils import fs_decode, fs_encode, save_join as fs_join, save_path a class Hoster(Base): - __name = "Hoster" + __name__ = "Hoster" __type__ = "hoster" __version__ = "0.37" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("fallback_premium", "bool", "Fallback to free download if premium fails", True), ("chk_filesize" , "bool", "Check file size" , True)] @@ -83,7 +84,7 @@ class Hoster(Base): try: self.log_debug("PROCESS URL " + self.pyfile.url, - "PLUGIN VERSION %s" % self.__version) #@TODO: Remove in 0.4.10 + "PLUGIN VERSION %s" % self.__version__) #@TODO: Remove in 0.4.10 self.process(self.pyfile) self.check_abort() diff --git a/module/plugins/internal/MultiCrypter.py b/module/plugins/internal/MultiCrypter.py index 8930fcb70..900f72589 100644 --- a/module/plugins/internal/MultiCrypter.py +++ b/module/plugins/internal/MultiCrypter.py @@ -4,13 +4,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class MultiCrypter(SimpleCrypter): - __name = "MultiCrypter" + __name__ = "MultiCrypter" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] @@ -20,7 +21,7 @@ class MultiCrypter(SimpleCrypter): def init(self): - self.PLUGIN_NAME = self.pyload.pluginManager.crypterPlugins[self.__name__]['name'] + self.PLUGIN_NAME = self.pyload.pluginManager.crypterPlugins[self.classname]['name'] def _log(self, level, plugintype, pluginname, messages): diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 314bc6f92..5655571b8 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): - __name = "MultiHoster" + __name__ = "MultiHoster" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("fallback_premium", "bool", "Fallback to free download if premium fails", True), ("chk_filesize" , "bool", "Check file size" , True), ("revertfailed" , "bool", "Revert to standard download if fails" , True)] @@ -30,7 +31,7 @@ class MultiHoster(SimpleHoster): def init(self): - self.PLUGIN_NAME = self.pyload.pluginManager.hosterPlugins[self.__name__]['name'] + self.PLUGIN_NAME = self.pyload.pluginManager.hosterPlugins[self.classname]['name'] def _log(self, level, plugintype, pluginname, messages): @@ -48,7 +49,7 @@ class MultiHoster(SimpleHoster): def prepare(self): #@TODO: Recheck in 0.4.10 - plugin = self.pyload.pluginManager.hosterPlugins[self.__name__] + plugin = self.pyload.pluginManager.hosterPlugins[self.classname] name = plugin['name'] module = plugin['module'] klass = getattr(module, name) @@ -56,7 +57,7 @@ class MultiHoster(SimpleHoster): self.get_info = klass.get_info if self.DIRECT_LINK is None: - direct_dl = self.__pattern != r'^unmatchable$' and re.match(self.__pattern, self.pyfile.url) + direct_dl = self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, self.pyfile.url) else: direct_dl = self.DIRECT_LINK @@ -105,8 +106,8 @@ class MultiHoster(SimpleHoster): self.restart(premium=False) elif self.get_config("revertfailed", True) and \ - self.pyload.pluginManager.hosterPlugins[self.__name__].get('new_module'): - hdict = self.pyload.pluginManager.hosterPlugins[self.__name__] + self.pyload.pluginManager.hosterPlugins[self.classname].get('new_module'): + hdict = self.pyload.pluginManager.hosterPlugins[self.classname] tmp_module = hdict['new_module'] tmp_name = hdict['new_name'] diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py index ca87f91a6..ccadbbcbc 100644 --- a/module/plugins/internal/OCR.py +++ b/module/plugins/internal/OCR.py @@ -18,7 +18,7 @@ from module.utils import save_join as fs_join class OCR(Plugin): - __name = "OCR" + __name__ = "OCR" __type__ = "ocr" __version__ = "0.20" __status__ = "testing" @@ -44,8 +44,8 @@ class OCR(Plugin): def _log(self, level, plugintype, pluginname, messages): return self.plugin._log(level, plugintype, - self.plugin.__name, - (self.__name,) + messages) + self.plugin.__name__, + (self.__name__,) + messages) def load_image(self, image): @@ -80,11 +80,11 @@ class OCR(Plugin): def run_tesser(self, subset=False, digits=True, lowercase=True, uppercase=True, pagesegmode=None): # tmpTif = tempfile.NamedTemporaryFile(suffix=".tif") try: - tmpTif = open(fs_join("tmp", "tmpTif_%s.tif" % self.__name__), "wb") + tmpTif = open(fs_join("tmp", "tmpTif_%s.tif" % self.classname), "wb") tmpTif.close() # tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt") - tmpTxt = open(fs_join("tmp", "tmpTxt_%s.txt" % self.__name__), "wb") + tmpTxt = open(fs_join("tmp", "tmpTxt_%s.txt" % self.classname), "wb") tmpTxt.close() except IOError, e: @@ -106,7 +106,7 @@ class OCR(Plugin): if subset and (digits or lowercase or uppercase): # tmpSub = tempfile.NamedTemporaryFile(suffix=".subset") - with open(fs_join("tmp", "tmpSub_%s.subset" % self.__name__), "wb") as tmpSub: + with open(fs_join("tmp", "tmpSub_%s.subset" % self.classname), "wb") as tmpSub: tmpSub.write("tessedit_char_whitelist ") if digits: diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index b2d563748..387f499fe 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -262,7 +262,7 @@ def chunks(iterable, size): class Plugin(object): __name__ = "Plugin" __type__ = "plugin" - __version__ = "0.55" + __version__ = "0.56" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -272,13 +272,14 @@ class Plugin(object): __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + def __init__(self, core): self._init(core) self.init() def __repr__(self): - return "<%(type)s %(name)s>" % {'type': self.__type.capitalize(), + return "<%(type)s %(name)s>" % {'type': self.__type__.capitalize(), 'name': self.classname} @@ -293,14 +294,6 @@ class Plugin(object): self.req = None #: Browser instance, see `network.Browser` self.last_html = None - #@TODO: Remove in 0.4.10 - for attr in ("name", "type", "version", "status", "pattern", - "config", "description", "license", "authors"): - if hasattr(self, "__%s" % attr): - continue - value = getattr(self, "__%s__" % attr) - setattr(self, "__%s" % attr, value) - def init(self): """ @@ -319,35 +312,35 @@ class Plugin(object): def log_debug(self, *args, **kwargs): - self._log("debug", self.__type, self.__name, args) + self._log("debug", self.__type__, self.__name__, args) if self.pyload.debug and kwargs.get('trace'): print "Traceback (most recent call last):" traceback.print_stack() def log_info(self, *args, **kwargs): - self._log("info", self.__type, self.__name, args) + self._log("info", self.__type__, self.__name__, args) if self.pyload.debug and kwargs.get('trace'): print "Traceback (most recent call last):" traceback.print_stack() def log_warning(self, *args, **kwargs): - self._log("warning", self.__type, self.__name, args) + self._log("warning", self.__type__, self.__name__, args) if self.pyload.debug and kwargs.get('trace'): print "Traceback (most recent call last):" traceback.print_stack() def log_error(self, *args, **kwargs): - self._log("error", self.__type, self.__name, args) + self._log("error", self.__type__, self.__name__, args) if self.pyload.debug and kwargs.get('trace', True): print "Traceback (most recent call last):" traceback.print_stack() def log_critical(self, *args, **kwargs): - self._log("critical", self.__type, self.__name, args) + self._log("critical", self.__type__, self.__name__, args) if kwargs.get('trace', True): print "Traceback (most recent call last):" traceback.print_stack() diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py index 5093167ae..f73e935e8 100644 --- a/module/plugins/internal/SevenZip.py +++ b/module/plugins/internal/SevenZip.py @@ -9,7 +9,7 @@ from module.utils import save_join as fs_join class SevenZip(UnRar): - __name = "SevenZip" + __name__ = "SevenZip" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index b436998ec..98afe8b4c 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -9,18 +9,19 @@ import time from module.network.HTTPRequest import BadHeader from module.network.RequestFactory import getURL as get_url from module.plugins.internal.Hoster import Hoster, create_getInfo, parse_fileInfo -from module.plugins.internal.Plugin import Fail, encode, parse_name, parse_time, replace_patterns, seconds_to_midnight, set_cookie, set_cookies -from module.utils import fixup, fs_encode, parseFileSize as parse_size +from module.plugins.internal.Plugin import Fail, encode, parse_name, parse_size, parse_time, replace_patterns, seconds_to_midnight, set_cookie, set_cookies +from module.utils import fixup, fs_encode class SimpleHoster(Hoster): - __name = "SimpleHoster" + __name__ = "SimpleHoster" __type__ = "hoster" __version__ = "1.97" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("fallback_premium", "bool", "Fallback to free download if premium fails", True), ("chk_filesize" , "bool", "Check file size" , True)] @@ -223,8 +224,8 @@ class SimpleHoster(Hoster): self.LINK_PREMIUM_PATTERN = self.LINK_PATTERN if self.LEECH_HOSTER: - pattern = self.pyload.pluginManager.hosterPlugins[self.__name__]['pattern'] - if self.__pattern is not pattern and re.match(self.__pattern, self.pyfile.url) is None: + pattern = self.pyload.pluginManager.hosterPlugins[self.classname]['pattern'] + if self.__pattern__ is not pattern and re.match(self.__pattern__, self.pyfile.url) is None: self.leech_dl = True if self.leech_dl: diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index e625dce11..6f85c286a 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -21,7 +21,7 @@ def renice(pid, value): class UnRar(Extractor): - __name = "UnRar" + __name__ = "UnRar" __version__ = "1.27" __status__ = "testing" @@ -56,7 +56,7 @@ class UnRar(Extractor): p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() - # cls.__name = "RAR" + # cls.__name__ = "RAR" cls.REPAIR = True except OSError: diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index f71473ba2..87cbd568a 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -10,7 +10,7 @@ from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, class UnZip(Extractor): - __name = "UnZip" + __name__ = "UnZip" __version__ = "1.16" __status__ = "testing" diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py index 3b795257f..4c3f35c2b 100644 --- a/module/plugins/internal/XFSAccount.py +++ b/module/plugins/internal/XFSAccount.py @@ -11,7 +11,7 @@ from module.plugins.internal.Plugin import parse_html_form, set_cookie class XFSAccount(Account): - __name = "XFSAccount" + __name__ = "XFSAccount" __type__ = "account" __version__ = "0.50" __status__ = "testing" diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py index 88a435178..da9c9cff7 100644 --- a/module/plugins/internal/XFSCrypter.py +++ b/module/plugins/internal/XFSCrypter.py @@ -5,13 +5,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class XFSCrypter(SimpleCrypter): - __name = "XFSCrypter" + __name__ = "XFSCrypter" __type__ = "crypter" __version__ = "0.18" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] @@ -49,7 +50,7 @@ class XFSCrypter(SimpleCrypter): if self.account: account = self.account else: - account_name = self.__name__.rstrip("Folder") + account_name = self.classname.rstrip("Folder") account = self.pyload.accountManager.getAccountPlugin(account_name) if account and hasattr(account, "PLUGIN_DOMAIN") and account.PLUGIN_DOMAIN: diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py index 0d6a61b33..63b53be41 100644 --- a/module/plugins/internal/XFSHoster.py +++ b/module/plugins/internal/XFSHoster.py @@ -11,13 +11,14 @@ from module.utils import html_unescape class XFSHoster(SimpleHoster): - __name = "XFSHoster" + __name__ = "XFSHoster" __type__ = "hoster" __version__ = "0.65" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("fallback_premium", "bool", "Fallback to free download if premium fails", True), ("chk_filesize" , "bool", "Check file size" , True)] @@ -80,7 +81,7 @@ class XFSHoster(SimpleHoster): if self.account: account = self.account else: - account = self.pyload.accountManager.getAccountPlugin(self.__name__) + account = self.pyload.accountManager.getAccountPlugin(self.classname) if account and hasattr(account, "PLUGIN_DOMAIN") and account.PLUGIN_DOMAIN: self.PLUGIN_DOMAIN = account.PLUGIN_DOMAIN |