coolshare.cz + warserver.cz premium support

4 files changed, 114 insertions, 7 deletions

diff --git a/module/plugins/accounts/CoolshareCz.py b/module/plugins/accounts/CoolshareCz.py
new file mode 100644
index 000000000..03686c729
--- /dev/null
+++ b/module/plugins/accounts/CoolshareCz.py
@@ -0,0 +1,71 @@
+# -*- 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
+"""
+
+#shares code with WarserverCz
+
+from module.plugins.Account import Account
+import re
+from time import mktime, strptime
+
+class CoolshareCz(Account):
+    __name__ = "CoolshareCz"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """CoolShare.cz account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    VALID_UNTIL_PATTERN = ur'<li>Neomezené stahování do: <strong>(.+?)<'
+    TRAFFIC_LEFT_PATTERN = ur'<li>Kredit: <strong>.*?\(\s*(.+?)\s*B\)'
+    
+    DOMAIN = "http://www.coolshare.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 = int(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
diff --git a/module/plugins/accounts/WarserverCz.py b/module/plugins/accounts/WarserverCz.py
new file mode 100644
index 000000000..b3cafdb5f
--- /dev/null
+++ b/module/plugins/accounts/WarserverCz.py
@@ -0,0 +1,33 @@
+# -*- 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
+"""
+
+from module.plugins.accounts.CoolshareCz import CoolshareCz
+import re
+from module.utils import parseFileSize
+from time import mktime, strptime
+
+class WarserverCz(CoolshareCz):
+    __name__ = "WarserverCz"
+    __version__ = "0.01"
+    __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
diff --git a/module/plugins/hoster/CoolshareCz.py b/module/plugins/hoster/CoolshareCz.py
index f187b4816..7007b6fcb 100644
--- a/module/plugins/hoster/CoolshareCz.py
+++ b/module/plugins/hoster/CoolshareCz.py
@@ -16,23 +16,26 @@
     @author: zoidberg
 """
 
+#shares code with WarserverCz
+
 import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.network.HTTPRequest import BadHeader
+from module.utils import html_unescape
 
 class CoolshareCz(SimpleHoster):
     __name__ = "CoolshareCz"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?coolshare.cz/stahnout/(?P<ID>\d+)/.+"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __description__ = """CoolShare.cz"""
     __author_name__ = ("zoidberg")
 
-    FILE_NAME_PATTERN = r'<h1.*?>(?P<N>[^<]+)</h1>'
+    FILE_NAME_PATTERN = ur'<h1.*?>Stáhnout (?P<N>[^<]+)</h1>'
     FILE_SIZE_PATTERN = r'<li>Velikost: <strong>(?P<S>[^<]+)</strong>'
     FILE_OFFLINE_PATTERN = r'<h1>Soubor nenalezen</h1>'
     
-    PREMIUM_URL_PATTERN = r'<div class="cleaner oddelovac"><!-- --></div>\s*<p><a href="([^"]*)"'
+    PREMIUM_URL_PATTERN = r'href="(http://[^/]+/dwn-premium.php.*?)"'
     DOMAIN = "http://csd01.coolshare.cz"
     
     SH_CHECK_TRAFFIC = True             
@@ -50,7 +53,7 @@ class CoolshareCz(SimpleHoster):
     def handlePremium(self):
         found = re.search(self.PREMIUM_URL_PATTERN, self.html)
         if not found: self.parseError("Premium URL")
-        url = found.group(1)
+        url = html_unescape(found.group(1))
         self.logDebug("Premium URL: " + url)        
         if not url.startswith("http://"): self.resetAccount()
         self.download(url)
diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py
index 4f0de8425..423170319 100644
--- a/module/plugins/hoster/WarserverCz.py
+++ b/module/plugins/hoster/WarserverCz.py
@@ -24,11 +24,11 @@ class WarserverCz(CoolshareCz):
     __name__ = "WarserverCz"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?warserver.cz/stahnout/(?P<ID>\d+)/.+"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """Warserver.cz"""
     __author_name__ = ("zoidberg")
-   
-    PREMIUM_URL_PATTERN = r'<a href="(http://s01.warserver.cz/dwn-premium.php.*?)"'
+    
+    FILE_NAME_PATTERN = r'<h1.*?>(?P<N>[^<]+)</h1>'
     DOMAIN = "http://s01.warserver.cz"           
 
 getInfo = create_getInfo(WarserverCz)
\ No newline at end of file