From 48c0c42fd6faffc56432d5f037cd575979f180cc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 02:23:37 +0200 Subject: Removed all @author flags + key attributes cleanup for internal & hooks plugins --- module/plugins/accounts/EasybytezCom.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 16ce674e2..9fa12fcda 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -13,8 +13,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . - - @author: zoidberg """ import re -- cgit v1.2.3 From 8e47b0de30a25d0fd5dfb518bfe4e1e7beff93fd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:27:44 +0200 Subject: Key attributes cleanup for account, container and crypter plugins --- module/plugins/accounts/EasybytezCom.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 9fa12fcda..9b41c9135 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -27,6 +27,7 @@ class EasybytezCom(Account): __name__ = "EasybytezCom" __version__ = "0.04" __type__ = "account" + __description__ = """EasyBytez.com account plugin""" __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" @@ -34,6 +35,7 @@ class EasybytezCom(Account): VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' + def loadAccountInfo(self, user, req): html = req.load("http://www.easybytez.com/?op=my_account", decode=True) -- cgit v1.2.3 From 9395182da7afed55a29bde1c7cbefe4204e783f0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:02:09 +0200 Subject: Store all re.search/match object as "m" instead "found" --- module/plugins/accounts/EasybytezCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 9b41c9135..755a4dbff 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -42,20 +42,20 @@ class EasybytezCom(Account): validuntil = trafficleft = None premium = False - found = re.search(self.VALID_UNTIL_PATTERN, html) - if found: + m = re.search(self.VALID_UNTIL_PATTERN, html) + if m: try: - self.logDebug("Expire date: " + found.group(1)) - validuntil = mktime(strptime(found.group(1), "%d %B %Y")) + self.logDebug("Expire date: " + m.group(1)) + validuntil = mktime(strptime(m.group(1), "%d %B %Y")) except Exception, e: self.logError(e) if validuntil > mktime(gmtime()): premium = True trafficleft = -1 else: - found = re.search(self.TRAFFIC_LEFT_PATTERN, html) - if found: - trafficleft = found.group(1) + m = re.search(self.TRAFFIC_LEFT_PATTERN, html) + if m: + trafficleft = m.group(1) if "Unlimited" in trafficleft: trafficleft = -1 else: -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/accounts/EasybytezCom.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 755a4dbff..3b8517686 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -1,20 +1,5 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -""" - import re from time import mktime, strptime, gmtime @@ -25,8 +10,8 @@ from module.utils import parseFileSize class EasybytezCom(Account): __name__ = "EasybytezCom" - __version__ = "0.04" __type__ = "account" + __version__ = "0.04" __description__ = """EasyBytez.com account plugin""" __author_name__ = "zoidberg" -- cgit v1.2.3 From a0073934475c4955d4c6a7b6c805ca37c0b6d30b Mon Sep 17 00:00:00 2001 From: Guidobelix Date: Sun, 14 Sep 2014 16:34:01 +0200 Subject: Fixed EasybytezCom to work properly for registered (free) users Expire date is meaningful only for Premium users. For registered (free) users expire date is set to -1 (free accounts never expire). --- module/plugins/accounts/EasybytezCom.py | 36 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 3b8517686..105c365b5 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -11,11 +11,11 @@ from module.utils import parseFileSize class EasybytezCom(Account): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __description__ = """EasyBytez.com account plugin""" - __author_name__ = "zoidberg" - __author_mail__ = "zoidberg@mujmail.cz" + __author_name__ = ("zoidberg", "guidobelix") + __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it") VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' @@ -24,30 +24,36 @@ class EasybytezCom(Account): def loadAccountInfo(self, user, req): html = req.load("http://www.easybytez.com/?op=my_account", decode=True) - validuntil = trafficleft = None + validuntil = -1 + trafficleft = None premium = False m = re.search(self.VALID_UNTIL_PATTERN, html) if m: try: - self.logDebug("Expire date: " + m.group(1)) - validuntil = mktime(strptime(m.group(1), "%d %B %Y")) + expiredate = m.group(1) + self.logDebug("Expire date: " + expiredate) + validuntil = mktime(strptime(expiredate, "%d %B %Y")) except Exception, e: self.logError(e) - if validuntil > mktime(gmtime()): - premium = True - trafficleft = -1 - else: - m = re.search(self.TRAFFIC_LEFT_PATTERN, html) - if m: - trafficleft = m.group(1) - if "Unlimited" in trafficleft: + else: + if validuntil > mktime(gmtime()): + premium = True trafficleft = -1 else: - trafficleft = parseFileSize(trafficleft) / 1024 + premium = False + + m = re.search(self.TRAFFIC_LEFT_PATTERN, html) + if m: + trafficleft = m.group(1) + if "Unlimited" in trafficleft: + trafficleft = -1 + else: + trafficleft = parseFileSize(trafficleft) / 1024 return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + def login(self, user, data, req): html = req.load('http://www.easybytez.com/login.html', decode=True) action, inputs = parseHtmlForm('name="FL"', html) -- cgit v1.2.3 From 8d2ce2b8c169b801c9e98d96cb2c2e6aa1c25f19 Mon Sep 17 00:00:00 2001 From: Guidobelix Date: Tue, 16 Sep 2014 17:02:29 +0200 Subject: Update EasybytezCom --- module/plugins/accounts/EasybytezCom.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 105c365b5..564549521 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -11,7 +11,7 @@ from module.utils import parseFileSize class EasybytezCom(Account): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __description__ = """EasyBytez.com account plugin""" __author_name__ = ("zoidberg", "guidobelix") @@ -24,24 +24,26 @@ class EasybytezCom(Account): def loadAccountInfo(self, user, req): html = req.load("http://www.easybytez.com/?op=my_account", decode=True) - validuntil = -1 + validuntil = None trafficleft = None premium = False m = re.search(self.VALID_UNTIL_PATTERN, html) if m: + expiredate = m.group(1) + self.logDebug("Expire date: " + expiredate) + try: - expiredate = m.group(1) - self.logDebug("Expire date: " + expiredate) validuntil = mktime(strptime(expiredate, "%d %B %Y")) except Exception, e: self.logError(e) + + if validuntil > mktime(gmtime()): + premium = True + trafficleft = -1 else: - if validuntil > mktime(gmtime()): - premium = True - trafficleft = -1 - else: - premium = False + premium = False + validuntil = -1 m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m: -- cgit v1.2.3 From d4fd843a596cb822c89b9241fb2627330157e962 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 13:15:27 +0200 Subject: [EasybytezCom] Now XFSPAccount plugin based --- module/plugins/accounts/EasybytezCom.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 564549521..969c8b393 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -1,28 +1,28 @@ # -*- coding: utf-8 -*- import re + from time import mktime, strptime, gmtime -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import parseHtmlForm +from module.plugins.internal.XFSPAccount import XFSPAccount from module.utils import parseFileSize -class EasybytezCom(Account): +class EasybytezCom(XFSPAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.06" + __version__ = "0.07" __description__ = """EasyBytez.com account plugin""" __author_name__ = ("zoidberg", "guidobelix") __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it") - VALID_UNTIL_PATTERN = r'Premium account expire:([^<]+)' - TRAFFIC_LEFT_PATTERN = r'Traffic available today:(?P[^<]+)' + + HOSTER_URL = "http://www.easybytez.com/" def loadAccountInfo(self, user, req): - html = req.load("http://www.easybytez.com/?op=my_account", decode=True) + html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True) validuntil = None trafficleft = None @@ -54,16 +54,3 @@ class EasybytezCom(Account): trafficleft = parseFileSize(trafficleft) / 1024 return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} - - - def login(self, user, data, req): - html = req.load('http://www.easybytez.com/login.html', decode=True) - action, inputs = parseHtmlForm('name="FL"', html) - inputs.update({"login": user, - "password": data['password'], - "redirect": "http://www.easybytez.com/"}) - - html = req.load(action, post=inputs, decode=True) - - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword() -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/accounts/EasybytezCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 969c8b393..1656b4387 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -14,8 +14,8 @@ class EasybytezCom(XFSPAccount): __version__ = "0.07" __description__ = """EasyBytez.com account plugin""" - __author_name__ = ("zoidberg", "guidobelix") - __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("guidobelix", "guidobelix@hotmail.it")] HOSTER_URL = "http://www.easybytez.com/" -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/accounts/EasybytezCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 1656b4387..00732c12d 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -14,6 +14,7 @@ class EasybytezCom(XFSPAccount): __version__ = "0.07" __description__ = """EasyBytez.com account plugin""" + __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("guidobelix", "guidobelix@hotmail.it")] -- cgit v1.2.3 From 5d26b3f5c3b18d916b2ea24a22770cf62e207a50 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 16 Oct 2014 12:12:14 +0200 Subject: Fix trafficleft size in some account plugins --- module/plugins/accounts/EasybytezCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 00732c12d..bb15ea8a2 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -52,6 +52,6 @@ class EasybytezCom(XFSPAccount): if "Unlimited" in trafficleft: trafficleft = -1 else: - trafficleft = parseFileSize(trafficleft) / 1024 + trafficleft = parseFileSize(trafficleft) return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} -- cgit v1.2.3 From 7b3009db0d90cbcd5a754c69399b5e4c6abe180c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 13:52:42 +0200 Subject: Update accounts to use HOSTER_NAME instead HOSTER_URL --- module/plugins/accounts/EasybytezCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index bb15ea8a2..f88e9ed4c 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -19,7 +19,7 @@ class EasybytezCom(XFSPAccount): ("guidobelix", "guidobelix@hotmail.it")] - HOSTER_URL = "http://www.easybytez.com/" + HOSTER_NAME = "easybytez.com" def loadAccountInfo(self, user, req): -- cgit v1.2.3 From 29de13dc5098cc9214f3f8f111da140a22e3e2ff Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Oct 2014 01:15:58 +0200 Subject: Use parseTraffic instead parseFileSize in accounts --- module/plugins/accounts/EasybytezCom.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index f88e9ed4c..74602b696 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -5,13 +5,12 @@ import re from time import mktime, strptime, gmtime from module.plugins.internal.XFSPAccount import XFSPAccount -from module.utils import parseFileSize class EasybytezCom(XFSPAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.07" + __version__ = "0.08" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" @@ -52,6 +51,6 @@ class EasybytezCom(XFSPAccount): if "Unlimited" in trafficleft: trafficleft = -1 else: - trafficleft = parseFileSize(trafficleft) + trafficleft = self.parseTraffic(trafficleft) return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/accounts/EasybytezCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 74602b696..6dd16e012 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -8,14 +8,14 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class EasybytezCom(XFSPAccount): - __name__ = "EasybytezCom" - __type__ = "account" + __name__ = "EasybytezCom" + __type__ = "account" __version__ = "0.08" __description__ = """EasyBytez.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("guidobelix", "guidobelix@hotmail.it")] + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("guidobelix", "guidobelix@hotmail.it")] HOSTER_NAME = "easybytez.com" -- cgit v1.2.3 From 8f2d17cb3c16c21da01315599864bdde20595bee Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 21:54:07 +0100 Subject: [EasybytezCom] Remove unnecessary loadAccountInfo method --- module/plugins/accounts/EasybytezCom.py | 35 --------------------------------- 1 file changed, 35 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 6dd16e012..d9d453b85 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -19,38 +19,3 @@ class EasybytezCom(XFSPAccount): HOSTER_NAME = "easybytez.com" - - - def loadAccountInfo(self, user, req): - html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True) - - validuntil = None - trafficleft = None - premium = False - - m = re.search(self.VALID_UNTIL_PATTERN, html) - if m: - expiredate = m.group(1) - self.logDebug("Expire date: " + expiredate) - - try: - validuntil = mktime(strptime(expiredate, "%d %B %Y")) - except Exception, e: - self.logError(e) - - if validuntil > mktime(gmtime()): - premium = True - trafficleft = -1 - else: - premium = False - validuntil = -1 - - m = re.search(self.TRAFFIC_LEFT_PATTERN, html) - if m: - trafficleft = m.group(1) - if "Unlimited" in trafficleft: - trafficleft = -1 - else: - trafficleft = self.parseTraffic(trafficleft) - - return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} -- cgit v1.2.3 From 227a0eb5157875e75a385118ec3485b044ccdb8a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 21:55:21 +0100 Subject: Improve loadAccountInfo stuff --- module/plugins/accounts/EasybytezCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index d9d453b85..55d413e04 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class EasybytezCom(XFSPAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.08" + __version__ = "0.09" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Nov 2014 22:47:07 +0100 Subject: Update all other plugins --- module/plugins/accounts/EasybytezCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 55d413e04..87f1df6dd 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -4,13 +4,13 @@ import re from time import mktime, strptime, gmtime -from module.plugins.internal.XFSPAccount import XFSPAccount +from module.plugins.internal.XFSAccount import XFSAccount -class EasybytezCom(XFSPAccount): +class EasybytezCom(XFSAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" @@ -18,4 +18,4 @@ class EasybytezCom(XFSPAccount): ("guidobelix", "guidobelix@hotmail.it")] - HOSTER_NAME = "easybytez.com" + HOSTER_DOMAIN = "easybytez.com" -- cgit v1.2.3 From 65d290c21e5426f515684f624b8872dec7c0bec0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 23 Nov 2014 23:20:53 +0100 Subject: [SimpleHoster] Fix _getDirectLink routine --- module/plugins/accounts/EasybytezCom.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 87f1df6dd..ebc77d03b 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -2,8 +2,6 @@ import re -from time import mktime, strptime, gmtime - from module.plugins.internal.XFSAccount import XFSAccount -- cgit v1.2.3 From 0d27fda4b6edbfcba9b78b2c3f91063b8464455a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 28 Nov 2014 20:40:00 +0100 Subject: [XFSAccount] Fix leech traffic detection --- module/plugins/accounts/EasybytezCom.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index ebc77d03b..0afd93d3b 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.10" + __version__ = "0.11" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" @@ -17,3 +17,9 @@ class EasybytezCom(XFSAccount): HOSTER_DOMAIN = "easybytez.com" + + + def loadAccountInfo(self, *args, **kwargs): + info = super(EasybytezCom, self).loadAccountInfo(*args, **kwargs) + info['leechtraffic'] = 26214400 + return info -- cgit v1.2.3 From 4519e25b8042c7c4dd02fc405cc9e3867875af4d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 30 Nov 2014 21:10:56 +0100 Subject: [EasybytezCom] Revert loadAccountInfo --- module/plugins/accounts/EasybytezCom.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'module/plugins/accounts/EasybytezCom.py') diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 0afd93d3b..93d3e2c19 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.11" + __version__ = "0.12" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" @@ -17,9 +17,3 @@ class EasybytezCom(XFSAccount): HOSTER_DOMAIN = "easybytez.com" - - - def loadAccountInfo(self, *args, **kwargs): - info = super(EasybytezCom, self).loadAccountInfo(*args, **kwargs) - info['leechtraffic'] = 26214400 - return info -- cgit v1.2.3