Merge pull request #1 from pyload/stable

Merge

1 files changed, 15 insertions, 12 deletions

diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index 8adcff4ac..1e30b3771 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -8,21 +8,23 @@ from module.plugins.Account import Account
 
 
 class UploadheroCom(Account):
-    __name__ = "UploadheroCom"
-    __version__ = "0.2"
-    __type__ = "account"
+    __name__    = "UploadheroCom"
+    __type__    = "account"
+    __version__ = "0.20"
+
     __description__ = """Uploadhero.co account plugin"""
-    __author_name__ = "mcmyst"
-    __author_mail__ = "mcmyst@hotmail.fr"
+    __license__     = "GPLv3"
+    __authors__     = [("mcmyst", "mcmyst@hotmail.fr")]
+
 
     def loadAccountInfo(self, user, req):
-        premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.')
+        premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium')
 
         data = self.getAccountData(user)
-        page = req.load("http://uploadhero.co/my-account")
+        html = req.load("http://uploadhero.co/my-account")
 
-        if premium_pattern.search(page):
-            end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(page).group(1)))
+        if premium_pattern.search(html):
+            end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(html).group(1)))
             end_date = time.mktime(future.timetuple())
             account_info = {"validuntil": end_date, "trafficleft": -1, "premium": True}
         else:
@@ -30,9 +32,10 @@ class UploadheroCom(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
-        page = req.load("http://uploadhero.co/lib/connexion.php",
-                        post={"pseudo_login": user, "password_login": data["password"]})
+        html = req.load("http://uploadhero.co/lib/connexion.php",
+                        post={"pseudo_login": user, "password_login": data['password']})
 
-        if "mot de passe invalide" in page:
+        if "mot de passe invalide" in html:
             self.wrongPassword()