diff options
Diffstat (limited to 'module/plugins/accounts')
94 files changed, 208 insertions, 211 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index 12d0582a8..73ba04a0e 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -6,13 +6,13 @@ import xml.dom.minidom as dom import BeautifulSoup -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class AlldebridCom(Account): +class AlldebridCom(MultiAccount): __name__ = "AlldebridCom" __type__ = "account" - __version__ = "0.28" + __version__ = "0.29" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/AniStreamCom.py b/module/plugins/accounts/AniStreamCom.py index 5c7ac9fff..fdbea5a2b 100644 --- a/module/plugins/accounts/AniStreamCom.py +++ b/module/plugins/accounts/AniStreamCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class AniStreamCom(XFSAccount): __name__ = "AniStreamCom" __type__ = "account" - __version__ = "0.02" + __version__ = "0.03" __status__ = "testing" __description__ = """Ani-Stream.com account plugin""" diff --git a/module/plugins/accounts/BackinNet.py b/module/plugins/accounts/BackinNet.py index d903f020c..8804139e6 100644 --- a/module/plugins/accounts/BackinNet.py +++ b/module/plugins/accounts/BackinNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class BackinNet(XFSAccount): __name__ = "BackinNet" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __description__ = """Backin.net account plugin""" diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index e8028b9d0..5e9a5dc3b 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class BitshareCom(Account): __name__ = "BitshareCom" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __description__ = """Bitshare account plugin""" diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py index 6e11064a6..7fafaa20f 100644 --- a/module/plugins/accounts/CatShareNet.py +++ b/module/plugins/accounts/CatShareNet.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class CatShareNet(Account): __name__ = "CatShareNet" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __description__ = """Catshare.net account plugin""" diff --git a/module/plugins/accounts/CloudsixMe.py b/module/plugins/accounts/CloudsixMe.py index 3410af002..eeb886647 100644 --- a/module/plugins/accounts/CloudsixMe.py +++ b/module/plugins/accounts/CloudsixMe.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class CloudsixMe(XFSAccount): __name__ = "CloudsixMe" __type__ = "account" - __version__ = "0.02" + __version__ = "0.03" __status__ = "testing" __description__ = """Cloudsix.me account plugin""" diff --git a/module/plugins/accounts/CloudzillaTo.py b/module/plugins/accounts/CloudzillaTo.py index 821975ef0..30b17fb4e 100644 --- a/module/plugins/accounts/CloudzillaTo.py +++ b/module/plugins/accounts/CloudzillaTo.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class CloudzillaTo(Account): __name__ = "CloudzillaTo" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __description__ = """Cloudzilla.to account plugin""" diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index 084aa79a6..4b1ef4120 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class CramitIn(XFSAccount): __name__ = "CramitIn" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __description__ = """Cramit.in account plugin""" diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index fd02abe0f..01030da91 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class CzshareCom(Account): __name__ = "CzshareCom" __type__ = "account" - __version__ = "0.24" + __version__ = "0.25" __status__ = "testing" __description__ = """Czshare.com account plugin, now Sdilej.cz""" diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index 50d849a98..65f863d2e 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -3,13 +3,13 @@ import re import time -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class DebridItaliaCom(Account): +class DebridItaliaCom(MultiAccount): __name__ = "DebridItaliaCom" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index 35df3f939..836fe3dee 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class DepositfilesCom(Account): __name__ = "DepositfilesCom" __type__ = "account" - __version__ = "0.36" + __version__ = "0.37" __status__ = "testing" __description__ = """Depositfiles.com account plugin""" diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 9340f49e6..7599ce633 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class EasybytezCom(XFSAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.14" + __version__ = "0.15" __status__ = "testing" __config__ = [("mh_activated", "bool" , "Use multihoster feature" , True ), diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index e5a05cd7f..78f45c532 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class EuroshareEu(Account): __name__ = "EuroshareEu" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """Euroshare.eu account plugin""" diff --git a/module/plugins/accounts/ExashareCom.py b/module/plugins/accounts/ExashareCom.py index 6b352e40e..95585ce2e 100644 --- a/module/plugins/accounts/ExashareCom.py +++ b/module/plugins/accounts/ExashareCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class ExashareCom(XFSAccount): __name__ = "ExashareCom" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __description__ = """Exashare.com account plugin""" diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index 83a02d76b..777b07ce9 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class FastixRu(Account): +class FastixRu(MultiAccount): __name__ = "FastixRu" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -23,13 +23,13 @@ class FastixRu(Account): html = self.load("http://fastix.ru/api_v2", get={'apikey': "5182964c3f8f9a7f0b00000a_kelmFB4n1IrnCDYuIFn2y", 'sub' : "allowed_sources"}) - host_list = json_loads(html) + host_list = json.loads(html) host_list = host_list['allow'] return host_list def grab_info(self, user, password, data): - html = json_loads(self.load("http://fastix.ru/api_v2/", + html = json.loads(self.load("http://fastix.ru/api_v2/", get={'apikey': data['apikey'], 'sub' : "getaccountdetails"})) @@ -44,7 +44,7 @@ class FastixRu(Account): def signin(self, user, password, data): - api = json_loads(self.load("https://fastix.ru/api_v2/", + api = json.loads(self.load("https://fastix.ru/api_v2/", get={'sub' : "get_apikey", 'email' : user, 'password': password})) diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py index 68c65bd3f..4c370390c 100644 --- a/module/plugins/accounts/FastshareCz.py +++ b/module/plugins/accounts/FastshareCz.py @@ -9,7 +9,7 @@ from module.plugins.internal.Plugin import set_cookie class FastshareCz(Account): __name__ = "FastshareCz" __type__ = "account" - __version__ = "0.11" + __version__ = "0.12" __status__ = "testing" __description__ = """Fastshare.cz account plugin""" diff --git a/module/plugins/accounts/File4SafeCom.py b/module/plugins/accounts/File4SafeCom.py index 8e5f437b3..462b66d6a 100644 --- a/module/plugins/accounts/File4SafeCom.py +++ b/module/plugins/accounts/File4SafeCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class File4SafeCom(XFSAccount): __name__ = "File4SafeCom" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """File4Safe.com account plugin""" diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py index 86183f4d3..1a3949583 100644 --- a/module/plugins/accounts/FileParadoxIn.py +++ b/module/plugins/accounts/FileParadoxIn.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FileParadoxIn(XFSAccount): __name__ = "FileParadoxIn" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """FileParadox.in account plugin""" diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index d80a8b9d6..96b8b6379 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json from module.plugins.internal.Account import Account from module.plugins.internal.Plugin import set_cookie @@ -8,7 +8,7 @@ from module.plugins.internal.Plugin import set_cookie class FilecloudIo(Account): __name__ = "FilecloudIo" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __description__ = """FilecloudIo account plugin""" @@ -22,7 +22,7 @@ class FilecloudIo(Account): for _i in xrange(5): rep = self.load("https://secure.filecloud.io/api-fetch_apikey.api", post={'username': user, 'password': password}) - rep = json_loads(rep) + rep = json.loads(rep) if rep['status'] == "ok": break elif rep['status'] == "error" and rep['message'] == "no such user or wrong password": @@ -35,7 +35,7 @@ class FilecloudIo(Account): self.accounts[user]['akey'] = akey #: Saved for hoster plugin rep = self.load("http://api.filecloud.io/api-fetch_account_details.api", post={'akey': akey}) - rep = json_loads(rep) + rep = json.loads(rep) if rep['is_premium'] == 1: return {'validuntil': float(rep['premium_until']), 'trafficleft': -1} diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 0f8f709c6..fad99d6ad 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class FilefactoryCom(Account): __name__ = "FilefactoryCom" __type__ = "account" - __version__ = "0.19" + __version__ = "0.20" __status__ = "testing" __description__ = """Filefactory.com account plugin""" diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 230aa9939..8c019c940 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class FilejungleCom(Account): __name__ = "FilejungleCom" __type__ = "account" - __version__ = "0.16" + __version__ = "0.17" __status__ = "testing" __description__ = """Filejungle.com account plugin""" diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py index 0bd0b60cf..429229a89 100644 --- a/module/plugins/accounts/FileomCom.py +++ b/module/plugins/accounts/FileomCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FileomCom(XFSAccount): __name__ = "FileomCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Fileom.com account plugin""" diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 96bdebd81..26742bf4c 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class FilerNet(Account): __name__ = "FilerNet" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __description__ = """Filer.net account plugin""" diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index d843dd605..b225b404a 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class FilerioCom(XFSAccount): __name__ = "FilerioCom" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __description__ = """FileRio.in account plugin""" diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index 551a7b8e5..da09c8569 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class FilesMailRu(Account): __name__ = "FilesMailRu" __type__ = "account" - __version__ = "0.15" + __version__ = "0.16" __status__ = "testing" __description__ = """Filesmail.ru account plugin""" diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index bc56d4b96..2fe710012 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -3,13 +3,13 @@ import time from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json class FileserveCom(Account): __name__ = "FileserveCom" __type__ = "account" - __version__ = "0.24" + __version__ = "0.25" __status__ = "testing" __description__ = """Fileserve.com account plugin""" @@ -22,7 +22,7 @@ class FileserveCom(Account): post={'username': user, 'password': password, 'submit': "Submit+Query"}) - res = json_loads(html) + res = json.loads(html) if res['type'] == "premium": validuntil = time.mktime(time.strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S")) @@ -36,7 +36,7 @@ class FileserveCom(Account): post={'username': user, 'password': password, 'submit' : "Submit+Query"}) - res = json_loads(html) + res = json.loads(html) if not res['type']: self.fail_login() diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index 08640dfa7..11801941b 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.Plugin import set_cookie class FourSharedCom(Account): __name__ = "FourSharedCom" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __description__ = """FourShared.com account plugin""" diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 8cb0436fc..2ad8a48b5 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class FreakshareCom(Account): __name__ = "FreakshareCom" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __description__ = """Freakshare.com account plugin""" diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 5e214db35..f978e813d 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class FreeWayMe(Account): +class FreeWayMe(MultiAccount): __name__ = "FreeWayMe" __type__ = "account" - __version__ = "0.19" + __version__ = "0.20" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -60,4 +60,4 @@ class FreeWayMe(Account): if answer == "Invalid login": self.fail_login() - return json_loads(answer) + return json.loads(answer) diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index e692394ef..6008849f7 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class FshareVn(Account): __name__ = "FshareVn" __type__ = "account" - __version__ = "0.14" + __version__ = "0.15" __status__ = "testing" __description__ = """Fshare.vn account plugin""" diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index d73b557ef..12f40a89a 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class Ftp(Account): __name__ = "Ftp" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Ftp dummy account plugin""" diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index b0cd87938..2e7077796 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class HellshareCz(Account): __name__ = "HellshareCz" __type__ = "account" - __version__ = "0.22" + __version__ = "0.23" __status__ = "testing" __description__ = """Hellshare.cz account plugin""" diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 3b39b7da6..d91dd52f4 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class HighWayMe(Account): +class HighWayMe(MultiAccount): __name__ = "HighWayMe.py" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -20,7 +20,7 @@ class HighWayMe(Account): def grab_hosters(self, user, password, data): - json_data = json_loads(self.load("https://high-way.me/api.php", + json_data = json.loads(self.load("https://high-way.me/api.php", get={'hoster': 1})) return [element['name'] for element in json_data['hoster']] @@ -34,7 +34,7 @@ class HighWayMe(Account): self.log_debug("JSON data: %s" % json_data) - json_data = json_loads(json_data) + json_data = json.loads(json_data) if 'premium' in json_data['user'] and json_data['user']['premium']: premium = True diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 261b3b240..3240450f0 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class Http(Account): __name__ = "Http" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Http dummy account plugin""" diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py index a5920f4a4..fddc7cfa5 100644 --- a/module/plugins/accounts/HugefilesNet.py +++ b/module/plugins/accounts/HugefilesNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class HugefilesNet(XFSAccount): __name__ = "HugefilesNet" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Hugefiles.net account plugin""" diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py index 8b757de61..ff9383379 100644 --- a/module/plugins/accounts/HundredEightyUploadCom.py +++ b/module/plugins/accounts/HundredEightyUploadCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): __name__ = "HundredEightyUploadCom" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __description__ = """180upload.com account plugin""" diff --git a/module/plugins/accounts/JunkyvideoCom.py b/module/plugins/accounts/JunkyvideoCom.py index 316332fd9..1a990b5f7 100644 --- a/module/plugins/accounts/JunkyvideoCom.py +++ b/module/plugins/accounts/JunkyvideoCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class JunkyvideoCom(XFSAccount): __name__ = "JunkyvideoCom" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __description__ = """Junkyvideo.com account plugin""" diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py index 95bc57640..f2fe493a6 100644 --- a/module/plugins/accounts/JunocloudMe.py +++ b/module/plugins/accounts/JunocloudMe.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class JunocloudMe(XFSAccount): __name__ = "JunocloudMe" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Junocloud.me account plugin""" diff --git a/module/plugins/accounts/Keep2ShareCc.py b/module/plugins/accounts/Keep2ShareCc.py index 494f2938f..094a8ca79 100644 --- a/module/plugins/accounts/Keep2ShareCc.py +++ b/module/plugins/accounts/Keep2ShareCc.py @@ -10,7 +10,7 @@ from module.plugins.internal.Plugin import set_cookie class Keep2ShareCc(Account): __name__ = "Keep2ShareCc" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __description__ = """Keep2Share.cc account plugin""" diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index f7350e547..c272346a2 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- from module.plugins.internal.Account import Account -# from module.common.json_layer import json_loads, json_dumps +# from module.plugins.internal.utils import json class LetitbitNet(Account): __name__ = "LetitbitNet" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __description__ = """Letitbit.net account plugin""" @@ -19,9 +19,9 @@ class LetitbitNet(Account): ## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ## # json_data = [password, ['key/info']] # api_rep = self.load("http://api.letitbit.net/json", - # post={'r': json_dumps(json_data)}) + # post={'r': json.dumps(json_data)}) # self.log_debug("API Key Info: " + api_rep) - # api_rep = json_loads(api_rep) + # api_rep = json.loads(api_rep) # # if api_rep['status'] == "FAIL": # self.log_warning(api_rep['data']) diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py index 6953f311c..f22dffe15 100644 --- a/module/plugins/accounts/LinksnappyCom.py +++ b/module/plugins/accounts/LinksnappyCom.py @@ -2,14 +2,14 @@ import hashlib -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class LinksnappyCom(Account): +class LinksnappyCom(MultiAccount): __name__ = "LinksnappyCom" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -23,7 +23,7 @@ class LinksnappyCom(Account): def grab_hosters(self, user, password, data): json_data = self.load("http://gen.linksnappy.com/lseAPI.php", get={'act': "FILEHOSTS"}) - json_data = json_loads(json_data) + json_data = json.loads(json_data) return json_data['return'].keys() @@ -36,7 +36,7 @@ class LinksnappyCom(Account): self.log_debug("JSON data: " + r) - j = json_loads(r) + j = json.loads(r) if j['error']: return {'premium': False} diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py index 46375716f..59f5b58be 100644 --- a/module/plugins/accounts/MegaDebridEu.py +++ b/module/plugins/accounts/MegaDebridEu.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class MegaDebridEu(Account): +class MegaDebridEu(MultiAccount): __name__ = "MegaDebridEu" __type__ = "account" - __version__ = "0.24" + __version__ = "0.25" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -25,7 +25,7 @@ class MegaDebridEu(Account): def grab_hosters(self, user, password, data): reponse = self.load("http://www.mega-debrid.eu/api.php", get={'action': "getHosters"}) - json_data = json_loads(reponse) + json_data = json.loads(reponse) if json_data['response_code'] == "ok": host_list = [element[0] for element in json_data['hosters']] @@ -41,7 +41,7 @@ class MegaDebridEu(Account): get={'action' : 'connectUser', 'login' : user, 'password': password}) - res = json_loads(jsonResponse) + res = json.loads(jsonResponse) if res['response_code'] == "ok": return {'premium': True, 'validuntil': float(res['vip_end']), 'status': True} @@ -55,6 +55,6 @@ class MegaDebridEu(Account): get={'action' : 'connectUser', 'login' : user, 'password': password}) - res = json_loads(jsonResponse) + res = json.loads(jsonResponse) if res['response_code'] != "ok": self.fail_login() diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py index 050e3e4c6..ed9144138 100644 --- a/module/plugins/accounts/MegaRapidCz.py +++ b/module/plugins/accounts/MegaRapidCz.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class MegaRapidCz(Account): __name__ = "MegaRapidCz" __type__ = "account" - __version__ = "0.39" + __version__ = "0.40" __status__ = "testing" __description__ = """MegaRapid.cz account plugin""" diff --git a/module/plugins/accounts/MegaRapidoNet.py b/module/plugins/accounts/MegaRapidoNet.py index d8291e0e2..585d041de 100644 --- a/module/plugins/accounts/MegaRapidoNet.py +++ b/module/plugins/accounts/MegaRapidoNet.py @@ -3,13 +3,13 @@ import re import time -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class MegaRapidoNet(Account): +class MegaRapidoNet(MultiAccount): __name__ = "MegaRapidoNet" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index 9b4fda9f7..9b4d74144 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class MegasharesCom(Account): __name__ = "MegasharesCom" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """Megashares.com account plugin""" diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py index 1594a2b6a..ec8623685 100644 --- a/module/plugins/accounts/MovReelCom.py +++ b/module/plugins/accounts/MovReelCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class MovReelCom(XFSAccount): __name__ = "MovReelCom" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __description__ = """Movreel.com account plugin""" diff --git a/module/plugins/accounts/MultihostersCom.py b/module/plugins/accounts/MultihostersCom.py index 1ede88574..72c9096ad 100644 --- a/module/plugins/accounts/MultihostersCom.py +++ b/module/plugins/accounts/MultihostersCom.py @@ -6,7 +6,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class MultihostersCom(ZeveraCom): __name__ = "MultihostersCom" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __description__ = """Multihosters.com account plugin""" diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 16fa57948..3faad42c3 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -2,13 +2,13 @@ import re -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class MultishareCz(Account): +class MultishareCz(MultiAccount): __name__ = "MultishareCz" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py index eff112a2f..ed527cf70 100644 --- a/module/plugins/accounts/MyfastfileCom.py +++ b/module/plugins/accounts/MyfastfileCom.py @@ -2,14 +2,14 @@ import time -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class MyfastfileCom(Account): +class MyfastfileCom(MultiAccount): __name__ = "MyfastfileCom" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -24,7 +24,7 @@ class MyfastfileCom(Account): def grab_hosters(self, user, password, data): json_data = self.load("http://myfastfile.com/api.php", get={'hosts': ""}) self.log_debug("JSON data", json_data) - json_data = json_loads(json_data) + json_data = json.loads(json_data) return json_data['hosts'] @@ -44,6 +44,6 @@ class MyfastfileCom(Account): self.log_debug("JSON data: " + html) - self.json_data = json_loads(html) + self.json_data = json.loads(html) if self.json_data['status'] != 'ok': self.fail_login(_("Invalid username or password")) diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py index 0b9e67a7c..45587b8a0 100644 --- a/module/plugins/accounts/NitroflareCom.py +++ b/module/plugins/accounts/NitroflareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class NitroflareCom(Account): __name__ = "NitroflareCom" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __description__ = """Nitroflare.com account plugin""" diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py index f8236c978..b5cbd5a05 100644 --- a/module/plugins/accounts/NoPremiumPl.py +++ b/module/plugins/accounts/NoPremiumPl.py @@ -4,15 +4,14 @@ import datetime import hashlib import time -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account -# from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class NoPremiumPl(Account): +class NoPremiumPl(MultiAccount): __name__ = "NoPremiumPl" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -33,7 +32,7 @@ class NoPremiumPl(Account): 'info' : "1" } def grab_hosters(self, user, password, data): - hostings = json_loads(self.load("https://www.nopremium.pl/clipboard.php?json=3").strip()) + hostings = json.loads(self.load("https://www.nopremium.pl/clipboard.php?json=3").strip()) hostings_domains = [domain for row in hostings for domain in row['domains'] if row['sdownload'] == "0"] self.log_debug(hostings_domains) @@ -43,7 +42,7 @@ class NoPremiumPl(Account): def grab_info(self, user, password, data): try: - result = json_loads(self.run_auth_query()) + result = json.loads(self.run_auth_query()) except Exception: #@TODO: return or let it be thrown? @@ -68,7 +67,7 @@ class NoPremiumPl(Account): data['pwd'] = hashlib.sha1(hashlib.md5(password).hexdigest()).hexdigest() try: - response = json_loads(self.run_auth_query()) + response = json.loads(self.run_auth_query()) except Exception: self.fail_login() diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py index 65ac8d4fc..e454c7151 100644 --- a/module/plugins/accounts/NosuploadCom.py +++ b/module/plugins/accounts/NosuploadCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class NosuploadCom(XFSAccount): __name__ = "NosuploadCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Nosupload.com account plugin""" diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py index 1506ec315..c20d2b66e 100644 --- a/module/plugins/accounts/NovafileCom.py +++ b/module/plugins/accounts/NovafileCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class NovafileCom(XFSAccount): __name__ = "NovafileCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Novafile.com account plugin""" diff --git a/module/plugins/accounts/NowVideoSx.py b/module/plugins/accounts/NowVideoSx.py index 3375207d9..9ff8f0172 100644 --- a/module/plugins/accounts/NowVideoSx.py +++ b/module/plugins/accounts/NowVideoSx.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class NowVideoSx(Account): __name__ = "NowVideoSx" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """NowVideo.at account plugin""" diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py index c19396854..e1ad9ca0f 100644 --- a/module/plugins/accounts/OboomCom.py +++ b/module/plugins/accounts/OboomCom.py @@ -16,14 +16,14 @@ except ImportError: def hexread(self, octets): return b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json from module.plugins.internal.Account import Account class OboomCom(Account): __name__ = "OboomCom" __type__ = "account" - __version__ = "0.29" + __version__ = "0.30" __status__ = "testing" __description__ = """Oboom.com account plugin""" @@ -35,7 +35,7 @@ class OboomCom(Account): salt = password[::-1] pbkdf2 = PBKDF2(password, salt, 1000).hexread(16) - result = json_loads(self.load("http://www.oboom.com/1/login", #@TODO: Revert to `https` in 0.4.10 + result = json.loads(self.load("http://www.oboom.com/1/login", #@TODO: Revert to `https` in 0.4.10 get={'auth': user, 'pass': pbkdf2})) diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 01db3b088..ed741b373 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class OneFichierCom(Account): __name__ = "OneFichierCom" __type__ = "account" - __version__ = "0.18" + __version__ = "0.19" __status__ = "testing" __description__ = """1fichier.com account plugin""" diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index 02d0d2649..9a302672a 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class OverLoadMe(Account): +class OverLoadMe(MultiAccount): __name__ = "OverLoadMe" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -30,7 +30,7 @@ class OverLoadMe(Account): get={'user': user, 'auth': password}).strip() - data = json_loads(html) + data = json.loads(html) self.log_debug(data) #: Check for premium @@ -45,7 +45,7 @@ class OverLoadMe(Account): get={'user': user, 'auth': password}).strip() - data = json_loads(jsondata) + data = json.loads(jsondata) if data['err'] == 1: self.fail_login() diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py index 74859d8a5..39e5012fa 100644 --- a/module/plugins/accounts/PremiumTo.py +++ b/module/plugins/accounts/PremiumTo.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class PremiumTo(Account): +class PremiumTo(MultiAccount): __name__ = "PremiumTo" __type__ = "account" - __version__ = "0.13" + __version__ = "0.14" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index 2dc9b8a71..ac4c689e4 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class PremiumizeMe(Account): +class PremiumizeMe(MultiAccount): __name__ = "PremiumizeMe" __type__ = "account" - __version__ = "0.21" + __version__ = "0.22" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -26,7 +26,7 @@ class PremiumizeMe(Account): get={'method' : "hosterlist", 'params[login]': user, 'params[pass]' : password}) - data = json_loads(answer) + data = json.loads(answer) #: If account is not valid thera are no hosters available if data['status'] != 200: @@ -67,4 +67,4 @@ class PremiumizeMe(Account): get={'method' : "accountstatus", 'params[login]': user, 'params[pass]' : password}) - return json_loads(answer) + return json.loads(answer) diff --git a/module/plugins/accounts/PutdriveCom.py b/module/plugins/accounts/PutdriveCom.py index 4da71f41b..81f219a40 100644 --- a/module/plugins/accounts/PutdriveCom.py +++ b/module/plugins/accounts/PutdriveCom.py @@ -6,7 +6,7 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class PutdriveCom(ZeveraCom): __name__ = "PutdriveCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Putdrive.com account plugin""" diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index 19cde51c4..5b67cf169 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class QuickshareCz(Account): __name__ = "QuickshareCz" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """Quickshare.cz account plugin""" diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index 3b814debc..01f653483 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json -class RPNetBiz(Account): +class RPNetBiz(MultiAccount): __name__ = "RPNetBiz" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -24,7 +24,7 @@ class RPNetBiz(Account): get={'username': user, 'password': password, 'action' : "showHosterList"}) - hoster_list = json_loads(res) + hoster_list = json.loads(res) #: If account is not valid thera are no hosters available if 'error' in hoster_list: @@ -68,4 +68,4 @@ class RPNetBiz(Account): 'action': "showAccountInformation"}) self.log_debug("JSON data: %s" % res) - return json_loads(res) + return json.loads(res) diff --git a/module/plugins/accounts/RapideoPl.py b/module/plugins/accounts/RapideoPl.py index fc17622b0..27c2a3d54 100644 --- a/module/plugins/accounts/RapideoPl.py +++ b/module/plugins/accounts/RapideoPl.py @@ -4,15 +4,14 @@ import datetime import hashlib import time -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account -# from module.plugins.internal.MultiAccount import MultiAccount +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class RapideoPl(Account): +class RapideoPl(MultiAccount): __name__ = "RapideoPl" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -33,7 +32,7 @@ class RapideoPl(Account): 'info' : "1" } def grab_hosters(self, user, password, data): - hostings = json_loads(self.load("https://www.rapideo.pl/clipboard.php?json=3").strip()) + hostings = json.loads(self.load("https://www.rapideo.pl/clipboard.php?json=3").strip()) hostings_domains = [domain for row in hostings for domain in row['domains'] if row['sdownload'] == "0"] self.log_debug(hostings_domains) @@ -43,7 +42,7 @@ class RapideoPl(Account): def grab_info(self, user, password, data): try: - result = json_loads(self.run_auth_query()) + result = json.loads(self.run_auth_query()) except Exception: #@TODO: return or let it be thrown? @@ -68,7 +67,7 @@ class RapideoPl(Account): data['pwd'] = hashlib.md5(password).hexdigest() try: - response = json_loads(self.run_auth_query()) + response = json.loads(self.run_auth_query()) except Exception: self.fail_login() diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py index a28c61b36..4c2778c1c 100644 --- a/module/plugins/accounts/RapidfileshareNet.py +++ b/module/plugins/accounts/RapidfileshareNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RapidfileshareNet(XFSAccount): __name__ = "RapidfileshareNet" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """Rapidfileshare.net account plugin""" diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index ea6da4c4b..20b51b90f 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -3,13 +3,13 @@ import urlparse from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.utils import jso class RapidgatorNet(Account): __name__ = "RapidgatorNet" __type__ = "account" - __version__ = "0.15" + __version__ = "0.17" __status__ = "testing" __description__ = """Rapidgator.net account plugin""" @@ -28,24 +28,23 @@ class RapidgatorNet(Account): try: sid = data.get('sid', None) - assert sid html = self.load(urlparse.urljoin(self.API_URL, "info"), get={'sid': sid}) self.log_debug("API:USERINFO", html) - json = json_loads(html) + jso = json.loads(html) - if json['response_status'] == 200: - if "reset_in" in json['response']: - self._schedule_refresh(user, json['response']['reset_in']) + if jso['response_status'] == 200: + if "reset_in" in jso['response']: + self._schedule_refresh(user, jso['response']['reset_in']) - validuntil = json['response']['expire_date'] - trafficleft = float(json['response']['traffic_left']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10 + validuntil = jso['response']['expire_date'] + trafficleft = float(jso['response']['traffic_left']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10 premium = True else: - self.log_error(json['response_details']) + self.log_error(jso['response_details']) except Exception, e: self.log_error(e, trace=True) @@ -64,13 +63,13 @@ class RapidgatorNet(Account): self.log_debug("API:LOGIN", html) - json = json_loads(html) + jso = json.loads(html) - if json['response_status'] == 200: - data['sid'] = str(json['response']['session_id']) + if jso['response_status'] == 200: + data['sid'] = str(jso['response']['session_id']) return else: - self.log_error(json['response_details']) + self.log_error(jso['response_details']) except Exception, e: self.log_error(e, trace=True) diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index c11eb9214..cde39a361 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -4,13 +4,13 @@ import re import time from module.plugins.internal.Account import Account -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json class RapiduNet(Account): __name__ = "RapiduNet" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __description__ = """Rapidu.net account plugin""" @@ -53,14 +53,14 @@ class RapiduNet(Account): post={'_go' : "", 'lang': "en"}) - json = json_loads(self.load("https://rapidu.net/ajax.php", + jso = json.loads(self.load("https://rapidu.net/ajax.php", get={'a': "getUserLogin"}, post={'_go' : "", 'login' : user, 'pass' : password, 'remember': "1"})) - self.log_debug(json) + self.log_debug(jso) - if json['message'] != "success": + if jso['message'] != "success": self.fail_login() diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index 0004c0f79..614dba00b 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RarefileNet(XFSAccount): __name__ = "RarefileNet" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __description__ = """RareFile.net account plugin""" diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 63ef62da0..d023a02c8 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -2,13 +2,13 @@ import xml.dom.minidom as dom -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class RealdebridCom(Account): +class RealdebridCom(MultiAccount): __name__ = "RealdebridCom" __type__ = "account" - __version__ = "0.50" + __version__ = "0.51" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 4ff3f15a8..41e0be150 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class RehostTo(Account): +class RehostTo(MultiAccount): __name__ = "RehostTo" __type__ = "account" - __version__ = "0.21" + __version__ = "0.22" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index 84b786bac..dd91a8853 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): __name__ = "RyushareCom" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __status__ = "testing" __description__ = """Ryushare.com account plugin""" diff --git a/module/plugins/accounts/SafesharingEu.py b/module/plugins/accounts/SafesharingEu.py index 632b2bff8..17a48a62e 100644 --- a/module/plugins/accounts/SafesharingEu.py +++ b/module/plugins/accounts/SafesharingEu.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SafesharingEu(XFSAccount): __name__ = "SafesharingEu" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Safesharing.eu account plugin""" diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py index e3f2dbc4f..fef0506f0 100644 --- a/module/plugins/accounts/SecureUploadEu.py +++ b/module/plugins/accounts/SecureUploadEu.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SecureUploadEu(XFSAccount): __name__ = "SecureUploadEu" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """SecureUpload.eu account plugin""" diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py index a1675b654..8b9d4a934 100644 --- a/module/plugins/accounts/SendmywayCom.py +++ b/module/plugins/accounts/SendmywayCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SendmywayCom(XFSAccount): __name__ = "SendmywayCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Sendmyway.com account plugin""" diff --git a/module/plugins/accounts/SharebeastCom.py b/module/plugins/accounts/SharebeastCom.py index b8ddbe34d..e4dc7c4b3 100644 --- a/module/plugins/accounts/SharebeastCom.py +++ b/module/plugins/accounts/SharebeastCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class SharebeastCom(XFSAccount): __name__ = "SharebeastCom" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __description__ = """Sharebeast.com account plugin""" diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index f5d213ecd..1083af99f 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -9,7 +9,7 @@ from module.plugins.internal.Plugin import set_cookie class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.41" + __version__ = "0.42" __status__ = "testing" __description__ = """Share-online.biz account plugin""" diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py index 2be8782ce..bd86f024c 100644 --- a/module/plugins/accounts/SimplyPremiumCom.py +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount from module.plugins.internal.Plugin import set_cookie -class SimplyPremiumCom(Account): +class SimplyPremiumCom(MultiAccount): __name__ = "SimplyPremiumCom" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -22,7 +22,7 @@ class SimplyPremiumCom(Account): def grab_hosters(self, user, password, data): json_data = self.load("http://www.simply-premium.com/api/hosts.php", get={'format': "json", 'online': 1}) - json_data = json_loads(json_data) + json_data = json.loads(json_data) host_list = [element['regex'] for element in json_data['result']] @@ -38,7 +38,7 @@ class SimplyPremiumCom(Account): self.log_debug("JSON data: %s" % json_data) - json_data = json_loads(json_data) + json_data = json.loads(json_data) if 'vip' in json_data['result'] and json_data['result']['vip']: premium = True diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index bd56dd5ec..94096b8a2 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -2,13 +2,13 @@ import time -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class SimplydebridCom(Account): +class SimplydebridCom(MultiAccount): __name__ = "SimplydebridCom" __type__ = "account" - __version__ = "0.15" + __version__ = "0.16" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py index 1c3da5269..78642dca1 100644 --- a/module/plugins/accounts/SmoozedCom.py +++ b/module/plugins/accounts/SmoozedCom.py @@ -19,14 +19,14 @@ except ImportError: def hexread(self, octets): return b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) -from module.common.json_layer import json_loads -from module.plugins.internal.Account import Account +from module.plugins.internal.utils import json +from module.plugins.internal.MultiAccount import MultiAccount -class SmoozedCom(Account): +class SmoozedCom(MultiAccount): __name__ = "SmoozedCom" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), @@ -83,6 +83,6 @@ class SmoozedCom(Account): salt = hashlib.sha256(password).hexdigest() encrypted = PBKDF2(password, salt, iterations=1000).hexread(32) - return json_loads(self.load("http://www2.smoozed.com/api/login", + return json.loads(self.load("http://www2.smoozed.com/api/login", get={'auth': user, 'password': encrypted})) diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py index 54dd8e2fe..dc91cc3a7 100644 --- a/module/plugins/accounts/StreamcloudEu.py +++ b/module/plugins/accounts/StreamcloudEu.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class StreamcloudEu(XFSAccount): __name__ = "StreamcloudEu" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Streamcloud.eu account plugin""" diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index c3edd0c09..c8888c862 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -10,7 +10,7 @@ from module.plugins.internal.Plugin import set_cookie class TurbobitNet(Account): __name__ = "TurbobitNet" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """TurbobitNet account plugin""" diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py index d826e5a3d..883a86cf1 100644 --- a/module/plugins/accounts/TusfilesNet.py +++ b/module/plugins/accounts/TusfilesNet.py @@ -9,7 +9,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class TusfilesNet(XFSAccount): __name__ = "TusfilesNet" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __status__ = "testing" __description__ = """Tusfile.net account plugin""" diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 8380099e1..0080375de 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class UlozTo(Account): __name__ = "UlozTo" __type__ = "account" - __version__ = "0.14" + __version__ = "0.15" __status__ = "testing" __description__ = """Uloz.to account plugin""" diff --git a/module/plugins/accounts/UploadableCh.py b/module/plugins/accounts/UploadableCh.py index eefa1f3a0..1dd9f5fc6 100644 --- a/module/plugins/accounts/UploadableCh.py +++ b/module/plugins/accounts/UploadableCh.py @@ -6,7 +6,7 @@ from module.plugins.internal.Account import Account class UploadableCh(Account): __name__ = "UploadableCh" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __status__ = "testing" __description__ = """Uploadable.ch account plugin""" diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py index dbad01858..c9298f03d 100644 --- a/module/plugins/accounts/UploadcCom.py +++ b/module/plugins/accounts/UploadcCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class UploadcCom(XFSAccount): __name__ = "UploadcCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """Uploadc.com account plugin""" diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 1e92195a1..c689dc122 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" - __version__ = "0.38" + __version__ = "0.39" __status__ = "testing" __description__ = """Uploaded.to account plugin""" diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index c5e684033..c1dd8d5e9 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Account import Account class UploadheroCom(Account): __name__ = "UploadheroCom" __type__ = "account" - __version__ = "0.25" + __version__ = "0.26" __status__ = "testing" __description__ = """Uploadhero.co account plugin""" diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index 6c7103b21..c64c464da 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.Plugin import set_cookies class UploadingCom(Account): __name__ = "UploadingCom" __type__ = "account" - __version__ = "0.16" + __version__ = "0.17" __status__ = "testing" __description__ = """Uploading.com account plugin""" diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index bdd037af8..c543193f3 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -3,14 +3,14 @@ import re import urlparse -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json from module.plugins.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): __name__ = "UptoboxCom" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __description__ = """Uptobox.com account plugin""" @@ -39,5 +39,5 @@ class UptoboxCom(XFSAccount): 'password': password}, cookies=self.COOKIES) - if json_loads(html).get('error'): + if json.loads(html).get('error'): self.fail_login() diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py index e54515faf..ad68469b6 100644 --- a/module/plugins/accounts/VidPlayNet.py +++ b/module/plugins/accounts/VidPlayNet.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class VidPlayNet(XFSAccount): __name__ = "VidPlayNet" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __status__ = "testing" __description__ = """VidPlay.net account plugin""" diff --git a/module/plugins/accounts/WebshareCz.py b/module/plugins/accounts/WebshareCz.py index 484ea06ce..f7d50e74b 100644 --- a/module/plugins/accounts/WebshareCz.py +++ b/module/plugins/accounts/WebshareCz.py @@ -12,7 +12,7 @@ from module.plugins.internal.Account import Account class WebshareCz(Account): __name__ = "WebshareCz" __type__ = "account" - __version__ = "0.12" + __version__ = "0.13" __status__ = "testing" __description__ = """Webshare.cz account plugin""" diff --git a/module/plugins/accounts/WorldbytezCom.py b/module/plugins/accounts/WorldbytezCom.py index 6987bc0cc..ddbc08ded 100644 --- a/module/plugins/accounts/WorldbytezCom.py +++ b/module/plugins/accounts/WorldbytezCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class WorldbytezCom(XFSAccount): __name__ = "WorldbytezCom" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __status__ = "testing" __description__ = """Worldbytez.com account plugin""" diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 68797b7f0..354fc6446 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): __name__ = "XFileSharingPro" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __description__ = """XFileSharingPro multi-purpose account plugin""" diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index 695dd79cd..3ff0c33d6 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class YibaishiwuCom(Account): __name__ = "YibaishiwuCom" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __description__ = """115.com account plugin""" diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index c94ad6db7..48219357f 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -2,13 +2,13 @@ import time -from module.plugins.internal.Account import Account +from module.plugins.internal.MultiAccount import MultiAccount -class ZeveraCom(Account): +class ZeveraCom(MultiAccount): __name__ = "ZeveraCom" __type__ = "account" - __version__ = "0.30" + __version__ = "0.31" __status__ = "testing" __config__ = [("mh_mode" , "all;listed;unlisted", "Filter hosters to use" , "all"), |