From 049298dbdbff33918454b03a3b072f418d47af97 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Jun 2015 05:33:38 +0200 Subject: Use SSL when login account --- module/plugins/accounts/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index d1556b6db..6f908c79b 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -63,7 +63,7 @@ class UploadedTo(Account): def login(self, user, data, req): # req.cj.setCookie("uploaded.net", "lang", "en") - html = req.load("http://uploaded.net/io/login", + html = req.load("https://uploaded.net/io/login", post={'id': user, 'pw': data['password'], '_': ""}, decode=True) -- 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/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 6f908c79b..dc4c9fb73 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -3,13 +3,13 @@ import re import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" - __version__ = "0.30" + __version__ = "0.31" __description__ = """Uploaded.to account plugin""" __license__ = "GPLv3" -- 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/UploadedTo.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index dc4c9fb73..8cdfab0c6 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -26,7 +26,7 @@ class UploadedTo(Account): trafficleft = None premium = None - html = req.load("http://uploaded.net/me") + html = self.load("http://uploaded.net/me", req=req) premium = True if re.search(self.PREMIUM_PATTERN, html) else False @@ -63,9 +63,8 @@ class UploadedTo(Account): def login(self, user, data, req): # req.cj.setCookie("uploaded.net", "lang", "en") - html = req.load("https://uploaded.net/io/login", - post={'id': user, 'pw': data['password'], '_': ""}, - decode=True) + html = self.load("https://uploaded.net/io/login", + post={'id': user, 'pw': data['password'], '_': ""}, req=req) if '"err"' in html: self.wrongPassword() -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/accounts/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 8cdfab0c6..55bddabae 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -61,7 +61,7 @@ class UploadedTo(Account): def login(self, user, data, req): - # req.cj.setCookie("uploaded.net", "lang", "en") + #: req.cj.setCookie("uploaded.net", "lang", "en") html = self.load("https://uploaded.net/io/login", post={'id': user, 'pw': data['password'], '_': ""}, req=req) -- 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/UploadedTo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 55bddabae..6a9270153 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.31" + __version__ = "0.32" __description__ = """Uploaded.to account plugin""" __license__ = "GPLv3" @@ -21,7 +21,7 @@ class UploadedTo(Account): TRAFFIC_LEFT_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): validuntil = None trafficleft = None premium = None @@ -53,7 +53,7 @@ class UploadedTo(Account): trafficleft = float(size.replace(',', '.')) / 1024 trafficleft *= 1 << 40 else: - trafficleft = self.parseTraffic(size + unit) + trafficleft = self.parse_traffic(size + unit) return {'validuntil' : validuntil, 'trafficleft': trafficleft, @@ -67,4 +67,4 @@ class UploadedTo(Account): post={'id': user, 'pw': data['password'], '_': ""}, req=req) if '"err"' in html: - self.wrongPassword() + self.wrong_password() -- 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/UploadedTo.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 6a9270153..956d43a72 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -64,7 +64,10 @@ class UploadedTo(Account): #: req.cj.setCookie("uploaded.net", "lang", "en") html = self.load("https://uploaded.net/io/login", - post={'id': user, 'pw': data['password'], '_': ""}, req=req) + post={'id': user, + 'pw': data['password'], + '_': ""}, + req=req) if '"err"' 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/UploadedTo.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 956d43a72..3d1d0bbf5 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -26,7 +26,7 @@ class UploadedTo(Account): trafficleft = None premium = None - html = self.load("http://uploaded.net/me", req=req) + html = self.load("http://uploaded.net/me") premium = True if re.search(self.PREMIUM_PATTERN, html) else False @@ -66,8 +66,7 @@ class UploadedTo(Account): html = self.load("https://uploaded.net/io/login", post={'id': user, 'pw': data['password'], - '_': ""}, - req=req) + '_': ""}) if '"err"' 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/UploadedTo.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 3d1d0bbf5..f9392a53e 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -10,6 +10,7 @@ class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" __version__ = "0.32" + __status__ = "stable" __description__ = """Uploaded.to 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/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index f9392a53e..a59394e7f 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -10,7 +10,7 @@ class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" __version__ = "0.32" - __status__ = "stable" + __status__ = "testing" __description__ = """Uploaded.to 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/UploadedTo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index a59394e7f..407658354 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -22,7 +22,7 @@ class UploadedTo(Account): TRAFFIC_LEFT_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): validuntil = None trafficleft = None premium = None @@ -61,13 +61,13 @@ class UploadedTo(Account): 'premium' : premium} - def login(self, user, data, req): + def login(self, user, password, data, req): #: req.cj.setCookie("uploaded.net", "lang", "en") html = self.load("https://uploaded.net/io/login", post={'id': user, - 'pw': data['password'], + 'pw': password, '_': ""}) if '"err"' in html: - self.wrong_password() + self.fail() -- 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/UploadedTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 407658354..3b733ae23 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -70,4 +70,4 @@ class UploadedTo(Account): '_': ""}) if '"err"' in html: - self.fail() + self.login_fail() -- cgit v1.2.3 From 7fe6d2bd4df968e3d1dff19075d894066e3327b2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Aug 2015 08:45:02 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1590 --- module/plugins/accounts/UploadedTo.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 3b733ae23..1757f2af8 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.32" + __version__ = "0.33" __status__ = "testing" __description__ = """Uploaded.to account plugin""" @@ -17,8 +17,8 @@ class UploadedTo(Account): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - PREMIUM_PATTERN = r'Premium' - VALID_UNTIL_PATTERN = r'Duration:\s*(.+?)<' + PREMIUM_PATTERN = r'Premium' + VALID_UNTIL_PATTERN = r'Duration:\s*(.+?)<' TRAFFIC_LEFT_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' @@ -64,10 +64,10 @@ class UploadedTo(Account): def login(self, user, password, data, req): #: req.cj.setCookie("uploaded.net", "lang", "en") - html = self.load("https://uploaded.net/io/login", + html = self.load("http://uploaded.net/io/login", post={'id': user, - 'pw': password, - '_': ""}) + 'pw': password}) - if '"err"' in html: - self.login_fail() + m = re.search(r'"err":"(.+?)"', html) + if m is not None: + self.login_fail(m.group(1)) -- cgit v1.2.3 From e5ce0acf056dc96c40d5616ab6d2b82f998eefbe Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 3 Aug 2015 00:37:57 +0200 Subject: Use set_cookie instead cj.setCookie --- module/plugins/accounts/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 1757f2af8..09e891c19 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.33" + __version__ = "0.34" __status__ = "testing" __description__ = """Uploaded.to account plugin""" @@ -62,7 +62,7 @@ class UploadedTo(Account): def login(self, user, password, data, req): - #: req.cj.setCookie("uploaded.net", "lang", "en") + self.load("http://uploaded.net/language/en") html = self.load("http://uploaded.net/io/login", post={'id': user, -- cgit v1.2.3 From 07d831a7318f0286c879472c0fb28fb133651d42 Mon Sep 17 00:00:00 2001 From: Gutz-Pilz Date: Tue, 4 Aug 2015 15:38:39 +0200 Subject: ...has no attribute "COOKIES" https://github.com/pyload/pyload/issues/1694 --- module/plugins/accounts/UploadedTo.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 09e891c19..9cacad58f 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -20,6 +20,7 @@ class UploadedTo(Account): PREMIUM_PATTERN = r'Premium' VALID_UNTIL_PATTERN = r'Duration:\s*(.+?)<' TRAFFIC_LEFT_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' + COOKIES = False def parse_info(self, user, password, data, req): -- cgit v1.2.3 From 2cf928db10224b5327f918dceaa13273753620ac Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Aug 2015 18:06:42 +0200 Subject: Some fixes --- module/plugins/accounts/UploadedTo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 9cacad58f..59d3fcff9 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.34" + __version__ = "0.35" __status__ = "testing" __description__ = """Uploaded.to account plugin""" @@ -17,10 +17,11 @@ class UploadedTo(Account): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + COOKIES = False + PREMIUM_PATTERN = r'Premium' VALID_UNTIL_PATTERN = r'Duration:\s*(.+?)<' TRAFFIC_LEFT_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' - COOKIES = False def parse_info(self, user, password, data, req): -- cgit v1.2.3