Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 27 insertions, 14 deletions

diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py
index aad229475..f8043449c 100644
--- a/module/plugins/accounts/ShareRapidCom.py
+++ b/module/plugins/accounts/ShareRapidCom.py
@@ -1,24 +1,37 @@
 # -*- coding: utf-8 -*-
 
 import re
+from time import mktime, strptime
 from module.plugins.Account import Account
 
 class ShareRapidCom(Account):
     __name__ = "ShareRapidCom"
-    __version__ = "0.31"
+    __version__ = "0.32"
     __type__ = "account"
     __description__ = """ShareRapid account plugin"""
-    __author_name__ = ("MikyWoW")
-
+    __author_name__ = ("MikyWoW", "zoidberg")
+    
+    login_timeout = 60
+        
     def loadAccountInfo(self, user, req):
-        src = req.load("http://share-rapid.com/mujucet/", cookies=True)
+        src = req.load("http://share-rapid.com/mujucet/", decode=True)
+        
+        found = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
+        if found:
+            data = self.getAccountData(user)
+            data["options"]["limitDL"] = [int(found.group(1))]
+        
+        found = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
+        if found:
+            validuntil = mktime(strptime(found.group(1), "%d.%m.%Y - %H:%M"))
+            return {"premium": True, "trafficleft": -1, "validuntil": validuntil}        
+        
         found = re.search(r'<tr><td>GB:</td><td>(.*?) GB', src)
         if found:
-            ret = float(found.group(1)) * (1 << 20)
-            tmp = {"premium": True, "trafficleft": ret, "validuntil": -1}
-        else:
-            tmp = {"premium": False, "trafficleft": None, "validuntil": None}
-        return tmp
+            trafficleft = float(found.group(1)) * (1 << 20)
+            return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
+        
+        return {"premium": False, "trafficleft": None, "validuntil": None}
 
     def login(self, user, data, req):
         htm = req.load("http://share-rapid.com/prihlaseni/", cookies=True)
@@ -27,8 +40,8 @@ class ShareRapidCom(Account):
             htm = htm[start+33:]
             hashes = htm[0:32]
             htm = req.load("http://share-rapid.com/prihlaseni/",
-                post={"hash": hashes,"login": user, "pass1": data["password"],"remember": 0,
-                      "sbmt": "P%C5%99ihl%C3%A1sit"}, cookies=True)
-            
-            #if "Heslo:" in htm:
-            #    self.wrongPassword()
\ No newline at end of file
+                           post={"hash": hashes,
+                                 "login": user, 
+                                 "pass1": data["password"],
+                                 "remember": 0,
+                                 "sbmt": u"Přihlásit"}, cookies=True)
\ No newline at end of file