diff options
Diffstat (limited to 'module/plugins/hoster')
23 files changed, 27 insertions, 27 deletions
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index dd7490365..c8fb1f3db 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -67,12 +67,12 @@ class BasePlugin(Hoster): self.log_debug("Auth required", "Received HTTP status code: %d" % e.code) account = self.pyload.accountManager.getAccountPlugin('Http') - servers = [x['login'] for x in account.get_all_accounts()] + servers = [x['login'] for x in account.getAllAccounts()] #@TODO: Recheck in 0.4.10 server = urlparse.urlparse(pyfile.url).netloc if server in servers: self.log_debug("Logging on to %s" % server) - self.req.addAuth(account.get_account_data(server)['password']) + self.req.addAuth(account.get_data(server)['password']) else: pwd = self.get_password() if ':' in pwd: diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 77f86932a..0019cf3c2 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -27,7 +27,7 @@ class FastixRu(MultiHoster): def handle_premium(self, pyfile): - api_key = self.account.get_account_data(self.user) + api_key = self.account.get_data(self.user) api_key = api_key['api'] self.html = self.load("http://fastix.ru/api_v2/", diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index 7d828f706..21654fee3 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -111,7 +111,7 @@ class FilecloudIo(SimpleHoster): def handle_premium(self, pyfile): - akey = self.account.get_account_data(self.user)['akey'] + akey = self.account.get_data(self.user)['akey'] ukey = self.info['pattern']['ID'] self.log_debug("Akey: %s | Ukey: %s" % (akey, ukey)) rep = self.load("http://api.filecloud.io/api-fetch_download_url.api", diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 13680dec0..6cc42cb4b 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -187,7 +187,7 @@ class FileserveCom(Hoster): #: Try api download res = self.load("http://app.fileserve.com/api/download/premium/", post={'username': self.user, - 'password': self.account.get_account_data(self.user)['password'], + 'password': self.account.get_data(self.user)['password'], 'shorten': self.file_id}) if res: res = json_loads(res) diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index e8917c88d..430562ce9 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -25,7 +25,7 @@ class FreeWayMe(MultiHoster): def handle_premium(self, pyfile): - user, data = self.account.select_account() + user, data = self.account.select() for _i in xrange(5): #: Try it five times @@ -33,7 +33,7 @@ class FreeWayMe(MultiHoster): get={'multiget': 7, 'url' : pyfile.url, 'user' : user, - 'pw' : self.account.get_account_data(user)['password'], + 'pw' : self.account.get_data(user)['password'], 'json' : ""}, just_header=True) diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index b431198d5..99185338f 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -39,11 +39,11 @@ class Ftp(Hoster): pass if not "@" in netloc: - servers = [x['login'] for x in self.account.get_all_accounts()] if self.account else [] + servers = [x['login'] for x in self.account.getAllAccounts()] if self.account else [] if netloc in servers: self.log_debug("Logging on to %s" % netloc) - self.req.addAuth(self.account.get_account_info(netloc)['password']) + self.req.addAuth(self.account.get_data(netloc)['password']) else: pwd = self.get_password() if ':' in pwd: diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py index 03314548c..b3aaa892e 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -124,7 +124,7 @@ class LetitbitNet(SimpleHoster): def handle_premium(self, pyfile): api_key = self.user - premium_key = self.account.get_account_data(self.user)['password'] + premium_key = self.account.get_data(self.user)['password'] json_data = [api_key, ["download/direct_links", {'pass': premium_key, 'link': pyfile.url}]] api_rep = self.load('http://api.letitbit.net/json', post={'r': json_dumps(json_data)}) diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py index 5490d9e71..817978542 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -30,7 +30,7 @@ class LinksnappyCom(MultiHoster): json_params = json_dumps({'link' : pyfile.url, 'type' : host, 'username': self.user, - 'password': self.account.get_account_data(self.user)['password']}) + 'password': self.account.get_data(self.user)['password']}) r = self.load("http://gen.linksnappy.com/genAPI.php", post={'genLinks': json_params}) diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py index 631fe18ca..9049f0cd9 100644 --- a/module/plugins/hoster/MegaDebridEu.py +++ b/module/plugins/hoster/MegaDebridEu.py @@ -30,7 +30,7 @@ class MegaDebridEu(MultiHoster): Connexion to the mega-debrid API Return True if succeed """ - user, data = self.account.select_account() + user, data = self.account.select() jsonResponse = self.load(self.API_URL, get={'action': 'connectUser', 'login': user, 'password': data['password']}) res = json_loads(jsonResponse) diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py index 29917d27f..6676a565d 100644 --- a/module/plugins/hoster/MegaRapidoNet.py +++ b/module/plugins/hoster/MegaRapidoNet.py @@ -47,7 +47,7 @@ class MegaRapidoNet(MultiHoster): 'links' : pyfile.url, 'exibir' : "normal", 'usar' : "premium", - 'user' : self.account.get_account_info(self.user).get('sid', None), + 'user' : self.account.get_data(self.user).get('sid', None), 'autoreset': ""}) if "desloga e loga novamente para gerar seus links" in self.html.lower(): diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index 346010b0c..f855cd5bf 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -27,7 +27,7 @@ class MyfastfileCom(MultiHoster): def handle_premium(self, pyfile): self.html = self.load('http://myfastfile.com/api.php', - get={'user': self.user, 'pass': self.account.get_account_data(self.user)['password'], + get={'user': self.user, 'pass': self.account.get_data(self.user)['password'], 'link': pyfile.url}) self.log_debug("JSON data: " + self.html) diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index 8b66fd5f2..9e2a5a93c 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -39,7 +39,7 @@ class NoPremiumPl(MultiHoster): def prepare(self): super(NoPremiumPl, self).prepare() - data = self.account.get_account_data(self.user) + data = self.account.get_data(self.user) self.usr = data['usr'] self.pwd = data['pwd'] diff --git a/module/plugins/hoster/OboomCom.py b/module/plugins/hoster/OboomCom.py index 68e593dd4..480febf61 100644 --- a/module/plugins/hoster/OboomCom.py +++ b/module/plugins/hoster/OboomCom.py @@ -58,7 +58,7 @@ class OboomCom(Hoster): def get_session_token(self): if self.premium: - accountInfo = self.account.get_account_info(self.user, True) + accountInfo = self.account.get_data(self.user, True) if "session" in accountInfo: self.session_token = accountInfo['session'] else: diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 1ae24fcc3..0b5bab6a5 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -28,7 +28,7 @@ class OverLoadMe(MultiHoster): def handle_premium(self, pyfile): - data = self.account.get_account_data(self.user) + data = self.account.get_data(self.user) page = self.load("https://api.over-load.me/getdownload.php", get={'auth': data['password'], 'link': pyfile.url}) diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 6442b09b9..fb00bb84f 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -31,7 +31,7 @@ class PremiumizeMe(MultiHoster): pyfile.name = ".".join(temp) #: Get account data - user, data = self.account.select_account() + user, data = self.account.select() #: Get rewritten link using the premiumize.me api v1 (see https://secure.premiumize.me/?show=api) data = json_loads(self.load("http://api.premiumize.me/pm-api/v1.php", #@TODO: Revert to `https` in 0.4.10 diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index c7c90d01c..785d2b6c4 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -26,7 +26,7 @@ class RPNetBiz(MultiHoster): def handle_premium(self, pyfile): - user, data = self.account.select_account() + user, data = self.account.select() #: Get the download link res = self.load("https://premium.rpnet.biz/client_api.php", diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py index e2cc6e467..e1a0d278f 100644 --- a/module/plugins/hoster/RapideoPl.py +++ b/module/plugins/hoster/RapideoPl.py @@ -39,7 +39,7 @@ class RapideoPl(MultiHoster): def prepare(self): super(RapideoPl, self).prepare() - data = self.account.get_account_data(self.user) + data = self.account.get_data(self.user) self.usr = data['usr'] self.pwd = data['pwd'] diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 354d69acb..636ea1bcc 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -51,7 +51,7 @@ class RapidgatorNet(SimpleHoster): def setup(self): if self.account: - self.sid = self.account.get_account_info(self.user).get('sid', None) + self.sid = self.account.get_data(self.user).get('sid', None) else: self.sid = None diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index 954c246dc..6f0645e9f 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -23,7 +23,7 @@ class RehostTo(MultiHoster): def handle_premium(self, pyfile): self.download("http://rehost.to/process_download.php", get={'user': "cookie", - 'pass': self.account.get_account_info(self.user)['session'], + 'pass': self.account.get_data(self.user)['session'], 'dl' : pyfile.url}, disposition=True) diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index bdbaa1e6f..c26b893bf 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -124,7 +124,7 @@ class ShareonlineBiz(SimpleHoster): def handle_premium(self, pyfile): #: Should be working better loading (account) api internally html = self.load("http://api.share-online.biz/account.php", get={'username': self.user, - 'password': self.account.get_account_data(self.user)['password'], + 'password': self.account.get_data(self.user)['password'], 'act' : "download", 'lid' : self.info['fileid']}) diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index 7b52be2be..33d098a00 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -36,7 +36,7 @@ class SmoozedCom(MultiHoster): pyfile.name = ".".join(temp) #: Check the link - get_data = {'session_key': self.account.get_account_info(self.user)['session'], + get_data = {'session_key': self.account.get_data(self.user)['session'], 'url' : pyfile.url} data = json_loads(self.load("http://www2.smoozed.com/api/check", get=get_data)) diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 6ea038751..0a89363f8 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -41,7 +41,7 @@ class WebshareCz(SimpleHoster): def handle_free(self, pyfile): - wst = self.account.get_account_data(self.user).get('wst', None) if self.account else None + wst = self.account.get_data(self.user).get('wst', None) if self.account else None api_data = get_url("https://webshare.cz/api/file_link/", post={'ident': self.info['pattern']['ID'], 'wst': wst}) diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index bd629d51e..d7caf3097 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -44,8 +44,8 @@ class XFileSharingPro(XFSHoster): else: return - self.user, data = self.account.select_account() - self.req = self.account.get_account_request(self.user) + self.user, data = self.account.select() + self.req = self.account.get_request(self.user) self.premium = self.account.is_premium(self.user) |