From 0306438ab70e20433326fe3dd116915f56438edb Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 9 Mar 2013 15:34:47 +0100 Subject: FshareVn: Bugfix. Fixed #29 --- module/plugins/accounts/FshareVn.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'module') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index e51009f50..20d27ea2e 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . - + @author: zoidberg """ @@ -24,12 +24,12 @@ import re class FshareVn(Account): __name__ = "FshareVn" - __version__ = "0.02" + __version__ = "0.03" __type__ = "account" __description__ = """fshare.vn account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + VALID_UNTIL_PATTERN = ur'
Thời hạn dùng:
\s*
([^<]+)
' TRAFFIC_LEFT_PATTERN = ur'
Bandwidth Còn Lại
\s*]*>([0-9.]+) ([kKMG])B' DIRECT_DOWNLOAD_PATTERN = ur']*)[^>]*/>Kích hoạt download trực tiếp' @@ -37,23 +37,23 @@ class FshareVn(Account): def loadAccountInfo(self, user, req): #self.relogin(user) html = req.load("http://www.fshare.vn/account_info.php", decode = True) - + found = re.search(self.VALID_UNTIL_PATTERN, html) validuntil = mktime(strptime(found.group(1), '%I:%M:%S %p %d-%m-%Y')) if found else 0 - + found = re.search(self.TRAFFIC_LEFT_PATTERN, html) trafficleft = float(found.group(1)) * 1024 ** {'k': 0, 'K': 0, 'M': 1, 'G': 2}[found.group(2)] if found else 0 - + return {"validuntil": validuntil, "trafficleft": trafficleft} - + def login(self, user, data, req): - req.http.c.setopt(REFERER, "https://www.fshare.vn/login.php") - + req.http.c.setopt(REFERER, "https://www.fshare.vn/login.php") + html = req.load('https://www.fshare.vn/login.php', post = { "login_password" : data['password'], "login_useremail" : user, "url_refe" : "https://www.fshare.vn/login.php" }, referer = True, decode = True) - - if not '