From 88f215309f73fcfbe05900fc707a990b30b4b7c7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 22 Dec 2014 15:59:40 +0100
Subject: [UlozTo] Fix TRAFFIC_LEFT_PATTERN

---
 module/plugins/accounts/UlozTo.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 53cf54e7d..3c9b24f3a 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -10,7 +10,7 @@ from module.plugins.Account import Account
 class UlozTo(Account):
     __name__    = "UlozTo"
     __type__    = "account"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """Uloz.to account plugin"""
     __license__     = "GPLv3"
@@ -18,7 +18,7 @@ class UlozTo(Account):
                        ("pulpe", None)]
 
 
-    TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([\d.]+) MB"'
+    TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a .*?title="[^"]*?GB = ([\d.]+) MB"'
 
 
     def loadAccountInfo(self, user, req):
@@ -29,16 +29,17 @@ class UlozTo(Account):
         req.cj.setCookie("ulozto.net", "ULOSESSID", self.phpsessid)
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+
         trafficleft = float(m.group(1).replace(' ', '').replace(',', '.')) * 1000 * 1.048 if m else 0
-        self.premium = True if trafficleft else False
+        premium     = True if trafficleft else False
 
-        return {"validuntil": -1, "trafficleft": trafficleft}
+        return {'validuntil': -1, 'trafficleft': trafficleft, 'premium': premium}
 
 
     def login(self, user, data, req):
         login_page = req.load('http://www.ulozto.net/?do=web-login', decode=True)
-        action = re.findall('<form action="(.+?)"', login_page)[1].replace('&amp;', '&')
-        token = re.search('_token_" value="(.+?)"', login_page).group(1)
+        action     = re.findall('<form action="(.+?)"', login_page)[1].replace('&amp;', '&')
+        token      = re.search('_token_" value="(.+?)"', login_page).group(1)
 
         html = req.load(urljoin("http://www.ulozto.net/", action),
                         post={'_token_' : token,
-- 
cgit v1.2.3