[NetloadIn] Cleanup

1 files changed, 128 insertions, 108 deletions

diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 204862144..8cf4a03c0 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -1,14 +1,16 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import re
+
+from urlparse import urljoin
 from time import sleep, time
 
-from module.plugins.Hoster import Hoster
 from module.network.RequestFactory import getURL
+from module.plugins.Hoster import Hoster
 from module.plugins.Plugin import chunks
 from module.plugins.internal.CaptchaService import ReCaptcha
 
+
 def getInfo(urls):
     ##  returns list of tupels (name, size (in bytes), status (see FileDatabase), url)
 
@@ -26,10 +28,11 @@ def getInfo(urls):
         api = getURL(apiurl + ids, decode=True)
 
         if api is None or len(api) < 10:
-            print "Netload prefetch: failed "
+            self.logDebug("Prefetch failed")
             return
+
         if api.find("unknown_auth") >= 0:
-            print "Netload prefetch: Outdated auth code "
+            self.logDebug("Outdated auth code")
             return
 
         result = []
@@ -37,50 +40,59 @@ def getInfo(urls):
         for i, r in enumerate(api.splitlines()):
             try:
                 tmp = r.split(";")
+
                 try:
                     size = int(tmp[2])
-                except:
+                except Exception:
                     size = 0
+
                 result.append((tmp[1], size, 2 if tmp[3] == "online" else 1, chunk[i] ))
-            except:
-                print "Netload prefetch: Error while processing response: "
-                print r
+
+            except Exception:
+                self.logDebug("Error while processing response: %s" % r)
 
         yield result
 
 
 class NetloadIn(Hoster):
-    __name__ = "NetloadIn"
-    __type__ = "hoster"
-    __pattern__ = r"https?://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
-    __version__ = "0.451"
-    __description__ = """Netload.in Download Hoster"""
-    __author_name__ = ("spoob", "RaNaN", "Gregy")
-    __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz")
-    RECAPTCHA_KEY="6LcLJMQSAAAAAJzquPUPKNovIhbK6LpSqCjYrsR1"
+    __name__    = "NetloadIn"
+    __type__    = "hoster"
+    __version__ = "0.46"
+
+    __pattern__ = r'https?://(?:[^/]*\.)?netload\.in/(?:datei(.*?)(?:\.htm|/)|index\.php?id=10&file_id=)'
+
+    __description__ = """Netload.in hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org"),
+                       ("RaNaN", "ranan@pyload.org"),
+                       ("Gregy", "gregy@gregy.cz")]
+
 
     def setup(self):
-        self.multiDL = False
-        if self.premium:
-            self.multiDL = True
-            self.chunkLimit = -1
-            self.resumeDownload = True
+        self.multiDL = self.resumeDownload = self.premium
+
 
     def process(self, pyfile):
         self.url = pyfile.url
+
         self.prepare()
-        self.pyfile.setStatus("downloading")
+
+        pyfile.setStatus("downloading")
+
         self.proceed(self.url)
 
+
     def prepare(self):
         self.download_api_data()
 
-        if self.api_data and self.api_data["filename"]:
-            self.pyfile.name = self.api_data["filename"]
+        if self.api_data and self.api_data['filename']:
+            self.pyfile.name = self.api_data['filename']
 
         if self.premium:
-            self.logDebug("Netload: Use Premium Account")
+            self.logDebug(" Use Premium Account")
+
             settings = self.load("http://www.netload.in/index.php?id=2&lang=en")
+
             if '<option value="2" selected="selected">Direkter Download' in settings:
                 self.logDebug("Using direct download")
                 return True
@@ -90,42 +102,46 @@ class NetloadIn(Hoster):
         if self.download_html():
             return True
         else:
-            self.fail("Failed")
+            self.fail(_("Failed"))
             return False
 
+
     def download_api_data(self, n=0):
-        url = self.url
+        url      = self.url
         id_regex = re.compile(self.__pattern__)
-        match = id_regex.search(url)
+        match    = id_regex.search(url)
 
         if match:
             #normalize url
             self.url = 'http://www.netload.in/datei%s.htm' % match.group(1)
-            self.logDebug("URL after norm: %s" % self.url)
+            self.logDebug("URL: %s" % self.url)
         else:
             self.api_data = False
             return
 
         apiurl = "http://api.netload.in/info.php"
-        src = self.load(apiurl, cookies=False,
+        html = self.load(apiurl, cookies=False,
                         get={"file_id": match.group(1), "auth": "Zf9SnQh9WiReEsb18akjvQGqT0I830e8", "bz": "1",
                              "md5": "1"}, decode=True).strip()
-        if not src and n <= 3:
+        if not html and n <= 3:
             sleep(0.2)
             self.download_api_data(n + 1)
             return
 
-        self.logDebug("Netload: APIDATA: " + src)
+        self.logDebug(" APIDATA: " + html)
+
         self.api_data = {}
-        if src and ";" in src and src not in ("unknown file_data", "unknown_server_data", "No input file specified."):
-            lines = src.split(";")
-            self.api_data["exists"] = True
-            self.api_data["fileid"] = lines[0]
-            self.api_data["filename"] = lines[1]
-            self.api_data["size"] = lines[2]
-            self.api_data["status"] = lines[3]
-            if self.api_data["status"] == "online":
-                self.api_data["checksum"] = lines[4].strip()
+
+        if html and ";" in html and html not in ("unknown file_data", "unknown_server_data", "No input file specified."):
+            lines = html.split(";")
+            self.api_data['exists']   = True
+            self.api_data['fileid']   = lines[0]
+            self.api_data['filename'] = lines[1]
+            self.api_data['size']     = lines[2]
+            self.api_data['status']   = lines[3]
+
+            if self.api_data['status'] == "online":
+                self.api_data['checksum'] = lines[4].strip()
             else:
                 self.api_data = False  # check manually since api data is useless sometimes
 
@@ -134,36 +150,34 @@ class NetloadIn(Hoster):
         else:
             self.api_data = False
 
+
     def final_wait(self, page):
         wait_time = self.get_wait_time(page)
+
         self.setWait(wait_time)
-        self.logDebug("Netload: final wait %d seconds" % wait_time)
+
+        self.logDebug(" final wait %d seconds" % wait_time)
+
         self.wait()
+
         self.url = self.get_file_url(page)
 
+
     def check_free_wait(self,page):
-    	#self.logDebug("Page in check_free_wait: " + page)
-	if ">An access request has been made from IP address <" in page:
-	  wait = self.get_wait_time(page)
-	  if wait == 0:
-	    self.logDebug("Netload: Wait was 0 setting 30")
-	    wait = 30
-	  self.logInfo(_("Netload: waiting between downloads %d s." % wait))
-	  self.wantReconnect = True
-	  self.setWait(wait)
-	  self.wait()
-	  return True
-	else:
-	  return False
+        if ">An access request has been made from IP address <" in page:
+            self.wantReconnect = True
+            self.setWait(self.get_wait_time(page) or 30)
+            self.wait()
+            return True
+        else:
+            return False
 
 
     def download_html(self):
-        #self.logDebug("Netload: Entering download_html (%s)" % self.url)
         page = self.load(self.url, decode=True)
-        t = time() + 30
 
         if "/share/templates/download_hddcrash.tpl" in page:
-            self.logError("Netload HDD Crash")
+            self.logError(_("Netload HDD Crash"))
             self.fail(_("File temporarily not available"))
 
         if not self.api_data:
@@ -172,7 +186,7 @@ class NetloadIn(Hoster):
             if "* The file was deleted" in page:
                 self.offline()
 
-            name = re.search(r'class="dl_first_filename">([^<]+)', page, re.MULTILINE)
+            name = re.search(r'class="dl_first_filename">([^<]+)', page, re.M)
             # the found filename is not truncated
             if name:
                 name = name.group(1).strip()
@@ -187,83 +201,89 @@ class NetloadIn(Hoster):
                 t = time() + 30
 
             if "/share/templates/download_hddcrash.tpl" in page:
-                self.logError("Netload HDD Crash")
+                self.logError(_("Netload HDD Crash"))
                 self.fail(_("File temporarily not available"))
 
-            self.logDebug("Netload: try number %d " % i)
+            self.logDebug(" try number %d " % i)
 
             if ">Your download is being prepared.<" in page:
-                self.logDebug("Netload: We will prepare your download")
+                self.logDebug(" We will prepare your download")
                 self.final_wait(page)
                 return True
 
-            self.logDebug("Netload: Trying to find captcha")
+            self.logDebug(" Trying to find captcha")
 
             try:
-		url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', page).group(1).replace("amp;", "")
-	    except Exception as e:
-	    	self.logDebug("exception during Captcha regex: %s" % e.message)
+                url_captcha_html = re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', page).group(1).replace("amp;", "")
+
+            except Exception as e:
+                self.logDebug("exception during Captcha regex: %s" % e.message)
                 page = None
-                continue
-
-	    self.html = self.load(url_captcha_html)
-
-	    recaptcha = ReCaptcha(self)
-	    for _ in xrange(5):
-	    	challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY)
-		#self.logDebug("recaptcha challenge, response, fileID: " + challenge + ", " + response + ", " + self.api_data["fileid"])
-	    	response_page = self.load("http://www.netload.in/index.php?id=10",
-				     post={'captcha_check': '1',
-				     'recaptcha_challenge_field': challenge,
-				     'recaptcha_response_field': response,
-				     'file_id': self.api_data["fileid"],
-				     'Download_Next': ''})
-
-		if "Orange_Link" in response_page:
-		  break
-
-	    if self.check_free_wait(response_page):
-	      self.logDebug("Had to wait for next free slot, trying again")
-	      return self.download_html()
-	    else:
-	      download_url = self.get_file_url(response_page)
-	      self.logDebug("Download URL after get_file: " + download_url)
-	      if not download_url.startswith("http://"):
-	    	self.error("download url: %s" % download_url)
-	      self.wait()
-
-	      self.url = download_url
-	      #self.logDebug("download_url: " + download_url)
-	      break
-        return True
+
+            else:
+                url_captcha_html = urljoin("http://netload.in/", url_captcha_html)
+                break
+
+        self.html = self.load(url_captcha_html)
+
+        recaptcha = ReCaptcha(self)
+
+        for _i in xrange(5):
+            challenge, response = recaptcha.challenge()
+
+            response_page = self.load("http://www.netload.in/index.php?id=10",
+                                      post={'captcha_check'            : '1',
+                                            'recaptcha_challenge_field': challenge,
+                                            'recaptcha_response_field' : response,
+                                            'file_id'                  : self.api_data['fileid'],
+                                            'Download_Next'            : ''})
+            if "Orange_Link" in response_page:
+                break
+
+            if self.check_free_wait(response_page):
+                self.logDebug("Had to wait for next free slot, trying again")
+                return self.download_html()
+
+            else:
+                download_url = self.get_file_url(response_page)
+                self.logDebug("Download URL after get_file: " + download_url)
+                if not download_url.startswith("http://"):
+                    self.error("download url: %s" % download_url)
+                self.wait()
+
+                self.url = download_url
+                return True
+
 
     def get_file_url(self, page):
-    	#self.logDebug("Page: "+ page + "ENDPAGE\n")
         try:
-            file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\".?>Or click here"
+            file_url_pattern = r'<a class="Orange_Link" href="(http://.+)".?>Or click here'
             attempt = re.search(file_url_pattern, page)
             if attempt is not None:
                 return attempt.group(1)
             else:
-                self.logDebug("Netload: Backup try for final link")
-                file_url_pattern = r"<a href=\"(.+)\" class=\"Orange_Link\">Click here"
+                self.logDebug(" Backup try for final link")
+                file_url_pattern = r'<a href="(.+)" class="Orange_Link">Click here'
                 attempt = re.search(file_url_pattern, page)
                 return "http://netload.in/" + attempt.group(1)
-        except Exception as e:
-            self.logDebug("Netload: Getting final link failed; " + e.message)
+
+        except Exception, e:
+            self.logDebug("Getting final link failed", e.message)
             return None
 
+
     def get_wait_time(self, page):
-        wait_seconds = int(re.search(r"countdown\((.+),'change\(\)'\)", page).group(1)) / 100
-	return wait_seconds
+        return int(re.search(r"countdown\((.+),'change\(\)'\)", page).group(1)) / 100
+
 
     def proceed(self, url):
-        self.logDebug("Netload: Downloading.." + url)
         self.download(url, disposition=True)
 
-        check = self.checkDownload({"empty": re.compile(r"^$"), "offline": re.compile("The file was deleted")})
+        check = self.checkDownload({'empty'  : re.compile(r'^$'),
+                                    'offline': re.compile("The file was deleted")})
         if check == "empty":
             self.logInfo(_("Downloaded File was empty"))
             self.retry()
+
         elif check == "offline":
             self.offline()