From 031d86706aa13270793e31c21ad3f386ca62752b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 03:50:33 +0100
Subject: Spare code improvements

---
 module/plugins/hoster/TurbobitNet.py | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

(limited to 'module/plugins/hoster/TurbobitNet.py')

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)
-- 
cgit v1.2.3