From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 04:59:27 +0200 Subject: Account rewritten --- module/plugins/hooks/EasybytezComHook.py | 4 ++-- module/plugins/hooks/FreeWayMeHook.py | 2 +- module/plugins/hooks/PremiumToHook.py | 2 +- module/plugins/hooks/PremiumizeMeHook.py | 2 +- module/plugins/hooks/RPNetBizHook.py | 2 +- module/plugins/hooks/RehostToHook.py | 4 ++-- module/plugins/hooks/SmoozedComHook.py | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/EasybytezComHook.py b/module/plugins/hooks/EasybytezComHook.py index f96668245..9e33bbad0 100644 --- a/module/plugins/hooks/EasybytezComHook.py +++ b/module/plugins/hooks/EasybytezComHook.py @@ -22,9 +22,9 @@ class EasybytezComHook(MultiHook): def get_hosters(self): - user, data = self.account.select_account() + user, data = self.account.select() html = self.load("http://www.easybytez.com", - req=self.account.get_account_request(user)) + req=self.account.get_request(user)) return re.search(r'\s*Supported sites:(.*)', html).group(1).split(',') diff --git a/module/plugins/hooks/FreeWayMeHook.py b/module/plugins/hooks/FreeWayMeHook.py index 8defeeb3c..5f30d70fc 100644 --- a/module/plugins/hooks/FreeWayMeHook.py +++ b/module/plugins/hooks/FreeWayMeHook.py @@ -20,6 +20,6 @@ class FreeWayMeHook(MultiHook): def get_hosters(self): - user, data = self.account.select_account() + user, data = self.account.select() hostis = self.load("http://www.free-way.bz/ajax/jd.php", get={'id': 3, 'user': user, 'pass': data['password']}).replace("\"", "") #@TODO: Revert to `https` in 0.4.10 return [x.strip() for x in hostis.split(",") if x.strip()] diff --git a/module/plugins/hooks/PremiumToHook.py b/module/plugins/hooks/PremiumToHook.py index 6e940c5d9..062113e96 100644 --- a/module/plugins/hooks/PremiumToHook.py +++ b/module/plugins/hooks/PremiumToHook.py @@ -22,7 +22,7 @@ class PremiumToHook(MultiHook): def get_hosters(self): - user, data = self.account.select_account() + user, data = self.account.select() html = self.load("http://premium.to/api/hosters.php", get={'username': user, 'password': data['password']}) return [x.strip() for x in html.replace("\"", "").split(";")] diff --git a/module/plugins/hooks/PremiumizeMeHook.py b/module/plugins/hooks/PremiumizeMeHook.py index c33b5e0a5..6be32b70b 100644 --- a/module/plugins/hooks/PremiumizeMeHook.py +++ b/module/plugins/hooks/PremiumizeMeHook.py @@ -22,7 +22,7 @@ class PremiumizeMeHook(MultiHook): def get_hosters(self): #: Get account data - user, data = self.account.select_account() + user, data = self.account.select() #: Get supported hosters list from premiumize.me using the #: json API v1 (see https://secure.premiumize.me/?show=api) diff --git a/module/plugins/hooks/RPNetBizHook.py b/module/plugins/hooks/RPNetBizHook.py index 2804c9356..5e7174de6 100644 --- a/module/plugins/hooks/RPNetBizHook.py +++ b/module/plugins/hooks/RPNetBizHook.py @@ -22,7 +22,7 @@ class RPNetBizHook(MultiHook): def get_hosters(self): #: Get account data - user, data = self.account.select_account() + user, data = self.account.select() res = self.load("https://premium.rpnet.biz/client_api.php", get={'username': user, 'password': data['password'], 'action': "showHosterList"}) diff --git a/module/plugins/hooks/RehostToHook.py b/module/plugins/hooks/RehostToHook.py index b3e37369c..58367e241 100644 --- a/module/plugins/hooks/RehostToHook.py +++ b/module/plugins/hooks/RehostToHook.py @@ -20,8 +20,8 @@ class RehostToHook(MultiHook): def get_hosters(self): - user, data = self.account.select_account() + user, data = self.account.select() html = self.load("http://rehost.to/api.php", get={'cmd' : "get_supported_och_dl", - 'long_ses': self.account.get_account_info(user)['session']}) + 'long_ses': self.account.get_data(user)['session']}) return [x.strip() for x in html.replace("\"", "").split(",")] diff --git a/module/plugins/hooks/SmoozedComHook.py b/module/plugins/hooks/SmoozedComHook.py index a794934de..6b9b688ff 100644 --- a/module/plugins/hooks/SmoozedComHook.py +++ b/module/plugins/hooks/SmoozedComHook.py @@ -20,5 +20,5 @@ class SmoozedComHook(MultiHook): def get_hosters(self): - user, data = self.account.select_account() - return self.account.get_account_info(user)['hosters'] + user, data = self.account.select() + return self.account.get_data(user)['hosters'] -- cgit v1.2.3