From 714ad63d204afe5ea4c26bed37182efa97c9f0a3 Mon Sep 17 00:00:00 2001
From: rukasuzu <lbaran80@gmail.com>
Date: Sun, 18 Jan 2015 13:58:38 +0100
Subject: [CatShareNet] Fixed patterns

---
 module/plugins/accounts/CatShareNet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py
index 00bfadd09..00bea960d 100644
--- a/module/plugins/accounts/CatShareNet.py
+++ b/module/plugins/accounts/CatShareNet.py
@@ -17,8 +17,8 @@ class CatShareNet(Account):
     __authors__     = [("prOq", None)]
 
 
-    PREMIUM_PATTERN      = r'class="nav-collapse collapse pull-right">[\s\w<>=-."/:]*\sz.</a></li>\s*<li><a href="/premium">.*\s*<span style="color: red">(.*?)</span>[\s\w<>/]*href="/logout"'
-    VALID_UNTIL_PATTERN  = r'<div class="span6 pull-right">[\s\w<>=-":;]*<span style="font-size:13px;">.*?<strong>(.*?)</strong></span>'
+    PREMIUM_PATTERN      = r'<li><a href="/premium">Konto:[\s\n]*(\w*)'
+    VALID_UNTIL_PATTERN  = r'<span style="font-size:13px;">Konto premium.*?<strong>(.*?)</strong></span>'
     TRAFFIC_LEFT_PATTERN = r'<a href="/premium">([0-9.]+ [kMG]B)'
 
 
@@ -40,13 +40,13 @@ class CatShareNet(Account):
             expiredate = re.search(self.VALID_UNTIL_PATTERN, html).group(1)
             self.logDebug("Expire date: " + expiredate)
 
-            validuntil = mktime(strptime(expiredate, "%d.%m.%Y"))
+            validuntil = mktime(strptime(expiredate, "%Y-%m-%d %H:%M:%S"))
 
         except Exception:
             pass
 
         try:
-            trafficleft = self.parseTraffic(re.search(TRAFFIC_LEFT_PATTERN, html).group(1))
+            trafficleft = self.parseTraffic(re.search(self.TRAFFIC_LEFT_PATTERN, html).group(1))
 
         except Exception:
             pass
-- 
cgit v1.2.3