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, 41 insertions, 4 deletions

diff --git a/module/plugins/accounts/WarserverCz.py b/module/plugins/accounts/WarserverCz.py
index b3cafdb5f..21961956b 100644
--- a/module/plugins/accounts/WarserverCz.py
+++ b/module/plugins/accounts/WarserverCz.py
@@ -17,17 +17,54 @@
     @author: zoidberg
 """
 
-from module.plugins.accounts.CoolshareCz import CoolshareCz
+from module.plugins.Account import Account
 import re
 from module.utils import parseFileSize
 from time import mktime, strptime
 
-class WarserverCz(CoolshareCz):
+class WarserverCz(Account):
     __name__ = "WarserverCz"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "account"
     __description__ = """Warserver.cz account plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
     
-    DOMAIN = "http://www.warserver.cz"
\ No newline at end of file
+    VALID_UNTIL_PATTERN = ur'<li>Neomezené stahování do: <strong>(.+?)<'
+    TRAFFIC_LEFT_PATTERN = ur'<li>Kredit: <strong>(.+?)<'
+    
+    DOMAIN = "http://www.warserver.cz"
+
+    def loadAccountInfo(self, user, req):      
+        html = req.load("%s/uzivatele/prehled" % self.DOMAIN, decode = True)
+        
+        validuntil = trafficleft = None
+        premium = False
+        
+        found = re.search(self.VALID_UNTIL_PATTERN, html)
+        if found:
+            self.logDebug("VALID_UNTIL", found.group(1))
+            try:                
+                #validuntil = mktime(strptime(found.group(1), "%d %B %Y"))
+                premium = True
+                trafficleft = -1
+            except Exception, e:
+                self.logError(e)
+                
+        found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+        if found:
+            self.logDebug("TRAFFIC_LEFT", found.group(1))
+            trafficleft = parseFileSize((found.group(1).replace("&thinsp;",""))) // 1024
+            premium = True if trafficleft > 1 << 18 else False                           
+        
+        return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium})
+    
+    def login(self, user, data, req):
+        html = req.load('%s/uzivatele/prihlaseni?do=prihlaseni-submit' % self.DOMAIN, 
+                        post = {"username": user,
+                                "password": data['password'],
+                                "send": u"Přihlásit"},
+                        decode = True)
+        
+        if '<p class="chyba">' in html:          
+            self.wrongPassword()
\ No newline at end of file