diff options
Diffstat (limited to 'module/plugins')
463 files changed, 586 insertions, 663 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index 12d0582a8..cf28665ca 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 5c7ac9fff..b96af61e9 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 d903f020c..b8f55db55 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 e8028b9d0..34f4e2bc0 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 6e11064a6..5c16ff2ee 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 3410af002..979f2977e 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 821975ef0..b40a79243 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 084aa79a6..584cec4ea 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 fd02abe0f..1dfcb30bd 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 50d849a98..f7c5fc562 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 35df3f939..1b542b836 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 9340f49e6..c1abfeb14 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 e5a05cd7f..8ff0b2c2d 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 6b352e40e..50564aedb 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 83a02d76b..a11061d2d 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 68c65bd3f..5f28a02d6 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 8e5f437b3..78b69a5be 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 86183f4d3..4d474fedc 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 d80a8b9d6..32a50cee8 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 0f8f709c6..6dda0c786 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 230aa9939..b6e2d7c0a 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 0bd0b60cf..08373a717 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 96bdebd81..76b35e939 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 d843dd605..c0f13e0eb 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 551a7b8e5..d729d4789 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 bc56d4b96..b4a683050 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 05e75f326..a81b45104 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -5,7 +5,7 @@ from module.plugins.internal.Plugin import set_cookie class FourSharedCom(Account): - __name__ = "FourSharedCom" + __name = "4shared" __type__ = "account" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 8cb0436fc..8c261046e 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 5e214db35..c11e76eb6 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 e692394ef..2143a2b67 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 d73b557ef..0096e034e 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 b0cd87938..d96ba9399 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 3b39b7da6..d722e0e52 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 261b3b240..421c3bcdd 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 a5920f4a4..dadcea0ab 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 8b757de61..4d0a8b548 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 316332fd9..98a4b8755 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 95bc57640..cbe1b51af 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 494f2938f..f5eda553e 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 f7350e547..cbdf92da1 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 6953f311c..def388b44 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 46375716f..e3c6a0d8e 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 050e3e4c6..09791a184 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 d8291e0e2..6108a309d 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 9b4fda9f7..467c5a018 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 1594a2b6a..14d300d34 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 1ede88574..978f75df8 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 16fa57948..0fe1137f3 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 eff112a2f..c07166ad8 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 0b9e67a7c..f6ce7018d 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 f8236c978..6f5d5d3c7 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 65ac8d4fc..715096bf2 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 1506ec315..13a90c528 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 3375207d9..228202c45 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 c19396854..bbb913081 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 56d9c16a8..d87f4f937 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class OneFichierCom(Account): - __name__ = "OneFichierCom" + __name = "1fichier.com" __type__ = "account" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index 02d0d2649..a82dcf689 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 74859d8a5..35dc1d3ed 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 2dc9b8a71..b35b06c9f 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 4da71f41b..ca34836fc 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 19cde51c4..e77f29c1e 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 3b814debc..ea179dc76 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 fc17622b0..58969cb85 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 a28c61b36..faaf7e134 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 ea6da4c4b..6160b8504 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 c11eb9214..a192acffc 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 0004c0f79..52712478a 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 63ef62da0..4fcbe80cf 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 4ff3f15a8..6414e564f 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 84b786bac..4a822b399 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 632b2bff8..7eabc50e4 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 e3f2dbc4f..47ba9b929 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 a1675b654..0ec6d0c98 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 b8ddbe34d..3283981e9 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 f5d213ecd..5a91a8b10 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 2be8782ce..95a6b71a8 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 bd56dd5ec..dfb99b434 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 1c3da5269..4204ac136 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 54dd8e2fe..4435c6ded 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 c3edd0c09..3b2fe9a73 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 d826e5a3d..259f01b90 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 8380099e1..5b95878d7 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 eefa1f3a0..024f20576 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 dbad01858..2fcde9950 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 1e92195a1..096b0503d 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 c5e684033..63aa22856 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 6c7103b21..0eeeafcfa 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 8df558e2a..75c880119 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 e54515faf..2ca8bb1d0 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 484ea06ce..115a33109 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 6987bc0cc..61bcb56cb 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 68797b7f0..966718ab6 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 695dd79cd..faf6bef04 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 c94ad6db7..4e187b17a 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 b10d2c399..2fbd28011 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 7dc51565f..bafcb8950 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 dc04a04c8..7f2cb739f 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 12f123c41..192628cba 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 a9ccecf3c..4a8ffef2b 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 50174684d..62ae14a67 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 379956be6..c1927e41e 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 19db6c4cd..29f669fce 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 6629656b2..cab99cb62 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 3126d69a5..49458fcb9 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -11,7 +11,7 @@ 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" diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index c92ba64c4..b924b0c6a 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -12,7 +12,7 @@ from module.utils import decode, fs_encode class DLC(Container): - __name__ = "DLC" + __name = "DLC" __type__ = "container" __version__ = "0.26" __status__ = "testing" diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index cedb2b605..c9b3eea8a 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class RSDF(Container): - __name__ = "RSDF" + __name = "RSDF" __type__ = "container" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 8c9f99c27..f8ff3ebfa 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -7,7 +7,7 @@ from module.utils import fs_encode class TXT(Container): - __name__ = "TXT" + __name = "TXT" __type__ = "container" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index d7a51cb1c..c34313389 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class BitshareComFolder(SimpleCrypter): - __name__ = "BitshareComFolder" + __name = "BitshareCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py index 09acace63..3d40c9c0c 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 8d823d88d..847490786 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class ChipDe(Crypter): - __name__ = "ChipDe" + __name = "ChipDe" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index dc0cdfef2..79a52fbfa 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CloudzillaToFolder(SimpleHoster): - __name__ = "CloudzillaToFolder" + __name = "CloudzillaTo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index 81dfcd525..926396192 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class CrockoComFolder(SimpleCrypter): - __name__ = "CrockoComFolder" + __name = "CrockoCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index be0094747..1613232d1 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 cb41426d7..7728f236e 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class CzshareComFolder(Crypter): - __name__ = "CzshareComFolder" + __name = "CzshareCom" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py index 3f81c0485..de3dddfc3 100644 --- a/module/plugins/crypter/DailymotionComFolder.py +++ b/module/plugins/crypter/DailymotionComFolder.py @@ -9,7 +9,7 @@ from module.utils import save_join as fs_join class DailymotionComFolder(Crypter): - __name__ = "DailymotionComFolder" + __name = "DailymotionCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" @@ -102,4 +102,4 @@ class DailymotionComFolder(Crypter): p_videos = self.get_videos(p_id) p_folder = fs_join(self.pyload.config.get("general", "download_folder"), p_owner, p_name) self.log_debug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) - self.packages.append((p_name, p_videos, p_folder)) #: Folder is NOT recognized by pyload 0.4.9! + self.packages.append((p_name, p_videos, p_folder)) #@NOTE: Folder is NOT recognized by pyload 0.4.9! diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index e6e3c70a5..cec612deb 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DataHuFolder(SimpleCrypter): - __name__ = "DataHuFolder" + __name = "DataHu" __type__ = "crypter" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py index ffc9f1d01..c462db795 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__ = "DdlstorageComFolder" + __name = "DdlstorageCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 0c795279e..2ea6a3655 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DepositfilesComFolder(SimpleCrypter): - __name__ = "DepositfilesComFolder" + __name = "DepositfilesCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 8ecc635ec..631032018 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class Dereferer(SimpleCrypter): - __name__ = "Dereferer" + __name = "Dereferer" __type__ = "crypter" __version__ = "0.19" __status__ = "testing" @@ -31,11 +31,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.__name__]['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 30f97f4fc..92952c57d 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DevhostStFolder(SimpleCrypter): - __name__ = "DevhostStFolder" + __name = "DevhostSt" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index ac45ee4c3..fccd385f5 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class DlProtectCom(SimpleCrypter): - __name__ = "DlProtectCom" + __name = "DlProtectCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index c9269b05e..5bb7208af 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class DuckCryptInfo(Crypter): - __name__ = "DuckCryptInfo" + __name = "DuckCryptInfo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" @@ -28,7 +28,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 +39,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 f0e9b8c96..0cc810ea6 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__ = "DuploadOrgFolder" + __name = "DuploadOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 0c070b6f1..96c546ebc 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): - __name__ = "EasybytezComFolder" + __name = "EasybytezCom" __type__ = "crypter" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 957e1efb2..8bf5aa787 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -6,7 +6,7 @@ from module.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name__ = "EmbeduploadCom" + __name = "EmbeduploadCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index 5d0e26329..0c072d07f 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__ = "FilebeerInfoFolder" + __name = "FilebeerInfo" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py index 6c7b5be15..89495e8c7 100644 --- a/module/plugins/crypter/FilecloudIoFolder.py +++ b/module/plugins/crypter/FilecloudIoFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilecloudIoFolder(SimpleCrypter): - __name__ = "FilecloudIoFolder" + __name = "FilecloudIo" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 51fdcd30b..720d20e01 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -15,7 +15,7 @@ from module.plugins.captcha.SolveMedia import SolveMedia class FilecryptCc(Crypter): - __name__ = "FilecryptCc" + __name = "FilecryptCc" __type__ = "crypter" __version__ = "0.20" __status__ = "testing" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index aec73f33c..e7d6b4771 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilefactoryComFolder(SimpleCrypter): - __name__ = "FilefactoryComFolder" + __name = "FilefactoryCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py index 4814c5933..9151e43c3 100644 --- a/module/plugins/crypter/FilerNetFolder.py +++ b/module/plugins/crypter/FilerNetFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilerNetFolder(SimpleCrypter): - __name__ = "FilerNetFolder" + __name = "FilerNet" __type__ = "crypter" __version__ = "0.43" __status__ = "testing" diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 44de55581..7a64ac451 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.Crypter import Crypter class FileserveComFolder(Crypter): - __name__ = "FileserveComFolder" + __name = "FileserveCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index 7ebba702a..c749c74b2 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__ = "FilesonicComFolder" + __name = "FilesonicCom" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 5fcd72c64..2dff23b11 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FilestubeCom(SimpleCrypter): - __name__ = "FilestubeCom" + __name = "FilestubeCom" __type__ = "crypter" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py index 6603a3542..4edb85371 100644 --- a/module/plugins/crypter/FiletramCom.py +++ b/module/plugins/crypter/FiletramCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FiletramCom(SimpleCrypter): - __name__ = "FiletramCom" + __name = "FiletramCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py index 84b6cf34a..47a9d96e4 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__ = "FiredriveComFolder" + __name = "FiredriveCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index 65a2ac788..a2fdb99d1 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -9,7 +9,7 @@ from module.plugins.internal.Crypter import Crypter class FourChanOrg(Crypter): - __name__ = "FourChanOrg" + __name = "4chan" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index e939fe467..7ea7ae6ad 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreakhareComFolder(SimpleCrypter): - __name__ = "FreakhareComFolder" + __name = "FreakhareCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index 350f89202..8920c6c15 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FreetexthostCom(SimpleCrypter): - __name__ = "FreetexthostCom" + __name = "FreetexthostCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index f4941007a..6da2cccf9 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FshareVnFolder(SimpleCrypter): - __name__ = "FshareVnFolder" + __name = "FshareVn" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/FurLy.py b/module/plugins/crypter/FurLy.py index 595fcb34d..9ff8ca218 100644 --- a/module/plugins/crypter/FurLy.py +++ b/module/plugins/crypter/FurLy.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class FurLy(SimpleCrypter): - __name__ = "FurLy" + __name = "FurLy" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index 2d423a1a9..9ea5b333e 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -8,7 +8,7 @@ import json class Go4UpCom(SimpleCrypter): - __name__ = "Go4UpCom" + __name = "Go4UpCom" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index 76a542408..8298701d3 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -5,7 +5,7 @@ from module.common.json_layer import json_loads class GooGl(SimpleCrypter): - __name__ = "GooGl" + __name = "GooGl" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py index e7a5bae2c..774e768f9 100644 --- a/module/plugins/crypter/GoogledriveComFolder.py +++ b/module/plugins/crypter/GoogledriveComFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class GoogledriveComFolder(SimpleCrypter): - __name__ = "GoogledriveCom" + __name = "GoogledriveCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 27075324d..23ec42064 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class HoerbuchIn(Crypter): - __name__ = "HoerbuchIn" + __name = "HoerbuchIn" __type__ = "crypter" __version__ = "0.62" __status__ = "testing" diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py index 1b2429f4a..a489e4309 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__ = "HotfileComFolder" + __name = "HotfileCom" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index 7d73b898f..bebdbef55 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 488979b48..a2bb4c9f7 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -5,7 +5,7 @@ from module.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name__ = "ImgurComAlbum" + __name = "ImgurComAlbum" __type__ = "crypter" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index e560306f5..b9107ef95 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class LetitbitNetFolder(Crypter): - __name__ = "LetitbitNetFolder" + __name = "LetitbitNet" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 3d09eeac2..8fff032a0 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -12,7 +12,7 @@ from module.utils import html_unescape class LinkCryptWs(Crypter): - __name__ = "LinkCryptWs" + __name = "LinkCryptWs" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" @@ -37,7 +37,7 @@ class LinkCryptWs(Crypter): def prepare(self): #: Init - self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') + self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 36b545de8..1cce479ac 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class LinkSaveIn(SimpleCrypter): - __name__ = "LinkSaveIn" + __name = "LinkSaveIn" __type__ = "crypter" __version__ = "2.06" __status__ = "testing" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index c16ec0b6e..589f21bd2 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiCrypter import MultiCrypter class LinkdecrypterCom(MultiCrypter): - __name__ = "LinkdecrypterCom" + __name = "LinkdecrypterCom" __type__ = "crypter" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index ecc92a8d3..49ca7e020 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -7,7 +7,7 @@ from module.plugins.internal.Crypter import Crypter class LixIn(Crypter): - __name__ = "LixIn" + __name = "LixIn" __type__ = "crypter" __version__ = "0.24" __status__ = "testing" @@ -29,7 +29,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 b25c9485a..93ed91450 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 98c63b9d4..03e6377d6 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 f90bc04ea..c541a0505 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class MediafireComFolder(Crypter): - __name__ = "MediafireComFolder" + __name = "MediafireCom" __type__ = "crypter" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 107746819..aefdd8532 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.Crypter import Crypter class MegaCoNzFolder(Crypter): - __name__ = "MegaCoNzFolder" + __name = "MegaCoNz" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" @@ -25,6 +25,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 8e7bcdf6b..11f9622c8 100644 --- a/module/plugins/crypter/MegaRapidCzFolder.py +++ b/module/plugins/crypter/MegaRapidCzFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MegaRapidCzFolder(SimpleCrypter): - __name__ = "MegaRapidCzFolder" + __name = "MegaRapidCz" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py index c0ae6d16a..2d21ff55b 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__ = "MegauploadComFolder" + __name = "MegauploadCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py index 53636cda3..6c582ed9a 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 fb228c3cd..183b4b472 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class MultiUpOrg(SimpleCrypter): - __name__ = "MultiUpOrg" + __name = "MultiUpOrg" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" @@ -26,7 +26,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 72e9b3a8b..10cc5a3d7 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class MultiloadCz(Crypter): - __name__ = "MultiloadCz" + __name = "MultiloadCz" __type__ = "crypter" __version__ = "0.42" __status__ = "testing" @@ -28,7 +28,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 358758b7a..325ffc153 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 dddffbbf2..756adc379 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -10,7 +10,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class NCryptIn(Crypter): - __name__ = "NCryptIn" + __name = "NCryptIn" __type__ = "crypter" __version__ = "1.37" __status__ = "testing" @@ -80,7 +80,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 5b992bf58..49cf3716a 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 0f0443355..431ed0104 100644 --- a/module/plugins/crypter/NitroflareComFolder.py +++ b/module/plugins/crypter/NitroflareComFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NitroflareComFolder(SimpleCrypter): - __name__ = "NitroflareComFolder" + __name = "NitroflareCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 4513440d6..a48672a45 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class NosvideoCom(SimpleCrypter): - __name__ = "NosvideoCom" + __name = "NosvideoCom" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py deleted file mode 100644 index 341359c5a..000000000 --- a/module/plugins/crypter/OneKhDe.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from module.plugins.internal.Crypter import Crypter -from module.utils import html_unescape - - -class OneKhDe(Crypter): - __name__ = "OneKhDe" - __type__ = "crypter" - __version__ = "0.13" - __status__ = "testing" - - __pattern__ = r'http://(?:www\.)?1kh\.de/f/' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] - - __description__ = """1kh.de decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org")] - - - def __init__(self, parent): - Crypter.__init__(self, parent) - self.parent = parent - - - def file_exists(self): - """ - Returns True or False - """ - return True - - - def proceed(self, url, location): - url = self.parent.url - self.html = self.load(url) - link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html) - for id in link_ids: - new_link = html_unescape( - re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.load("http://1kh.de/l/" + id)).group(1)) - self.urls.append(new_link) diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 563c984fc..ca6a92508 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__ = "OronComFolder" + __name = "OronCom" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index c8a7473f1..eeb605dd7 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class PastebinCom(SimpleCrypter): - __name__ = "PastebinCom" + __name = "PastebinCom" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" @@ -19,7 +19,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 0804f56d4..781b60166 100644 --- a/module/plugins/crypter/PastedCo.py +++ b/module/plugins/crypter/PastedCo.py @@ -6,7 +6,7 @@ import re class PastedCo(Crypter): - __name__ = "PastedCo" + __name = "PastedCo" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 10b6073e4..575e18427 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class QuickshareCzFolder(Crypter): - __name__ = "QuickshareCzFolder" + __name = "QuickshareCz" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index c8637279b..34d8e19b6 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 4ff13a276..3e40b554d 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -12,7 +12,7 @@ from module.utils import save_join as fs_join class RelinkUs(Crypter): - __name__ = "RelinkUs" + __name = "RelinkUs" __type__ = "crypter" __version__ = "3.14" __status__ = "testing" @@ -100,7 +100,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 a11ae2cd8..c90a67773 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -10,7 +10,7 @@ from module.plugins.captcha.SolveMedia import SolveMedia class SafelinkingNet(Crypter): - __name__ = "SafelinkingNet" + __name = "SafelinkingNet" __type__ = "crypter" __version__ = "0.17" __status__ = "testing" @@ -30,7 +30,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 4731e41f4..7247d3169 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 24a5060b9..6e224e694 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -4,7 +4,7 @@ import re from module.plugins.internal.Crypter import Crypter class SexuriaCom(Crypter): - __name__ = "SexuriaCom" + __name = "SexuriaCom" __type__ = "crypter" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py index 429d3f3e2..77331e065 100644 --- a/module/plugins/crypter/ShSt.py +++ b/module/plugins/crypter/ShSt.py @@ -7,7 +7,7 @@ import re class ShSt(Crypter): - __name__ = "ShSt" + __name = "ShSt" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index c189229ce..448ad3b15 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): - __name__ = "ShareLinksBiz" + __name = "ShareLinksBiz" __type__ = "crypter" __version__ = "1.18" __status__ = "testing" @@ -70,12 +70,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 bd35cfd8e..b8519bad5 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__ = "SharingmatrixComFolder" + __name = "SharingmatrixCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index 736d59720..ff1cb0c73 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__ = "SpeedLoadOrgFolder" + __name = "SpeedLoadOrg" __type__ = "crypter" __version__ = "0.31" __status__ = "testing" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 3a175cd87..79e41a66b 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 e85a8fbb7..6df634cf8 100644 --- a/module/plugins/crypter/TNTVillageScambioeticoOrg.py +++ b/module/plugins/crypter/TNTVillageScambioeticoOrg.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TNTVillageScambioeticoOrg(SimpleCrypter): - __name__ = "TNTVillageScambioeticoOrg" + __name = "TNTVillageScambioeticoOrg" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py index 2b9a8041f..d4d86ff3d 100644 --- a/module/plugins/crypter/TinyurlCom.py +++ b/module/plugins/crypter/TinyurlCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TinyurlCom(SimpleCrypter): - __name__ = "TinyurlCom" + __name = "TinyurlCom" __type__ = "crypter" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index f3fb19cb3..8ab613fef 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class TnyCz(SimpleCrypter): - __name__ = "TnyCz" + __name = "TnyCz" __type__ = "crypter" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 03ab004a3..9ecd958e1 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 3a36f5032..cd1a57691 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class TurbobitNetFolder(SimpleCrypter): - __name__ = "TurbobitNetFolder" + __name = "TurbobitNet" __type__ = "crypter" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 684fb1e46..f351707e5 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class TusfilesNetFolder(XFSCrypter): - __name__ = "TusfilesNetFolder" + __name = "TusfilesNet" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" @@ -25,7 +25,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 f2d0e7c17..c2b8e106a 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -5,7 +5,7 @@ from module.plugins.internal.Crypter import Crypter class UlozToFolder(Crypter): - __name__ = "UlozToFolder" + __name = "UlozTo" __type__ = "crypter" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py index 767e989d5..e1d29cbdf 100644 --- a/module/plugins/crypter/UploadableChFolder.py +++ b/module/plugins/crypter/UploadableChFolder.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadableChFolder(SimpleCrypter): - __name__ = "UploadableChFolder" + __name = "UploadableCh" __type__ = "crypter" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 53fb5e4b9..f1e217e92 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class UploadedToFolder(SimpleCrypter): - __name__ = "UploadedToFolder" + __name = "UploadedTo" __type__ = "crypter" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 7679836d2..90b7c5c6b 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 da1fa9bac..ffe08b30d 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__ = "WuploadComFolder" + __name = "WuploadCom" __type__ = "crypter" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index 615e9f224..aa65ccd12 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class XFileSharingProFolder(XFSCrypter): - __name__ = "XFileSharingProFolder" + __name = "XFileSharingPro" __type__ = "crypter" __version__ = "0.14" __status__ = "testing" @@ -30,9 +30,9 @@ 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.__name__]['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 != '.') diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 458372d13..230988318 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -4,7 +4,7 @@ from module.plugins.internal.Crypter import Crypter class XupPl(Crypter): - __name__ = "XupPl" + __name = "XupPl" __type__ = "crypter" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py index 302f18ac0..a8d79d863 100644 --- a/module/plugins/crypter/YoutubeComFolder.py +++ b/module/plugins/crypter/YoutubeComFolder.py @@ -9,7 +9,7 @@ from module.utils import save_join as fs_join class YoutubeComFolder(Crypter): - __name__ = "YoutubeComFolder" + __name = "YoutubeCom" __type__ = "crypter" __version__ = "1.03" __status__ = "testing" @@ -95,7 +95,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 60e9297e1..59c212b36 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 aa7a028a5..4ae0c2ea6 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 c68e86c77..fcdca4e43 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 a5e424532..2e1831860 100644 --- a/module/plugins/hooks/BypassCaptcha.py +++ b/module/plugins/hooks/BypassCaptcha.py @@ -4,7 +4,7 @@ import pycurl from module.network.HTTPRequest import BadHeader from module.network.RequestFactory import getRequest as get_request -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded class BypassCaptchaException(Exception): @@ -25,8 +25,8 @@ class BypassCaptchaException(Exception): return "<BypassCaptchaException %s>" % self.err -class BypassCaptcha(Hook): - __name__ = "BypassCaptcha" +class BypassCaptcha(Addon): + __name = "BypassCaptcha" __type__ = "hook" __version__ = "0.08" __status__ = "testing" @@ -111,7 +111,7 @@ class BypassCaptcha(Hook): self._process_captcha(task) else: - self.log_info(_("Your %s account has not enough credits") % self.__name__) + self.log_info(_("Your account has not enough credits")) def captcha_correct(self, task): diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py index 61b496ec6..16a76a792 100644 --- a/module/plugins/hooks/Captcha9Kw.py +++ b/module/plugins/hooks/Captcha9Kw.py @@ -8,11 +8,11 @@ import time from base64 import b64encode from module.network.HTTPRequest import BadHeader -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded -class Captcha9Kw(Hook): - __name__ = "Captcha9Kw" +class Captcha9Kw(Addon): + __name = "Captcha9Kw" __type__ = "hook" __version__ = "0.30" __status__ = "testing" diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py index a8abb1600..642bd23e6 100644 --- a/module/plugins/hooks/CaptchaBrotherhood.py +++ b/module/plugins/hooks/CaptchaBrotherhood.py @@ -14,7 +14,7 @@ except ImportError: import Image from module.network.RequestFactory import getRequest as get_request -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded class CaptchaBrotherhoodException(Exception): @@ -35,8 +35,8 @@ class CaptchaBrotherhoodException(Exception): return "<CaptchaBrotherhoodException %s>" % self.err -class CaptchaBrotherhood(Hook): - __name__ = "CaptchaBrotherhood" +class CaptchaBrotherhood(Addon): + __name = "CaptchaBrotherhood" __type__ = "hook" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py index 4d0493212..4b351f76f 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 13975ecb5..8f2c1f36c 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" @@ -37,7 +37,7 @@ class ClickNLoad(Addon): ("extern" , "bool" , "Listen for external connections", True ), ("dest" , "queue;collector", "Add packages to" , "collector")] - __description__ = """Click'n'Load hook plugin""" + __description__ = """Click'n'Load support""" __license__ = "GPLv3" __authors__ = [("RaNaN" , "RaNaN@pyload.de" ), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py index d3d00affa..c1f33be6d 100644 --- a/module/plugins/hooks/DeathByCaptcha.py +++ b/module/plugins/hooks/DeathByCaptcha.py @@ -11,7 +11,7 @@ from base64 import b64encode from module.common.json_layer import json_loads from module.network.HTTPRequest import BadHeader from module.network.RequestFactory import getRequest as get_request -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded class DeathByCaptchaException(Exception): @@ -48,8 +48,8 @@ class DeathByCaptchaException(Exception): return "<DeathByCaptchaException %s>" % self.err -class DeathByCaptcha(Hook): - __name__ = "DeathByCaptcha" +class DeathByCaptcha(Addon): + __name = "DeathByCaptcha" __type__ = "hook" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index e72439c0a..489591d1a 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 8454438a1..f93410bc3 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 cdb76a49d..993a66067 100644 --- a/module/plugins/hooks/ExpertDecoders.py +++ b/module/plugins/hooks/ExpertDecoders.py @@ -9,11 +9,11 @@ from base64 import b64encode from module.network.HTTPRequest import BadHeader from module.network.RequestFactory import getRequest as get_request -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded -class ExpertDecoders(Hook): - __name__ = "ExpertDecoders" +class ExpertDecoders(Addon): + __name = "ExpertDecoders" __type__ = "hook" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index 3459eb3aa..694da4262 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 034a4b81a..48ac029e5 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 c7631a1fc..8863af871 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 16640df0b..9760d5afa 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 a22ddce7b..5fec52eb7 100644 --- a/module/plugins/hooks/ImageTyperz.py +++ b/module/plugins/hooks/ImageTyperz.py @@ -8,7 +8,7 @@ import re from base64 import b64encode from module.network.RequestFactory import getRequest as get_request -from module.plugins.internal.Hook import Hook, threaded +from module.plugins.internal.Addon import Addon, threaded class ImageTyperzException(Exception): @@ -29,8 +29,8 @@ class ImageTyperzException(Exception): return "<ImageTyperzException %s>" % self.err -class ImageTyperz(Hook): - __name__ = "ImageTyperz" +class ImageTyperz(Addon): + __name = "ImageTyperz" __type__ = "hook" __version__ = "0.08" __status__ = "testing" @@ -127,7 +127,7 @@ class ImageTyperz(Hook): self._process_captcha(task) else: - self.log_info(_("Your %s account has not enough credits") % self.__name__) + self.log_info(_("Your account has not enough credits")) def captcha_invalid(self, task): diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py index f4c48cfa9..f33bcd015 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 2fe780a0c..077f132d4 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__ = "LinkdecrypterComHook" + __name = "LinkdecrypterCom" __type__ = "hook" __version__ = "1.08" __status__ = "testing" diff --git a/module/plugins/hooks/LogMarker.py b/module/plugins/hooks/LogMarker.py index 0efab602f..b4269164a 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 a7d6fc7ba..f25380c18 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 90e8a60d2..3ca3bf74d 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 74d570425..f85ad51fd 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 891d2db6d..fcf6a4a9d 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 7d3e24661..7a1ad1659 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: diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py index d467b8a01..a0a2681aa 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/UserAgentSwitcher.py b/module/plugins/hooks/UserAgentSwitcher.py index 52f542268..4e714bf60 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 4343d16f2..62a8619c2 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 602010586..ccb8980ed 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -2,11 +2,11 @@ import re -from module.plugins.internal.Hook import Hook +from module.plugins.internal.Addon import Addon -class XFileSharingPro(Hook): - __name__ = "XFileSharingPro" +class XFileSharingPro(Addon): + __name = "XFileSharingPro" __type__ = "hook" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py index 811e2f5f4..0103fdcd6 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 753712d5c..557a50b60 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -9,7 +9,7 @@ from module.utils import parseFileSize as parse_size class AlldebridCom(MultiHoster): - __name__ = "AlldebridCom" + __name = "AlldebridCom" __type__ = "hoster" __version__ = "0.48" __status__ = "testing" diff --git a/module/plugins/hoster/AndroidfilehostCom.py b/module/plugins/hoster/AndroidfilehostCom.py index 38f3b8392..5de7b49bf 100644 --- a/module/plugins/hoster/AndroidfilehostCom.py +++ b/module/plugins/hoster/AndroidfilehostCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class AndroidfilehostCom(SimpleHoster): - __name__ = "AndroidfilehostCom" + __name = "AndroidfilehostCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index 1952309fe..d7fa48e08 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -10,7 +10,7 @@ from module.plugins.internal.Hoster import Hoster class BasePlugin(Hoster): - __name__ = "BasePlugin" + __name = "BasePlugin" __type__ = "hoster" __version__ = "0.46" __status__ = "testing" diff --git a/module/plugins/hoster/BasketbuildCom.py b/module/plugins/hoster/BasketbuildCom.py index 9bbd0ea60..76ea0bffa 100644 --- a/module/plugins/hoster/BasketbuildCom.py +++ b/module/plugins/hoster/BasketbuildCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BasketbuildCom(SimpleHoster): - __name__ = "BasketbuildCom" + __name = "BasketbuildCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py index 6e9397d4f..8b88ad6a0 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 204c981c6..c01dba7bd 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BezvadataCz(SimpleHoster): - __name__ = "BezvadataCz" + __name = "BezvadataCz" __type__ = "hoster" __version__ = "0.30" __status__ = "testing" diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py index a142f4ab3..1342619d0 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 5b9abe7cc..118a0a833 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BitshareCom(SimpleHoster): - __name__ = "BitshareCom" + __name = "BitshareCom" __type__ = "hoster" __version__ = "0.56" __status__ = "testing" @@ -42,7 +42,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 +60,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 c33049e01..e7d6d3581 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 aceaa3461..bf748f54c 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -7,7 +7,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class CatShareNet(SimpleHoster): - __name__ = "CatShareNet" + __name = "CatShareNet" __type__ = "hoster" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index fa0bccba3..8983b4ab4 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 d9466c954..4bd4a495d 100644 --- a/module/plugins/hoster/CloudzillaTo.py +++ b/module/plugins/hoster/CloudzillaTo.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CloudzillaTo(SimpleHoster): - __name__ = "CloudzillaTo" + __name = "CloudzillaTo" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index f14ae0c71..e23bc5836 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class CramitIn(XFSHoster): - __name__ = "CramitIn" + __name = "CramitIn" __type__ = "hoster" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index 70f2be6fb..1a84ba920 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CrockoCom(SimpleHoster): - __name__ = "CrockoCom" + __name = "CrockoCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py index 8cb9f7851..56916e261 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 d61bb310d..252ce18fe 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -10,7 +10,7 @@ from module.utils import parseFileSize as parse_size class CzshareCom(SimpleHoster): - __name__ = "CzshareCom" + __name = "CzshareCom" __type__ = "hoster" __version__ = "1.05" __status__ = "testing" diff --git a/module/plugins/hoster/DailymotionCom.py b/module/plugins/hoster/DailymotionCom.py index 73e119c8c..051b09fc3 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,7 +42,7 @@ def get_info(urls): class DailymotionCom(Hoster): - __name__ = "DailymotionCom" + __name = "DailymotionCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" @@ -121,7 +121,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 c0f1e4aa4..41b5a008f 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataHu(SimpleHoster): - __name__ = "DataHu" + __name = "DataHu" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index fe304fdea..611d27fef 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataportCz(SimpleHoster): - __name__ = "DataportCz" + __name = "DataportCz" __type__ = "hoster" __version__ = "0.43" __status__ = "testing" diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 7cc22158d..417a17c81 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DateiTo(SimpleHoster): - __name__ = "DateiTo" + __name = "DateiTo" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py index 5a826452b..d4d0dd41e 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 ca6603a87..69ccd274e 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): - __name__ = "DebridItaliaCom" + __name = "DebridItaliaCom" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index b3854f581..d1aa63f9d 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DepositfilesCom(SimpleHoster): - __name__ = "DepositfilesCom" + __name = "DepositfilesCom" __type__ = "hoster" __version__ = "0.58" __status__ = "testing" @@ -29,7 +29,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 d999cdf96..62911383d 100644 --- a/module/plugins/hoster/DevhostSt.py +++ b/module/plugins/hoster/DevhostSt.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DevhostSt(SimpleHoster): - __name__ = "DevhostSt" + __name = "DevhostSt" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 6c094636e..5f28c68b4 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -33,7 +33,7 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): - __name__ = "DlFreeFr" + __name = "DlFreeFr" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" diff --git a/module/plugins/hoster/DodanePl.py b/module/plugins/hoster/DodanePl.py index 3a2c732d8..00304d69b 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 7c4e952df..ffc858ac9 100644 --- a/module/plugins/hoster/DropboxCom.py +++ b/module/plugins/hoster/DropboxCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DropboxCom(SimpleHoster): - __name__ = "DropboxCom" + __name = "DropboxCom" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/DuploadOrg.py b/module/plugins/hoster/DuploadOrg.py index 124919d91..ac473798d 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 81b524a20..8b7d5fcc7 100644 --- a/module/plugins/hoster/EasybytezCom.py +++ b/module/plugins/hoster/EasybytezCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class EasybytezCom(XFSHoster): - __name__ = "EasybytezCom" + __name = "EasybytezCom" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py index 3204ec9ad..0baf7ce57 100644 --- a/module/plugins/hoster/EdiskCz.py +++ b/module/plugins/hoster/EdiskCz.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EdiskCz(SimpleHoster): - __name__ = "EdiskCz" + __name = "EdiskCz" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py index d91c70fdc..49950f25f 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 bc7d2415a..d57bd87ee 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 498a43395..d82aeaf8c 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 3cfa014dd..f4895f347 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EuroshareEu(SimpleHoster): - __name__ = "EuroshareEu" + __name = "EuroshareEu" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" diff --git a/module/plugins/hoster/ExashareCom.py b/module/plugins/hoster/ExashareCom.py index c3a4b43dc..b94de0b9a 100644 --- a/module/plugins/hoster/ExashareCom.py +++ b/module/plugins/hoster/ExashareCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class ExashareCom(XFSHoster): - __name__ = "ExashareCom" + __name = "ExashareCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index b21db38bb..a91415113 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, s class ExtabitCom(SimpleHoster): - __name__ = "ExtabitCom" + __name = "ExtabitCom" __type__ = "hoster" __version__ = "0.68" __status__ = "testing" @@ -42,7 +42,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 83d91e8c3..c0043680f 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FastixRu(MultiHoster): - __name__ = "FastixRu" + __name = "FastixRu" __type__ = "hoster" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 7c3294632..1888fb7fa 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FastshareCz(SimpleHoster): - __name__ = "FastshareCz" + __name = "FastshareCz" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py index c91024824..3c95eeb94 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 23aa7ea61..ce3f577d6 100644 --- a/module/plugins/hoster/FileSharkPl.py +++ b/module/plugins/hoster/FileSharkPl.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileSharkPl(SimpleHoster): - __name__ = "FileSharkPl" + __name = "FileSharkPl" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py index 96c1456cb..f0140b205 100644 --- a/module/plugins/hoster/FileStoreTo.py +++ b/module/plugins/hoster/FileStoreTo.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileStoreTo(SimpleHoster): - __name__ = "FileStoreTo" + __name = "FileStoreTo" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/FilebeerInfo.py b/module/plugins/hoster/FilebeerInfo.py index 9db53fe19..83ad34763 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 1a2c89b0b..2bd0c2f04 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileboomMe(SimpleHoster): - __name__ = "FileboomMe" + __name = "FileboomMe" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index da81d3f37..ab788e57e 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilecloudIo(SimpleHoster): - __name__ = "FilecloudIo" + __name = "FilecloudIo" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hoster/FiledropperCom.py b/module/plugins/hoster/FiledropperCom.py index 8cef6c709..5800b00b3 100644 --- a/module/plugins/hoster/FiledropperCom.py +++ b/module/plugins/hoster/FiledropperCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FiledropperCom(SimpleHoster): - __name__ = "FiledropperCom" + __name = "FiledropperCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index b134abf30..b4e8aef0e 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,7 +19,7 @@ def get_info(urls): class FilefactoryCom(SimpleHoster): - __name__ = "FilefactoryCom" + __name = "FilefactoryCom" __type__ = "hoster" __version__ = "0.59" __status__ = "testing" diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py index 1a2a7d344..18479371d 100644 --- a/module/plugins/hoster/FilejungleCom.py +++ b/module/plugins/hoster/FilejungleCom.py @@ -5,7 +5,7 @@ from module.plugins.internal.Plugin import chunks class FilejungleCom(FileserveCom): - __name__ = "FilejungleCom" + __name = "FilejungleCom" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 0d54b6b6c..fadc11d17 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileomCom(XFSHoster): - __name__ = "FileomCom" + __name = "FileomCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index 3d42bebed..6105a8c29 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepostCom(SimpleHoster): - __name__ = "FilepostCom" + __name = "FilepostCom" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" diff --git a/module/plugins/hoster/FilepupNet.py b/module/plugins/hoster/FilepupNet.py index 7793afe53..0e37c280e 100644 --- a/module/plugins/hoster/FilepupNet.py +++ b/module/plugins/hoster/FilepupNet.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepupNet(SimpleHoster): - __name__ = "FilepupNet" + __name = "FilepupNet" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index db998f06d..994c3c53a 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilerNet(SimpleHoster): - __name__ = "FilerNet" + __name = "FilerNet" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py index c65c07a42..345a1956d 100644 --- a/module/plugins/hoster/FilerioCom.py +++ b/module/plugins/hoster/FilerioCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FilerioCom(XFSHoster): - __name__ = "FilerioCom" + __name = "FilerioCom" __type__ = "hoster" __version__ = "0.08" __status__ = "testing" diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py index fcb29b922..2003c7f98 100644 --- a/module/plugins/hoster/FilesMailRu.py +++ b/module/plugins/hoster/FilesMailRu.py @@ -31,7 +31,7 @@ def get_info(urls): class FilesMailRu(Hoster): - __name__ = "FilesMailRu" + __name = "FilesMailRu" __type__ = "hoster" __version__ = "0.35" __status__ = "testing" diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 9ccc5df86..8e8341e54 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -32,7 +32,7 @@ def check_file(plugin, urls): class FileserveCom(Hoster): - __name__ = "FileserveCom" + __name = "FileserveCom" __type__ = "hoster" __version__ = "0.62" __status__ = "testing" @@ -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 3fb181348..32319482a 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 59c0ea246..97f689e69 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 c7f541687..9d5dc3278 100644 --- a/module/plugins/hoster/FileuploadNet.py +++ b/module/plugins/hoster/FileuploadNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileuploadNet(SimpleHoster): - __name__ = "FileuploadNet" + __name = "FileuploadNet" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py index 249548d13..38cc8a277 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 cc530a3c5..ffd470682 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 ca2f7f270..5351b44e8 100644 --- a/module/plugins/hoster/FlyFilesNet.py +++ b/module/plugins/hoster/FlyFilesNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class FlyFilesNet(SimpleHoster): - __name__ = "FlyFilesNet" + __name = "FlyFilesNet" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py index 5b4efab00..b1fe01467 100644 --- a/module/plugins/hoster/FourSharedCom.py +++ b/module/plugins/hoster/FourSharedCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FourSharedCom(SimpleHoster): - __name__ = "FourSharedCom" + __name = "4shared" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 450f11095..46b100762 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class FreakshareCom(Hoster): - __name__ = "FreakshareCom" + __name = "FreakshareCom" __type__ = "hoster" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 501b544c6..2cec4d7b1 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -4,7 +4,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class FreeWayMe(MultiHoster): - __name__ = "FreeWayMe" + __name = "FreeWayMe" __type__ = "hoster" __version__ = "0.20" __status__ = "testing" diff --git a/module/plugins/hoster/FreevideoCz.py b/module/plugins/hoster/FreevideoCz.py index ec8734b6a..e0f3295e1 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 b387151f7..279ead2a2 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -21,7 +21,7 @@ def double_decode(m): class FshareVn(SimpleHoster): - __name__ = "FshareVn" + __name = "FshareVn" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index 79f72c868..4373b5d01 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -9,7 +9,7 @@ from module.plugins.internal.Hoster import Hoster class Ftp(Hoster): - __name__ = "Ftp" + __name = "Ftp" __type__ = "hoster" __version__ = "0.55" __status__ = "testing" diff --git a/module/plugins/hoster/GamefrontCom.py b/module/plugins/hoster/GamefrontCom.py index fb3b98f5e..b309854aa 100644 --- a/module/plugins/hoster/GamefrontCom.py +++ b/module/plugins/hoster/GamefrontCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GamefrontCom(SimpleHoster): - __name__ = "GamefrontCom" + __name = "GamefrontCom" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index da2f82f8f..fec034543 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GigapetaCom(SimpleHoster): - __name__ = "GigapetaCom" + __name = "GigapetaCom" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py index 2c2f4aa9e..84c082ed4 100644 --- a/module/plugins/hoster/GooIm.py +++ b/module/plugins/hoster/GooIm.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GooIm(SimpleHoster): - __name__ = "GooIm" + __name = "GooIm" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py index c6b84b776..1d30cf938 100644 --- a/module/plugins/hoster/GoogledriveCom.py +++ b/module/plugins/hoster/GoogledriveCom.py @@ -11,7 +11,7 @@ from module.utils import html_unescape class GoogledriveCom(SimpleHoster): - __name__ = "GoogledriveCom" + __name = "GoogledriveCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py index 012b6be63..7c3ddd41a 100644 --- a/module/plugins/hoster/HellshareCz.py +++ b/module/plugins/hoster/HellshareCz.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class HellshareCz(SimpleHoster): - __name__ = "HellshareCz" + __name = "HellshareCz" __type__ = "hoster" __version__ = "0.86" __status__ = "testing" diff --git a/module/plugins/hoster/HellspyCz.py b/module/plugins/hoster/HellspyCz.py index 499a94413..43e8cedfe 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 53a8960c1..2c83042b9 100644 --- a/module/plugins/hoster/HighWayMe.py +++ b/module/plugins/hoster/HighWayMe.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class HighWayMe(MultiHoster): - __name__ = "HighWayMe" + __name = "HighWayMe" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/HostujeNet.py b/module/plugins/hoster/HostujeNet.py index 3c0a53535..bdfaeeabc 100644 --- a/module/plugins/hoster/HostujeNet.py +++ b/module/plugins/hoster/HostujeNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class HostujeNet(SimpleHoster): - __name__ = "HostujeNet" + __name = "HostujeNet" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py index 032bd350e..5b91af329 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 582d17756..123fcc1ac 100644 --- a/module/plugins/hoster/HugefilesNet.py +++ b/module/plugins/hoster/HugefilesNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HugefilesNet(XFSHoster): - __name__ = "HugefilesNet" + __name = "HugefilesNet" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py index 9b3550922..637f9d51f 100644 --- a/module/plugins/hoster/HundredEightyUploadCom.py +++ b/module/plugins/hoster/HundredEightyUploadCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class HundredEightyUploadCom(XFSHoster): - __name__ = "HundredEightyUploadCom" + __name = "HundredEightyUploadCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/IFileWs.py b/module/plugins/hoster/IFileWs.py index 2444846d7..a5dcbeda2 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 975e6bfc0..8e00b70ba 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 a0c435762..d33c64afc 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 08e22a9df..0e1d1526f 100644 --- a/module/plugins/hoster/IfolderRu.py +++ b/module/plugins/hoster/IfolderRu.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class IfolderRu(SimpleHoster): - __name__ = "IfolderRu" + __name = "IfolderRu" __type__ = "hoster" __version__ = "0.40" __status__ = "testing" diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py index e9c084c95..d2ae0977c 100644 --- a/module/plugins/hoster/JumbofilesCom.py +++ b/module/plugins/hoster/JumbofilesCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class JumbofilesCom(SimpleHoster): - __name__ = "JumbofilesCom" + __name = "JumbofilesCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py index 4483ccd5d..e3e5cba0e 100644 --- a/module/plugins/hoster/JunocloudMe.py +++ b/module/plugins/hoster/JunocloudMe.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class JunocloudMe(XFSHoster): - __name__ = "JunocloudMe" + __name = "JunocloudMe" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py index d4a17610d..2e3959c63 100644 --- a/module/plugins/hoster/Keep2ShareCc.py +++ b/module/plugins/hoster/Keep2ShareCc.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class Keep2ShareCc(SimpleHoster): - __name__ = "Keep2ShareCc" + __name = "Keep2ShareCc" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" @@ -22,7 +22,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 2b23b1616..888257c90 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 3f7b0bfb9..2b5d4ec4e 100644 --- a/module/plugins/hoster/KingfilesNet.py +++ b/module/plugins/hoster/KingfilesNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class KingfilesNet(SimpleHoster): - __name__ = "KingfilesNet" + __name = "KingfilesNet" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/hoster/LemUploadsCom.py b/module/plugins/hoster/LemUploadsCom.py index 1f4f96a1f..0948c0397 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 b8a563007..e5963479a 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -33,7 +33,7 @@ def get_info(urls): class LetitbitNet(SimpleHoster): - __name__ = "LetitbitNet" + __name = "LetitbitNet" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py index 3301eda7c..d006688f5 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class LinksnappyCom(MultiHoster): - __name__ = "LinksnappyCom" + __name = "LinksnappyCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 722f0e518..06c664dcc 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): - __name__ = "LoadTo" + __name = "LoadTo" __type__ = "hoster" __version__ = "0.25" __status__ = "testing" diff --git a/module/plugins/hoster/LolabitsEs.py b/module/plugins/hoster/LolabitsEs.py index 766f9d5b8..040bd70e7 100644 --- a/module/plugins/hoster/LolabitsEs.py +++ b/module/plugins/hoster/LolabitsEs.py @@ -7,7 +7,7 @@ from module.utils import html_unescape class LolabitsEs(SimpleHoster): - __name__ = "LolabitsEs" + __name = "LolabitsEs" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/LomafileCom.py b/module/plugins/hoster/LomafileCom.py index 9e625a1eb..76cdb83d3 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 f9c7a89ef..e7d5d243a 100644 --- a/module/plugins/hoster/LuckyShareNet.py +++ b/module/plugins/hoster/LuckyShareNet.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LuckyShareNet(SimpleHoster): - __name__ = "LuckyShareNet" + __name = "LuckyShareNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py index 1abe87cd2..3191d93c7 100644 --- a/module/plugins/hoster/MediafireCom.py +++ b/module/plugins/hoster/MediafireCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MediafireCom(SimpleHoster): - __name__ = "MediafireCom" + __name = "MediafireCom" __type__ = "hoster" __version__ = "0.91" __status__ = "testing" diff --git a/module/plugins/hoster/MegaCoNz.py b/module/plugins/hoster/MegaCoNz.py index 784131842..2179dac70 100644 --- a/module/plugins/hoster/MegaCoNz.py +++ b/module/plugins/hoster/MegaCoNz.py @@ -46,7 +46,7 @@ from module.utils import decode, fs_decode, fs_encode class MegaCoNz(Hoster): - __name__ = "MegaCoNz" + __name = "MegaCoNz" __type__ = "hoster" __version__ = "0.31" __status__ = "testing" @@ -188,7 +188,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 0dfc16c34..2ed94f853 100644 --- a/module/plugins/hoster/MegaDebridEu.py +++ b/module/plugins/hoster/MegaDebridEu.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class MegaDebridEu(MultiHoster): - __name__ = "MegaDebridEu" + __name = "MegaDebridEu" __type__ = "hoster" __version__ = "0.50" __status__ = "testing" diff --git a/module/plugins/hoster/MegaFilesSe.py b/module/plugins/hoster/MegaFilesSe.py index 03c684751..499b269ac 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 69c1c411b..f04b343e7 100644 --- a/module/plugins/hoster/MegaRapidCz.py +++ b/module/plugins/hoster/MegaRapidCz.py @@ -20,7 +20,7 @@ def get_info(urls): class MegaRapidCz(SimpleHoster): - __name__ = "MegaRapidCz" + __name = "MegaRapidCz" __type__ = "hoster" __version__ = "0.59" __status__ = "testing" diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py index 573586639..13f4f0212 100644 --- a/module/plugins/hoster/MegaRapidoNet.py +++ b/module/plugins/hoster/MegaRapidoNet.py @@ -21,7 +21,7 @@ def random_with_n_digits(n): class MegaRapidoNet(MultiHoster): - __name__ = "MegaRapidoNet" + __name = "MegaRapidoNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/MegacrypterCom.py b/module/plugins/hoster/MegacrypterCom.py index fc20890e4..206a8e8ce 100644 --- a/module/plugins/hoster/MegacrypterCom.py +++ b/module/plugins/hoster/MegacrypterCom.py @@ -8,7 +8,7 @@ from module.plugins.hoster.MegaCoNz import MegaCoNz class MegacrypterCom(MegaCoNz): - __name__ = "MegacrypterCom" + __name = "MegacrypterCom" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" @@ -36,7 +36,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 ab9a864c9..5a7543ef8 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 7d7d8adb5..0130a4edd 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MegasharesCom(SimpleHoster): - __name__ = "MegasharesCom" + __name = "MegasharesCom" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py index 468734c35..4fe15f0ff 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 a3339a932..a862acfea 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 dd70ce009..c94593a7a 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class MovReelCom(XFSHoster): - __name__ = "MovReelCom" + __name = "MovReelCom" __type__ = "hoster" __version__ = "1.25" __status__ = "testing" diff --git a/module/plugins/hoster/MultihostersCom.py b/module/plugins/hoster/MultihostersCom.py index 11c6c4379..020bb0a62 100644 --- a/module/plugins/hoster/MultihostersCom.py +++ b/module/plugins/hoster/MultihostersCom.py @@ -4,7 +4,7 @@ from module.plugins.hoster.ZeveraCom import ZeveraCom class MultihostersCom(ZeveraCom): - __name__ = "MultihostersCom" + __name = "MultihostersCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index 1124dadce..b6aad0f7d 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MultishareCz(SimpleHoster): - __name__ = "MultishareCz" + __name = "MultishareCz" __type__ = "hoster" __version__ = "0.43" __status__ = "testing" diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index ff28d5dfd..0b19a950c 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class MyfastfileCom(MultiHoster): - __name__ = "MyfastfileCom" + __name = "MyfastfileCom" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hoster/MystoreTo.py b/module/plugins/hoster/MystoreTo.py index b23ca10bd..15fdbd27c 100644 --- a/module/plugins/hoster/MystoreTo.py +++ b/module/plugins/hoster/MystoreTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MystoreTo(SimpleHoster): - __name__ = "MystoreTo" + __name = "MystoreTo" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py index 9abb0abe9..be50ea760 100644 --- a/module/plugins/hoster/MyvideoDe.py +++ b/module/plugins/hoster/MyvideoDe.py @@ -7,7 +7,7 @@ from module.utils import html_unescape class MyvideoDe(Hoster): - __name__ = "MyvideoDe" + __name = "MyvideoDe" __type__ = "hoster" __version__ = "0.92" __status__ = "testing" diff --git a/module/plugins/hoster/NahrajCz.py b/module/plugins/hoster/NahrajCz.py index 0d710c9b0..ac20e2cc7 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 a6504025e..4fd0755f9 100644 --- a/module/plugins/hoster/NarodRu.py +++ b/module/plugins/hoster/NarodRu.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NarodRu(SimpleHoster): - __name__ = "NarodRu" + __name = "NarodRu" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index ff9e75c72..2e355b803 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 ad0573960..ba182b6d6 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class NitroflareCom(SimpleHoster): - __name__ = "NitroflareCom" + __name = "NitroflareCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index 7486423b1..8fed15e93 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster class NoPremiumPl(MultiHoster): - __name__ = "NoPremiumPl" + __name = "NoPremiumPl" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" @@ -27,13 +27,13 @@ class NoPremiumPl(MultiHoster): 'password': "", 'url' : ""} - ERROR_CODES = {0 : "[%s] Incorrect login credentials", - 1 : "[%s] Not enough transfer to download - top-up your account", - 2 : "[%s] Incorrect / dead link", - 3 : "[%s] Error connecting to hosting, try again later", - 9 : "[%s] Premium account has expired", - 15: "[%s] Hosting no longer supported", - 80: "[%s] Too many incorrect login attempts, account blocked for 24h"} + ERROR_CODES = {0 : "Incorrect login credentials", + 1 : "Not enough transfer to download - top-up your account", + 2 : "Incorrect / dead link", + 3 : "Error connecting to hosting, try again later", + 9 : "Premium account has expired", + 15: "Hosting no longer supported", + 80: "Too many incorrect login attempts, account blocked for 24h"} def prepare(self): @@ -79,7 +79,7 @@ class NoPremiumPl(MultiHoster): if "errno" in parsed.keys(): if parsed['errno'] in self.ERROR_CODES: #: Error code in known - self.fail(self.ERROR_CODES[parsed['errno']] % self.__name__) + self.fail(self.ERROR_CODES[parsed['errno']]) else: #: Error code isn't yet added to plugin self.fail(parsed['errstring'] or diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 45521eebf..86d93645c 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NosuploadCom(XFSHoster): - __name__ = "NosuploadCom" + __name = "NosuploadCom" __type__ = "hoster" __version__ = "0.32" __status__ = "testing" diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 9ae73b1a8..62ff73d00 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class NovafileCom(XFSHoster): - __name__ = "NovafileCom" + __name = "NovafileCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py index 73b0efeaa..5da00c2a5 100644 --- a/module/plugins/hoster/NowDownloadSx.py +++ b/module/plugins/hoster/NowDownloadSx.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowDownloadSx(SimpleHoster): - __name__ = "NowDownloadSx" + __name = "NowDownloadSx" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hoster/NowVideoSx.py b/module/plugins/hoster/NowVideoSx.py index b919d74ab..6b8d501c4 100644 --- a/module/plugins/hoster/NowVideoSx.py +++ b/module/plugins/hoster/NowVideoSx.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowVideoSx(SimpleHoster): - __name__ = "NowVideoSx" + __name = "NowVideoSx" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" @@ -19,7 +19,7 @@ class NowVideoSx(SimpleHoster): __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 fd1f26874..ec2b91957 100644 --- a/module/plugins/hoster/OboomCom.py +++ b/module/plugins/hoster/OboomCom.py @@ -11,7 +11,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class OboomCom(Hoster): - __name__ = "OboomCom" + __name = "OboomCom" __type__ = "hoster" __version__ = "0.39" __status__ = "testing" @@ -53,7 +53,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 6c1d4ab82..9ec4281b5 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): - __name__ = "OneFichierCom" + __name = "1fichier.com" __type__ = "hoster" __version__ = "0.92" __status__ = "testing" diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py index 4081cf1f2..485822fd6 100644 --- a/module/plugins/hoster/OpenloadIo.py +++ b/module/plugins/hoster/OpenloadIo.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OpenloadIo(SimpleHoster): - __name__ = "OpenloadIo" + __name = "OpenloadIo" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py index e1887ce76..20b38f09d 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 a2bbfc701..86d316ff6 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -9,7 +9,7 @@ from module.utils import parseFileSize as parse_size class OverLoadMe(MultiHoster): - __name__ = "OverLoadMe" + __name = "OverLoadMe" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/PandaplaNet.py b/module/plugins/hoster/PandaplaNet.py index 4efe20b5a..21fbbe4a1 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 e9d199a2e..37c2aaf3f 100644 --- a/module/plugins/hoster/PornhostCom.py +++ b/module/plugins/hoster/PornhostCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Hoster import Hoster class PornhostCom(Hoster): - __name__ = "PornhostCom" + __name = "PornhostCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py index ce6badedd..92a008a42 100644 --- a/module/plugins/hoster/PornhubCom.py +++ b/module/plugins/hoster/PornhubCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Hoster import Hoster class PornhubCom(Hoster): - __name__ = "PornhubCom" + __name = "PornhubCom" __type__ = "hoster" __version__ = "0.52" __status__ = "testing" diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py index 8279412e4..1aa559a77 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 8186c6224..79d0ba618 100644 --- a/module/plugins/hoster/PremiumTo.py +++ b/module/plugins/hoster/PremiumTo.py @@ -9,7 +9,7 @@ from module.utils import fs_encode class PremiumTo(MultiHoster): - __name__ = "PremiumTo" + __name = "PremiumTo" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 16c252dc1..beffcbd51 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class PremiumizeMe(MultiHoster): - __name__ = "PremiumizeMe" + __name = "PremiumizeMe" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py index 5f7510123..07ca3054c 100644 --- a/module/plugins/hoster/PromptfileCom.py +++ b/module/plugins/hoster/PromptfileCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class PromptfileCom(SimpleHoster): - __name__ = "PromptfileCom" + __name = "PromptfileCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/PrzeklejPl.py b/module/plugins/hoster/PrzeklejPl.py index b066444da..33206af41 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 e924fbcfc..06480a5b1 100644 --- a/module/plugins/hoster/PutdriveCom.py +++ b/module/plugins/hoster/PutdriveCom.py @@ -4,7 +4,7 @@ from module.plugins.hoster.ZeveraCom import ZeveraCom class PutdriveCom(ZeveraCom): - __name__ = "PutdriveCom" + __name = "PutdriveCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 1bbc05d87..1d072dbce 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class QuickshareCz(SimpleHoster): - __name__ = "QuickshareCz" + __name = "QuickshareCz" __type__ = "hoster" __version__ = "0.58" __status__ = "testing" diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index cbe3e2a52..3da5086fb 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class RPNetBiz(MultiHoster): - __name__ = "RPNetBiz" + __name = "RPNetBiz" __type__ = "hoster" __version__ = "0.17" __status__ = "testing" diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py index d4c753c07..4e21ef299 100644 --- a/module/plugins/hoster/RapideoPl.py +++ b/module/plugins/hoster/RapideoPl.py @@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster class RapideoPl(MultiHoster): - __name__ = "RapideoPl" + __name = "RapideoPl" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" @@ -27,13 +27,13 @@ class RapideoPl(MultiHoster): 'password': "", 'url' : ""} - ERROR_CODES = {0 : "[%s] Incorrect login credentials", - 1 : "[%s] Not enough transfer to download - top-up your account", - 2 : "[%s] Incorrect / dead link", - 3 : "[%s] Error connecting to hosting, try again later", - 9 : "[%s] Premium account has expired", - 15: "[%s] Hosting no longer supported", - 80: "[%s] Too many incorrect login attempts, account blocked for 24h"} + ERROR_CODES = {0 : "Incorrect login credentials", + 1 : "Not enough transfer to download - top-up your account", + 2 : "Incorrect / dead link", + 3 : "Error connecting to hosting, try again later", + 9 : "Premium account has expired", + 15: "Hosting no longer supported", + 80: "Too many incorrect login attempts, account blocked for 24h"} def prepare(self): @@ -79,7 +79,7 @@ class RapideoPl(MultiHoster): if "errno" in parsed.keys(): if parsed['errno'] in self.ERROR_CODES: #: Error code in known - self.fail(self.ERROR_CODES[parsed['errno']] % self.__name__) + self.fail(self.ERROR_CODES[parsed['errno']]) else: #: Error code isn't yet added to plugin self.fail(parsed['errstring'] or diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py index 5dd3ba82d..0bfb693b2 100644 --- a/module/plugins/hoster/RapidfileshareNet.py +++ b/module/plugins/hoster/RapidfileshareNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RapidfileshareNet(XFSHoster): - __name__ = "RapidfileshareNet" + __name = "RapidfileshareNet" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 711f33e87..5676d74c5 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapidgatorNet(SimpleHoster): - __name__ = "RapidgatorNet" + __name = "RapidgatorNet" __type__ = "hoster" __version__ = "0.36" __status__ = "testing" diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py index 99c877226..f96a5df8a 100644 --- a/module/plugins/hoster/RapiduNet.py +++ b/module/plugins/hoster/RapiduNet.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapiduNet(SimpleHoster): - __name__ = "RapiduNet" + __name = "RapiduNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py index 7b19996dc..82115fc7c 100644 --- a/module/plugins/hoster/RarefileNet.py +++ b/module/plugins/hoster/RarefileNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RarefileNet(XFSHoster): - __name__ = "RarefileNet" + __name = "RarefileNet" __type__ = "hoster" __version__ = "0.10" __status__ = "testing" diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 6409701e4..342ab72de 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -10,7 +10,7 @@ from module.utils import parseFileSize as parse_size class RealdebridCom(MultiHoster): - __name__ = "RealdebridCom" + __name = "RealdebridCom" __type__ = "hoster" __version__ = "0.69" __status__ = "testing" diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py index 94a0ead20..2d20a9271 100644 --- a/module/plugins/hoster/RedtubeCom.py +++ b/module/plugins/hoster/RedtubeCom.py @@ -7,7 +7,7 @@ from module.utils import html_unescape class RedtubeCom(Hoster): - __name__ = "RedtubeCom" + __name = "RedtubeCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index af8ba3fd9..1df19929b 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class RehostTo(MultiHoster): - __name__ = "RehostTo" + __name = "RehostTo" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index 295362174..c950bead2 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -14,7 +14,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RemixshareCom(SimpleHoster): - __name__ = "RemixshareCom" + __name = "RemixshareCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py index 124566b77..9d527b8c8 100644 --- a/module/plugins/hoster/RgHostNet.py +++ b/module/plugins/hoster/RgHostNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RgHostNet(SimpleHoster): - __name__ = "RgHostNet" + __name = "RgHostNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/SafesharingEu.py b/module/plugins/hoster/SafesharingEu.py index e7d53fe75..3163fa2f0 100644 --- a/module/plugins/hoster/SafesharingEu.py +++ b/module/plugins/hoster/SafesharingEu.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SafesharingEu(XFSHoster): - __name__ = "SafesharingEu" + __name = "SafesharingEu" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py index df2ac1627..3bfe12cd4 100644 --- a/module/plugins/hoster/SecureUploadEu.py +++ b/module/plugins/hoster/SecureUploadEu.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SecureUploadEu(XFSHoster): - __name__ = "SecureUploadEu" + __name = "SecureUploadEu" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index ece048ed9..a9e3cebd7 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SendspaceCom(SimpleHoster): - __name__ = "SendspaceCom" + __name = "SendspaceCom" __type__ = "hoster" __version__ = "0.18" __status__ = "testing" diff --git a/module/plugins/hoster/Share4WebCom.py b/module/plugins/hoster/Share4WebCom.py index 898e12927..0364ff6c8 100644 --- a/module/plugins/hoster/Share4WebCom.py +++ b/module/plugins/hoster/Share4WebCom.py @@ -5,7 +5,7 @@ from module.plugins.internal.SimpleHoster import create_getInfo class Share4WebCom(UnibytesCom): - __name__ = "Share4WebCom" + __name = "Share4WebCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/Share76Com.py b/module/plugins/hoster/Share76Com.py index 863fb0a7e..1147b556d 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 a42ceb91c..1b9e3bd0e 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 c987ac0f9..9d4bde36a 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 3e98fc554..e976337b3 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ShareonlineBiz(SimpleHoster): - __name__ = "ShareonlineBiz" + __name = "ShareonlineBiz" __type__ = "hoster" __version__ = "0.60" __status__ = "testing" @@ -26,7 +26,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 +41,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 6b4cfed2b..3ac2370cb 100644 --- a/module/plugins/hoster/ShareplaceCom.py +++ b/module/plugins/hoster/ShareplaceCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Hoster import Hoster class ShareplaceCom(Hoster): - __name__ = "ShareplaceCom" + __name = "ShareplaceCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/SharingmatrixCom.py b/module/plugins/hoster/SharingmatrixCom.py index e6d5d4ab8..f0ce063d7 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 1313ba0e0..46b746b50 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 8e3890fb8..20d7d77a5 100644 --- a/module/plugins/hoster/SimplyPremiumCom.py +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import seconds_to_midnight class SimplyPremiumCom(MultiHoster): - __name__ = "SimplyPremiumCom" + __name = "SimplyPremiumCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py index d26439d68..5d01a1e3a 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo, rep class SimplydebridCom(MultiHoster): - __name__ = "SimplydebridCom" + __name = "SimplydebridCom" __type__ = "hoster" __version__ = "0.21" __status__ = "testing" diff --git a/module/plugins/hoster/SizedriveCom.py b/module/plugins/hoster/SizedriveCom.py index d0db9985b..ba99bab13 100644 --- a/module/plugins/hoster/SizedriveCom.py +++ b/module/plugins/hoster/SizedriveCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SizedriveCom(SimpleHoster): - __name__ = "SizedriveCom" + __name = "SizedriveCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index 29768d50b..1fffd5f6a 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster class SmoozedCom(MultiHoster): - __name__ = "SmoozedCom" + __name = "SmoozedCom" __type__ = "hoster" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/hoster/SockshareCom.py b/module/plugins/hoster/SockshareCom.py index b45a22b72..207324543 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 16e23045b..9e21852c2 100644 --- a/module/plugins/hoster/SolidfilesCom.py +++ b/module/plugins/hoster/SolidfilesCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SolidfilesCom(SimpleHoster): - __name__ = "SolidfilesCom" + __name = "SolidfilesCom" __type__ = "hoster" __version__ = "0.03" __status__ = "testing" diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py index a7a45d028..4a1d5045e 100644 --- a/module/plugins/hoster/SoundcloudCom.py +++ b/module/plugins/hoster/SoundcloudCom.py @@ -7,7 +7,7 @@ from module.common.json_layer import json_loads class SoundcloudCom(SimpleHoster): - __name__ = "SoundcloudCom" + __name = "SoundcloudCom" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py index abba1be79..d4d0efa0a 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 75a55d490..147bedb23 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 4a71c179d..ffd3d96f6 100644 --- a/module/plugins/hoster/SpeedyshareCom.py +++ b/module/plugins/hoster/SpeedyshareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SpeedyshareCom(SimpleHoster): - __name__ = "SpeedyshareCom" + __name = "SpeedyshareCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py index 3d0852204..1625999b4 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 632a2933e..2f57e355c 100644 --- a/module/plugins/hoster/StreamCz.py +++ b/module/plugins/hoster/StreamCz.py @@ -21,7 +21,7 @@ def get_info(urls): class StreamCz(Hoster): - __name__ = "StreamCz" + __name = "StreamCz" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 97cde6e92..336ee5fb2 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class StreamcloudEu(XFSHoster): - __name__ = "StreamcloudEu" + __name = "StreamcloudEu" __type__ = "hoster" __version__ = "0.11" __status__ = "testing" diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index 95de33a3f..4af620019 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -15,7 +15,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class TurbobitNet(SimpleHoster): - __name__ = "TurbobitNet" + __name = "TurbobitNet" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" @@ -29,7 +29,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 +99,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 +111,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 ffb88d53b..df139e1b3 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 8fadb41c3..72fa7e1a0 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class TusfilesNet(XFSHoster): - __name__ = "TusfilesNet" + __name = "TusfilesNet" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index 1335bafae..b4436db3b 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class TwoSharedCom(SimpleHoster): - __name__ = "TwoSharedCom" + __name = "2Shared" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index b0df1d97f..8ec02dda3 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -14,7 +14,7 @@ def convert_decimal_prefix(m): class UlozTo(SimpleHoster): - __name__ = "UlozTo" + __name = "UlozTo" __type__ = "hoster" __version__ = "1.16" __status__ = "testing" diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py index 5bbbb1f7c..bd4dde23d 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UloziskoSk(SimpleHoster): - __name__ = "UloziskoSk" + __name = "UloziskoSk" __type__ = "hoster" __version__ = "0.26" __status__ = "testing" diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py index f06bd4421..3e6c72395 100644 --- a/module/plugins/hoster/UnibytesCom.py +++ b/module/plugins/hoster/UnibytesCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UnibytesCom(SimpleHoster): - __name__ = "UnibytesCom" + __name = "UnibytesCom" __type__ = "hoster" __version__ = "0.16" __status__ = "testing" diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py index 082ad3e02..75b327ef7 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 9c422ce01..d64f5be9c 100644 --- a/module/plugins/hoster/UpleaCom.py +++ b/module/plugins/hoster/UpleaCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UpleaCom(XFSHoster): - __name__ = "UpleaCom" + __name = "UpleaCom" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py index 36b766b7e..519d252d0 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 a3d54e8ef..eaab4433f 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadableCh(SimpleHoster): - __name__ = "UploadableCh" + __name = "UploadableCh" __type__ = "hoster" __version__ = "0.13" __status__ = "testing" @@ -21,7 +21,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 a1053a413..eaa8faf01 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 265fefe8a..28f29f778 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadedTo(SimpleHoster): - __name__ = "UploadedTo" + __name = "UploadedTo" __type__ = "hoster" __version__ = "0.97" __status__ = "testing" @@ -24,7 +24,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 +46,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 a3c41e824..6979dca6d 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 517ed293a..ec7ac4a71 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadheroCom(SimpleHoster): - __name__ = "UploadheroCom" + __name = "UploadheroCom" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index c8f8a8169..9635454fd 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadingCom(SimpleHoster): - __name__ = "UploadingCom" + __name = "UploadingCom" __type__ = "hoster" __version__ = "0.44" __status__ = "testing" diff --git a/module/plugins/hoster/UploadkingCom.py b/module/plugins/hoster/UploadkingCom.py index 54fe47cc8..61db31f6a 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 caa12e8af..cdd7244d8 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UpstoreNet(SimpleHoster): - __name__ = "UpstoreNet" + __name = "UpstoreNet" __type__ = "hoster" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 4f29b24b7..1624219d7 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -4,7 +4,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UptoboxCom(XFSHoster): - __name__ = "UptoboxCom" + __name = "UptoboxCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/UserscloudCom.py b/module/plugins/hoster/UserscloudCom.py index ebaed4859..7619f6f2b 100644 --- a/module/plugins/hoster/UserscloudCom.py +++ b/module/plugins/hoster/UserscloudCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UserscloudCom(SimpleHoster): - __name__ = "UserscloudCom" + __name = "UserscloudCom" __type__ = "hoster" __version__ = "0.01" __status__ = "testing" diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py index cf206992d..0d3c33f90 100644 --- a/module/plugins/hoster/VeehdCom.py +++ b/module/plugins/hoster/VeehdCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Hoster import Hoster class VeehdCom(Hoster): - __name__ = "VeehdCom" + __name = "VeehdCom" __type__ = "hoster" __version__ = "0.25" __status__ = "testing" diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index ba18fd529..7a7c4fa01 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VeohCom(SimpleHoster): - __name__ = "VeohCom" + __name = "VeohCom" __type__ = "hoster" __version__ = "0.23" __status__ = "testing" @@ -23,7 +23,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 f9df18c85..f6a3ee36c 100644 --- a/module/plugins/hoster/VidPlayNet.py +++ b/module/plugins/hoster/VidPlayNet.py @@ -7,7 +7,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class VidPlayNet(XFSHoster): - __name__ = "VidPlayNet" + __name = "VidPlayNet" __type__ = "hoster" __version__ = "0.05" __status__ = "testing" diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index d47677c42..d7c9667ca 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VimeoCom(SimpleHoster): - __name__ = "VimeoCom" + __name = "VimeoCom" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" @@ -25,7 +25,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 8eac61341..0f5b9a1a5 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 d0b0b780e..a6a34c5b3 100644 --- a/module/plugins/hoster/VkCom.py +++ b/module/plugins/hoster/VkCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VkCom(SimpleHoster): - __name__ = "VkCom" + __name = "VkCom" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py index a356dccdd..5da817968 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 a11b59492..0ca67359c 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class WebshareCz(SimpleHoster): - __name__ = "WebshareCz" + __name = "WebshareCz" __type__ = "hoster" __version__ = "0.20" __status__ = "testing" @@ -25,7 +25,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 4c3b47b37..b97a6cd5e 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class WrzucTo(SimpleHoster): - __name__ = "WrzucTo" + __name = "WrzucTo" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py index 028e557e9..4f8a2d0f7 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 285499807..c579b3842 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 b2e5e7321..9b4c9aeb3 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class XFileSharingPro(XFSHoster): - __name__ = "XFileSharingPro" + __name = "XFileSharingPro" __type__ = "hoster" __version__ = "0.54" __status__ = "testing" @@ -29,9 +29,9 @@ class XFileSharingPro(XFSHoster): def init(self): - self.__pattern__ = self.pyload.pluginManager.hosterPlugins[self.__name__]['pattern'] + self.__pattern = self.pyload.pluginManager.hosterPlugins[self.__name__]['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 != '.') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 576451644..4df2465ee 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -16,7 +16,7 @@ def clean_json(json_expr): class XHamsterCom(Hoster): - __name__ = "XHamsterCom" + __name = "XHamsterCom" __type__ = "hoster" __version__ = "0.14" __status__ = "testing" diff --git a/module/plugins/hoster/XVideosCom.py b/module/plugins/hoster/XVideosCom.py index d74f35616..107193084 100644 --- a/module/plugins/hoster/XVideosCom.py +++ b/module/plugins/hoster/XVideosCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Hoster import Hoster class XVideosCom(Hoster): - __name__ = "XVideos.com" + __name = "XVideos.com" __type__ = "hoster" __version__ = "0.12" __status__ = "testing" @@ -23,6 +23,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 12f27c880..a8f15f31a 100644 --- a/module/plugins/hoster/XdadevelopersCom.py +++ b/module/plugins/hoster/XdadevelopersCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class XdadevelopersCom(SimpleHoster): - __name__ = "XdadevelopersCom" + __name = "XdadevelopersCom" __type__ = "hoster" __version__ = "0.04" __status__ = "testing" diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py index 4ea286eb8..1cee6f5df 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" diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py index 418f38926..9f71927ac 100644 --- a/module/plugins/hoster/YadiSk.py +++ b/module/plugins/hoster/YadiSk.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class YadiSk(SimpleHoster): - __name__ = "YadiSk" + __name = "YadiSk" __type__ = "hoster" __version__ = "0.06" __status__ = "testing" diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index b68e87ba6..1d9f7433c 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class YibaishiwuCom(SimpleHoster): - __name__ = "YibaishiwuCom" + __name = "YibaishiwuCom" __type__ = "hoster" __version__ = "0.15" __status__ = "testing" diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py index 02272bf36..74636bf3c 100644 --- a/module/plugins/hoster/YoupornCom.py +++ b/module/plugins/hoster/YoupornCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Hoster import Hoster class YoupornCom(Hoster): - __name__ = "YoupornCom" + __name = "YoupornCom" __type__ = "hoster" __version__ = "0.22" __status__ = "testing" diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py index cdf69afbe..2c27032f9 100644 --- a/module/plugins/hoster/YourfilesTo.py +++ b/module/plugins/hoster/YourfilesTo.py @@ -7,7 +7,7 @@ from module.plugins.internal.Hoster import Hoster class YourfilesTo(Hoster): - __name__ = "YourfilesTo" + __name = "YourfilesTo" __type__ = "hoster" __version__ = "0.24" __status__ = "testing" diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 5c7c13962..ed6a42b71 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -11,7 +11,7 @@ from module.utils import html_unescape class YoutubeCom(Hoster): - __name__ = "YoutubeCom" + __name = "YoutubeCom" __type__ = "hoster" __version__ = "0.46" __status__ = "testing" diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index f0b85d11a..8bd48819a 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -8,7 +8,7 @@ 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" diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py index b5dd66769..a5e106c94 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 f9ea995ba..dcd2fbe7a 100644 --- a/module/plugins/hoster/ZahikiNet.py +++ b/module/plugins/hoster/ZahikiNet.py @@ -4,7 +4,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ZahikiNet(SimpleHoster): - __name__ = "ZahikiNet" + __name = "ZahikiNet" __type__ = "hoster" __version__ = "0.02" __status__ = "testing" diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 9f3fea189..b205c893f 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class ZeveraCom(MultiHoster): - __name__ = "ZeveraCom" + __name = "ZeveraCom" __type__ = "hoster" __version__ = "0.33" __status__ = "testing" diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 306ea2fd3..2ac4a850d 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ZippyshareCom(SimpleHoster): - __name__ = "ZippyshareCom" + __name = "ZippyshareCom" __type__ = "hoster" __version__ = "0.83" __status__ = "testing" diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py index a1ecdd76f..410a02671 100644 --- a/module/plugins/internal/Account.py +++ b/module/plugins/internal/Account.py @@ -11,9 +11,9 @@ from module.utils import compare_time, lock class Account(Plugin): - __name__ = "Account" + __name = "Account" __type__ = "account" - __version__ = "0.60" + __version__ = "0.61" __status__ = "testing" __description__ = """Base account plugin""" @@ -335,7 +335,7 @@ class Account(Plugin): 'premium' : None, 'timestamp' : 0, 'trafficleft': None, - 'type' : self.__name__, + 'type' : self.__name, 'valid' : None, 'validuntil' : None} diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py index bdde514c0..12a4aed95 100644 --- a/module/plugins/internal/Addon.py +++ b/module/plugins/internal/Addon.py @@ -21,9 +21,10 @@ def threaded(fn): class Addon(Plugin): - __name__ = "Addon" + __name = "Addon" + __type = "addon" __type__ = "hook" #@TODO: Change to `addon` in 0.4.10 - __version__ = "0.12" + __version__ = "0.13" __status__ = "testing" __threaded__ = [] #@TODO: Remove in 0.4.10 @@ -59,12 +60,6 @@ class Addon(Plugin): self.init_events() - #@TODO: Remove in 0.4.10 - def _log(self, level, plugintype, pluginname, messages): - plugintype = "addon" if plugintype is "hook" else plugintype - return super(Addon, self)._log(level, plugintype, pluginname, messages) - - def init_events(self): if self.event_map: for event, funcs in self.event_map.items(): diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py index e3aaf202b..578b12f7f 100644 --- a/module/plugins/internal/Base.py +++ b/module/plugins/internal/Base.py @@ -45,7 +45,7 @@ def check_abort(fn): class Base(Plugin): - __name__ = "Base" + __name = "Base" __type__ = "base" __version__ = "0.11" __status__ = "testing" @@ -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 @@ -208,7 +208,8 @@ class Base(Plugin): self.pyfile.setStatus("starting") - self.log_debug("PROCESS URL " + self.pyfile.url, "PLUGIN VERSION %s" % self.__version__) + self.log_debug("PROCESS URL " + self.pyfile.url, + "PLUGIN VERSION %s" % self.__version) self.process(self.pyfile) diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py index a8f48b5e4..070621249 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 20dc60427..6870e4d81 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 2300c4cab..ffae0a990 100644 --- a/module/plugins/internal/Container.py +++ b/module/plugins/internal/Container.py @@ -11,7 +11,7 @@ from module.utils import save_join as fs_join class Container(Crypter): - __name__ = "Container" + __name = "Container" __type__ = "container" __version__ = "0.07" __status__ = "testing" diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 20322bb33..151d66860 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -6,7 +6,7 @@ from module.utils import save_path as safe_filename class Crypter(Base): - __name__ = "Crypter" + __name = "Crypter" __type__ = "crypter" __version__ = "0.13" __status__ = "testing" diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py index e7cc6ff39..911a7373b 100644 --- a/module/plugins/internal/DeadCrypter.py +++ b/module/plugins/internal/DeadCrypter.py @@ -4,7 +4,7 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo class DeadCrypter(Crypter): - __name__ = "DeadCrypter" + __name = "DeadCrypter" __type__ = "crypter" __version__ = "0.09" __status__ = "testing" diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py index 250287d25..2aeceb52f 100644 --- a/module/plugins/internal/DeadHoster.py +++ b/module/plugins/internal/DeadHoster.py @@ -4,7 +4,7 @@ from module.plugins.internal.Hoster import Hoster, create_getInfo class DeadHoster(Hoster): - __name__ = "DeadHoster" + __name = "DeadHoster" __type__ = "hoster" __version__ = "0.19" __status__ = "testing" diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py index 3ab5d6a0d..7933a33a6 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/Hook.py b/module/plugins/internal/Hook.py deleted file mode 100644 index f1308c25b..000000000 --- a/module/plugins/internal/Hook.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- - -from module.plugins.internal.Addon import Addon, threaded - - -class Hook(Addon): - __name__ = "Hook" - __type__ = "hook" - __version__ = "0.16" - __status__ = "testing" - - __description__ = """Base hook plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay" , "mkaay@mkaay.de" ), - ("RaNaN" , "RaNaN@pyload.org" ), - ("Walter Purcaro", "vuolter@gmail.com")] - - - PERIODICAL_INTERVAL = 10 - - - def __init__(self, *args, **kwargs): - super(Hook, self).__init__(*args, **kwargs) - if self.PERIODICAL_INTERVAL: - self.start_periodical(self.PERIODICAL_INTERVAL) - - - #@TODO: Remove in 0.4.10 - def _log(self, level, plugintype, pluginname, messages): - return super(Addon, self)._log(level, plugintype, pluginname.replace("Hook", ""), messages) - - - def periodical(self): - pass diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index d81154554..00bc3a4dd 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -11,7 +11,7 @@ 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" @@ -83,7 +83,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 9d4ac3ab9..8930fcb70 100644 --- a/module/plugins/internal/MultiCrypter.py +++ b/module/plugins/internal/MultiCrypter.py @@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class MultiCrypter(SimpleCrypter): - __name__ = "MultiCrypter" + __name = "MultiCrypter" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -27,4 +27,4 @@ class MultiCrypter(SimpleCrypter): return super(MultiCrypter, self)._log(level, plugintype, pluginname, - (self.CRYPTER_NAME,) + messages) + (self.PLUGIN_NAME,) + messages) diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 231615ae5..314bc6f92 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): - __name__ = "MultiHoster" + __name = "MultiHoster" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" @@ -56,7 +56,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 diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py index 333082425..ca87f91a6 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): diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index a2392fdcc..69dfc2412 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -260,9 +260,9 @@ def chunks(iterable, size): class Plugin(object): - __name__ = "Plugin" + __name = "Plugin" __type__ = "plugin" - __version__ = "0.53" + __version__ = "0.54" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -279,7 +279,7 @@ class Plugin(object): def __repr__(self): - return "<%(type)s %(name)s>" % {'type': self.__type__.capitalize(), + return "<%(type)s %(name)s>" % {'type': self.__type.capitalize(), 'name': self.__name__} @@ -289,6 +289,14 @@ 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): """ @@ -307,35 +315,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 f73e935e8..5093167ae 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 cf74c6646..b436998ec 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -14,7 +14,7 @@ from module.utils import fixup, fs_encode, parseFileSize as parse_size class SimpleHoster(Hoster): - __name__ = "SimpleHoster" + __name = "SimpleHoster" __type__ = "hoster" __version__ = "1.97" __status__ = "testing" @@ -224,7 +224,7 @@ class SimpleHoster(Hoster): 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: + if self.__pattern is not pattern and re.match(self.__pattern, self.pyfile.url) is None: self.leech_dl = True if self.leech_dl: @@ -458,11 +458,9 @@ class SimpleHoster(Hoster): name = self.pyfile.name size = self.pyfile.size - folder = self.info['folder'] = name self.log_info(_("File name: ") + name) self.log_info(_("File size: %s bytes") % size if size > 0 else _("File size: Unknown")) - # self.log_info("File folder: " + folder) #@TODO: Rewrite in 0.4.10 diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index 6f85c286a..e625dce11 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 87cbd568a..f71473ba2 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 4c3f35c2b..3b795257f 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 7ec9f3895..88a435178 100644 --- a/module/plugins/internal/XFSCrypter.py +++ b/module/plugins/internal/XFSCrypter.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- -import re - from module.plugins.internal.Plugin import set_cookie from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo class XFSCrypter(SimpleCrypter): - __name__ = "XFSCrypter" + __name = "XFSCrypter" __type__ = "crypter" __version__ = "0.18" __status__ = "testing" @@ -51,7 +49,7 @@ class XFSCrypter(SimpleCrypter): if self.account: account = self.account else: - account_name = re.sub(r'Folder$', "", self.__name__) + account_name = self.__name__.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 06715d2f1..0d6a61b33 100644 --- a/module/plugins/internal/XFSHoster.py +++ b/module/plugins/internal/XFSHoster.py @@ -11,7 +11,7 @@ from module.utils import html_unescape class XFSHoster(SimpleHoster): - __name__ = "XFSHoster" + __name = "XFSHoster" __type__ = "hoster" __version__ = "0.65" __status__ = "testing" |