1 files changed, 50 insertions, 21 deletions
diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py
index efaf8e5f7..949a021dd 100644
--- a/module/plugins/hoster/CatShareNet.py
+++ b/module/plugins/hoster/CatShareNet.py
@@ -1,38 +1,67 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.plugins.internal.CaptchaService import ReCaptcha
 
 
 class CatShareNet(SimpleHoster):
-    __name__ = "CatShareNet"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?catshare.net/\w{16}.*'
-    __version__ = "0.01"
+    __name__    = "CatShareNet"
+    __type__    = "hoster"
+    __version__ = "0.08"
+
+    __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}'
+
     __description__ = """CatShare.net hoster plugin"""
-    __author_name__ = "z00nx"
-    __author_mail__ = "z00nx0@gmail.com"
+    __license__     = "GPLv3"
+    __authors__     = [("z00nx", "z00nx0@gmail.com"),
+                       ("prOq", None),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    TEXT_ENCODING = True
+
+    INFO_PATTERN = r'<title>(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)<'
+    OFFLINE_PATTERN = ur'Podany plik został usunięty\s*</div>'
+
+    IP_BLOCKED_PATTERN = ur'>Nasz serwis wykrył że Twój adres IP nie pochodzi z Polski.<'
+    SECONDS_PATTERN = 'var\scount\s=\s(\d+);'
+    LINK_PATTERN = r'<form action="(.+?)" method="GET">'
+
+
+    def setup(self):
+        self.multiDL        = self.premium
+        self.resumeDownload = True
+
+
+    def getFileInfo(self):
+        m = re.search(self.IP_BLOCKED_PATTERN, self.html)
+        if m:
+            self.fail(_("Only connections from Polish IP address are allowed"))
+        return super(CatShareNet, self).getFileInfo()
 
-    FILE_INFO_PATTERN = r'<h3 class="pull-left"[^>]+>(?P<N>.*)</h3>\s+<h3 class="pull-right"[^>]+>(?P<S>.*)</h3>'
-    FILE_OFFLINE_PATTERN = r'Podany plik zosta'
-    SECONDS_PATTERN = 'var\s+count\s+=\s+(\d+);'
-    RECAPTCHA_KEY = "6Lfln9kSAAAAANZ9JtHSOgxUPB9qfDFeLUI_QMEy"
 
     def handleFree(self):
-        found = re.search(self.SECONDS_PATTERN, self.html)
-        seconds = int(found.group(1))
-        self.logDebug("Seconds found", seconds)
-        self.wait(seconds + 1)
+        m = re.search(self.SECONDS_PATTERN, self.html)
+        if m:
+            wait_time = int(m.group(1))
+            self.wait(wait_time, True)
+
         recaptcha = ReCaptcha(self)
-        challenge, code = recaptcha.challenge(self.RECAPTCHA_KEY)
-        post_data = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": code}
-        self.download(self.pyfile.url, post=post_data)
-        check = self.checkDownload({"html": re.compile("\A<!DOCTYPE html PUBLIC")})
-        if check == "html":
-            self.logDebug("Wrong captcha entered")
+
+        challenge, response = recaptcha.challenge()
+        self.html = self.load(self.pyfile.url,
+                              post={'recaptcha_challenge_field': challenge,
+                                    'recaptcha_response_field' : response})
+
+        m = re.search(self.LINK_PATTERN, self.html)
+        if m is None:
             self.invalidCaptcha()
-            self.retry()
+            self.retry(reason=_("Wrong captcha entered"))
+
+        dl_link = m.group(1)
+        self.download(dl_link, disposition=True)
 
 
 getInfo = create_getInfo(CatShareNet)