From a1b105f5e74df07abeab46a29de16416954fe4b8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 2 Jun 2015 03:42:55 +0200 Subject: Small code cosmetics --- module/plugins/accounts/RealdebridCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 41d8a0975..ad2975aa9 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import xml.dom.minidom as dom +import xml.dom.minidom from module.plugins.Account import Account @@ -19,7 +19,7 @@ class RealdebridCom(Account): if self.pin_code: return {"premium": False} html = req.load("https://real-debrid.com/api/account.php") - xml = dom.parseString(html) + xml = xml.dom.minidom.parseString(html) account_info = {"validuntil": float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue), "trafficleft": -1} -- cgit v1.2.3 From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/accounts/RealdebridCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index ad2975aa9..a4bd52062 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -2,13 +2,13 @@ import xml.dom.minidom -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class RealdebridCom(Account): __name__ = "RealdebridCom" __type__ = "account" - __version__ = "0.45" + __version__ = "0.46" __description__ = """Real-Debrid.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From ee9bb026433c4cd79b84efb06ca195447c4d7916 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 15 Jun 2015 18:18:30 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1501 --- module/plugins/accounts/RealdebridCom.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index a4bd52062..9b13aeefd 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class RealdebridCom(Account): __name__ = "RealdebridCom" __type__ = "account" - __version__ = "0.46" + __version__ = "0.47" __description__ = """Real-Debrid.com account plugin""" __license__ = "GPLv3" @@ -17,17 +17,21 @@ class RealdebridCom(Account): def loadAccountInfo(self, user, req): if self.pin_code: - return {"premium": False} + return + html = req.load("https://real-debrid.com/api/account.php") - xml = xml.dom.minidom.parseString(html) - account_info = {"validuntil": float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue), - "trafficleft": -1} + xml = xml.dom.minidom.parseString(html) + + validuntil = float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) - return account_info + return {'validuntil' : validuntil, + 'trafficleft': -1 , + 'premium' : True } def login(self, user, data, req): self.pin_code = False + html = req.load("https://real-debrid.com/ajax/login.php", get={"user": user, "pass": data['password']}, decode=True) -- cgit v1.2.3 From 19e21f7ae241660481b9ef864fc38c6d952ff8a5 Mon Sep 17 00:00:00 2001 From: funkyslap <99indahouse@gmail.com> Date: Wed, 17 Jun 2015 21:51:33 +0200 Subject: RealDebridCom.py: fix DEBUG RealdebridCom: Account Info: {'error': "local variable 'xml' referenced before assignment"} Fix this: DEBUG RealdebridCom: Account Info: {'error': "local variable 'xml' referenced before assignment"} --- module/plugins/accounts/RealdebridCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 9b13aeefd..b29ad33d3 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -20,9 +20,9 @@ class RealdebridCom(Account): return html = req.load("https://real-debrid.com/api/account.php") - xml = xml.dom.minidom.parseString(html) + account = xml.dom.minidom.parseString(html) - validuntil = float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) + validuntil = float(account.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) return {'validuntil' : validuntil, 'trafficleft': -1 , -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/accounts/RealdebridCom.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index b29ad33d3..83fdc5dbc 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import xml.dom.minidom +import xml.dom.minidom as dom from module.plugins.internal.Account import Account @@ -19,10 +19,10 @@ class RealdebridCom(Account): if self.pin_code: return - html = req.load("https://real-debrid.com/api/account.php") - account = xml.dom.minidom.parseString(html) + html = self.load("https://real-debrid.com/api/account.php", req=req) + xml = dom.parseString(html) - validuntil = float(account.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) + validuntil = float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) return {'validuntil' : validuntil, 'trafficleft': -1 , @@ -32,9 +32,8 @@ class RealdebridCom(Account): def login(self, user, data, req): self.pin_code = False - html = req.load("https://real-debrid.com/ajax/login.php", - get={"user": user, "pass": data['password']}, - decode=True) + html = self.load("https://real-debrid.com/ajax/login.php", + get={"user": user, "pass": data['password']}, req=req) if "Your login informations are incorrect" in html: self.wrongPassword() -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/accounts/RealdebridCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 83fdc5dbc..f16ebed27 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -8,14 +8,14 @@ from module.plugins.internal.Account import Account class RealdebridCom(Account): __name__ = "RealdebridCom" __type__ = "account" - __version__ = "0.47" + __version__ = "0.48" __description__ = """Real-Debrid.com account plugin""" __license__ = "GPLv3" __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): if self.pin_code: return @@ -36,8 +36,8 @@ class RealdebridCom(Account): get={"user": user, "pass": data['password']}, req=req) if "Your login informations are incorrect" in html: - self.wrongPassword() + self.wrong_password() elif "PIN Code required" in html: - self.logWarning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com")) + self.log_warning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com")) self.pin_code = True -- cgit v1.2.3 From d2e2b127651a5a44b56337eb6d9ca246c97a208a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 03:03:26 +0200 Subject: Spare fixes and code cosmetics --- module/plugins/accounts/RealdebridCom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index f16ebed27..1df84a7b0 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -33,7 +33,9 @@ class RealdebridCom(Account): self.pin_code = False html = self.load("https://real-debrid.com/ajax/login.php", - get={"user": user, "pass": data['password']}, req=req) + get={"user": user, + "pass": data['password']}, + req=req) if "Your login informations are incorrect" in html: self.wrong_password() -- cgit v1.2.3 From 1f5a55ae2133a782bdcca334ecbcdbde50dbcf99 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 15:29:48 +0200 Subject: No more need to use the req argument when call load method --- module/plugins/accounts/RealdebridCom.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 1df84a7b0..6ec13e93f 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -19,7 +19,7 @@ class RealdebridCom(Account): if self.pin_code: return - html = self.load("https://real-debrid.com/api/account.php", req=req) + html = self.load("https://real-debrid.com/api/account.php") xml = dom.parseString(html) validuntil = float(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue) @@ -34,8 +34,7 @@ class RealdebridCom(Account): html = self.load("https://real-debrid.com/ajax/login.php", get={"user": user, - "pass": data['password']}, - req=req) + "pass": data['password']}) if "Your login informations are incorrect" in html: self.wrong_password() -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/accounts/RealdebridCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 6ec13e93f..951953257 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -33,8 +33,8 @@ class RealdebridCom(Account): self.pin_code = False html = self.load("https://real-debrid.com/ajax/login.php", - get={"user": user, - "pass": data['password']}) + get={'user': user, + 'pass': data['password']}) if "Your login informations are incorrect" in html: self.wrong_password() -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/accounts/RealdebridCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 951953257..c013fb38a 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -9,6 +9,7 @@ class RealdebridCom(Account): __name__ = "RealdebridCom" __type__ = "account" __version__ = "0.48" + __status__ = "stable" __description__ = """Real-Debrid.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/accounts/RealdebridCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index c013fb38a..69ec6668b 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -9,7 +9,7 @@ class RealdebridCom(Account): __name__ = "RealdebridCom" __type__ = "account" __version__ = "0.48" - __status__ = "stable" + __status__ = "testing" __description__ = """Real-Debrid.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 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/accounts/RealdebridCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index 69ec6668b..c39293ce6 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -16,7 +16,7 @@ class RealdebridCom(Account): __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): if self.pin_code: return @@ -30,15 +30,15 @@ class RealdebridCom(Account): 'premium' : True } - def login(self, user, data, req): + def login(self, user, password, data, req): self.pin_code = False html = self.load("https://real-debrid.com/ajax/login.php", get={'user': user, - 'pass': data['password']}) + 'pass': password}) if "Your login informations are incorrect" in html: - self.wrong_password() + self.fail() elif "PIN Code required" in html: self.log_warning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com")) -- cgit v1.2.3 From a95c217627a1cb651b24e69f20640df40797aff9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 09:34:18 +0200 Subject: Account rewritten (2) --- module/plugins/accounts/RealdebridCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/RealdebridCom.py') diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index c39293ce6..718850c1a 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -38,7 +38,7 @@ class RealdebridCom(Account): 'pass': password}) if "Your login informations are incorrect" in html: - self.fail() + self.login_fail() elif "PIN Code required" in html: self.log_warning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com")) -- cgit v1.2.3