Merge pull request #1 from pyload/stable

Merge

1 files changed, 15 insertions, 26 deletions

diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index 5a69a7f66..18af5f736 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -1,41 +1,29 @@
 # -*- 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 QuickshareCz(Account):
-    __name__ = "QuickshareCz"
-    __version__ = "0.01"
-    __type__ = "account"
+    __name__    = "QuickshareCz"
+    __type__    = "account"
+    __version__ = "0.02"
+
     __description__ = """Quickshare.cz account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
+
 
     def loadAccountInfo(self, user, req):
         html = req.load("http://www.quickshare.cz/premium", decode=True)
 
-        found = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
-        if found:
-            trafficleft = parseFileSize(found.group(1)) / 1024
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+        if m:
+            trafficleft = self.parseTraffic(m.group(1))
             premium = True if trafficleft else False
         else:
             trafficleft = None
@@ -43,6 +31,7 @@ class QuickshareCz(Account):
 
         return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         html = req.load('http://www.quickshare.cz/html/prihlaseni_process.php', post={
             "akce": u'Přihlásit',