Spare code improvements

5 files changed, 40 insertions, 68 deletions

diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index f0b37e4cb..53fa2bda1 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -16,7 +16,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FilerNet(SimpleHoster):
     __name__    = "FilerNet"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+'
 
@@ -53,30 +53,23 @@ class FilerNet(SimpleHoster):
         if 'hash' not in inputs:
             self.error(_("Unable to detect hash"))
 
-        recaptcha = ReCaptcha(self)
-
-        for _i in xrange(5):
-            response, challenge = recaptcha.challenge()
-
-            #@NOTE: Work-around for v0.4.9 just_header issue
-            #@TODO: Check for v0.4.10
-            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
-            self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
-                                        'recaptcha_response_field' : response,
-                                        'hash'                     : inputs['hash']})
-            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
-
-            if 'location' in self.req.http.header.lower():
-                self.link = re.search(r'location: (\S+)', self.req.http.header, re.I).group(1)
-                self.correctCaptcha()
-                break
-            else:
-                self.invalidCaptcha()
-
-
-    def downloadLink(self, link):
-        if link and isinstance(link, basestring):
-            self.download(urljoin("http://filer.net/", link), disposition=True)
+        recaptcha           = ReCaptcha(self)
+        response, challenge = recaptcha.challenge()
+
+        #@NOTE: Work-around for v0.4.9 just_header issue
+        #@TODO: Check for v0.4.10
+        self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
+        self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
+                                    'recaptcha_response_field' : response,
+                                    'hash'                     : inputs['hash']})
+        self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
+
+        if 'location' in self.req.http.header.lower():
+            self.link = re.search(r'location: (\S+)', self.req.http.header, re.I).group(1)
+            self.correctCaptcha()
+            break
+        else:
+            self.invalidCaptcha()
 
 
 getInfo = create_getInfo(FilerNet)
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index 872511afc..4912974ad 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -25,7 +25,7 @@ def doubleDecode(m):
 class FshareVn(SimpleHoster):
     __name__    = "FshareVn"
     __type__    = "hoster"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+'
 
@@ -58,7 +58,7 @@ class FshareVn(SimpleHoster):
         self.checkErrors()
 
         action, inputs = self.parseHtmlForm('frm_download')
-        self.url = urljoin(pyfile.url, action)
+        url = urljoin(pyfile.url, action)
 
         if not inputs:
             self.error(_("No FORM"))
@@ -69,7 +69,7 @@ class FshareVn(SimpleHoster):
             if password:
                 self.logInfo(_("Password protected link, trying ") + password)
                 inputs['link_file_pwd_dl'] = password
-                self.html = self.load(self.url, post=inputs, decode=True)
+                self.html = self.load(url, post=inputs, decode=True)
 
                 if 'name="link_file_pwd_dl"' in self.html:
                     self.fail(_("Incorrect password"))
@@ -77,7 +77,7 @@ class FshareVn(SimpleHoster):
                 self.fail(_("No password found"))
 
         else:
-            self.html = self.load(self.url, post=inputs, decode=True)
+            self.html = self.load(url, post=inputs, decode=True)
 
         self.checkErrors()
 
@@ -87,11 +87,9 @@ class FshareVn(SimpleHoster):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("LINK_FREE_PATTERN not found"))
-        self.url = m.group(1)
-        self.logDebug("FREE DL URL: %s" % self.url)
-
+        
+        self.link = m.group(1)
         self.wait()
-        self.download(self.url)
 
 
     def checkErrors(self):
diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py
index 47b981dd7..05caf052d 100644
--- a/module/plugins/hoster/HellshareCz.py
+++ b/module/plugins/hoster/HellshareCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class HellshareCz(SimpleHoster):
     __name__    = "HellshareCz"
     __type__    = "hoster"
-    __version__ = "0.84"
+    __version__ = "0.85"
 
     __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+'
 
@@ -32,10 +32,4 @@ class HellshareCz(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def downloadLink(self, link):
-        if link and isinstance(link, basestring):
-            self.correctCaptcha()
-            self.download(urljoin("http://www.hellshare.com/", link), disposition=True)
-
-
 getInfo = create_getInfo(HellshareCz)
diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index 0acdb7647..f21b0a3a7 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SpeedyshareCom(SimpleHoster):
     __name__    = "SpeedyshareCom"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
 
@@ -38,10 +38,7 @@ class SpeedyshareCom(SimpleHoster):
     def handleFree(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("Download link not found"))
-
-        dl_link = urljoin("http://www.speedyshare.com", m.group(1))
-        self.download(dl_link, disposition=True)
+            self.link = m.group(1)
 
 
 getInfo = create_getInfo(SpeedyshareCom)
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index b2388e02d..03e18a9cd 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -17,7 +17,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t
 class TurbobitNet(SimpleHoster):
     __name__    = "TurbobitNet"
     __type__    = "hoster"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)'
 
@@ -35,15 +35,15 @@ class TurbobitNet(SimpleHoster):
     SIZE_PATTERN = r'class="file-size">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File (?:was )?not found'
 
-    LINK_PATTERN = r'(/download/redirect/[^"\']+)'
+    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'(/download/redirect/[^"\']+)'
 
     LIMIT_WAIT_PATTERN = r'<div id=\'timeout\'>(\d+)<'
     CAPTCHA_PATTERN    = r'<img alt="Captcha" src="(.+?)"'
 
 
     def handleFree(self, pyfile):
-        self.url = "http://turbobit.net/download/free/%s" % self.info['pattern']['ID']
-        self.html = self.load(self.url, ref=True, decode=True)
+        self.html = self.load("http://turbobit.net/download/free/%s" % self.info['pattern']['ID'],
+                              decode=True)
 
         rtUpdate = self.getRtUpdate()
 
@@ -51,14 +51,13 @@ class TurbobitNet(SimpleHoster):
 
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
 
-        self.url = self.getDownloadUrl(rtUpdate)
-
-        self.wait()
-        self.html = self.load(self.url)
+        self.html = self.load(self.getDownloadUrl(rtUpdate))
 
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With:"])
 
-        self.downloadFile()
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m:
+            self.link = m.group(1)
 
 
     def solveCaptcha(self):
@@ -141,13 +140,17 @@ class TurbobitNet(SimpleHoster):
                 self.logDebug("URL", self.js.engine, out)
                 if out.startswith('/download/'):
                     return "http://turbobit.net%s" % out.strip()
+            
             except Exception, e:
                 self.logError(e)
         else:
             if self.retries >= 2:
                 # retry with updated js
                 self.delStorage("rtUpdate")
-            self.retry()
+            else:
+                self.retry()
+        
+        self.wait()
 
 
     def decrypt(self, data):
@@ -161,17 +164,4 @@ class TurbobitNet(SimpleHoster):
         return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600)
 
 
-    def handlePremium(self, pyfile):
-        self.logDebug("Premium download as user %s" % self.user)
-        self.downloadFile()
-
-
-    def downloadFile(self):
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m is None:
-            self.error(_("Download link not found"))
-        self.url = "http://turbobit.net" + m.group(1)
-        self.download(self.url)
-
-
 getInfo = create_getInfo(TurbobitNet)