Merge pull request #1 from pyload/stable

Merge

1 files changed, 31 insertions, 35 deletions

diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index ba6105e6e..d6e94f2e3 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -1,56 +1,52 @@
 # -*- 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 <http://www.gnu.org/licenses/>.
-
-    @author: zoidberg
-"""
-
 import re
+
 from module.plugins.Account import Account
-from module.utils import parseFileSize
 
 
 class FastshareCz(Account):
-    __name__ = "FastshareCz"
-    __version__ = "0.03"
-    __type__ = "account"
+    __name__    = "FastshareCz"
+    __type__    = "account"
+    __version__ = "0.05"
+
     __description__ = """Fastshare.cz account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
+
+
+    CREDIT_PATTERN = r'My account\s*\((.+?)\)'
 
-    CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\d. \w]+)&nbsp;'
 
     def loadAccountInfo(self, user, req):
+        validuntil  = None
+        trafficleft = None
+        premium     = None
+
         html = req.load("http://www.fastshare.cz/user", decode=True)
 
-        found = re.search(self.CREDIT_PATTERN, html)
-        if found:
-            trafficleft = parseFileSize(found.group(1)) / 1024
-            premium = True if trafficleft else False
+        m = re.search(self.CREDIT_PATTERN, html)
+        if m:
+            trafficleft = self.parseTraffic(m.group(1))
+
+        if trafficleft:
+            premium = True
+            validuntil = -1
         else:
-            trafficleft = None
             premium = False
 
-        return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
+        return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
+
 
     def login(self, user, data, req):
+        req.cj.setCookie("fastshare.cz", "lang", "en")
+
         req.load('http://www.fastshare.cz/login')  # Do not remove or it will not login
-        html = req.load('http://www.fastshare.cz/sql.php', post={
-            "heslo": data['password'],
-            "login": user
-        }, decode=True)
 
-        if u'>Špatné uživatelské jméno nebo heslo.<' in html:
+        html = req.load("http://www.fastshare.cz/sql.php",
+                        post={'login': user, 'heslo': data['password']},
+                        decode=True)
+
+        if ">Wrong username or password" in html:
             self.wrongPassword()