hoster fixes, new tray icon

2 files changed, 17 insertions, 9 deletions

diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index a4a577c04..8f22f4a66 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -72,15 +72,17 @@ class MegauploadCom(Hoster):
         for i in range(5):
             self.html[0] = self.load(self.pyfile.url)
             count = 0
-            while re.search("document.location='http://www.megaupload.com/?c=msg", self.html[0]) != None:
+            while "document.location='http://www.megaupload.com/?c=msg" in self.html[0]:
                 # megaupload.com/?c=msg usually says: Please check back in 2 minutes,
                 # so we can spare that http request
                 self.setWait(120)
-                self.wantReconnect = True
+                if count > 1:
+                    self.wantReconnect = True
+
                 self.wait()
                 
                 self.html[0] = self.load(self.pyfile.url)
-                count ++
+                count += 1
                 if count > 5:
                     self.fail(_("%s: Megaupload is currently blocking your IP. Try again later, manually."% self.__name__))
             
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 07b072a4d..61f0e3c12 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -89,19 +89,25 @@ class NetloadIn(Hoster):
             self.fail("Failed")
             return False
             
-    def download_api_data(self):
+    def download_api_data(self, n=0):
         url = self.url
         id_regex = re.compile("http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)")
         match = id_regex.search(url)
         if match:
             apiurl = "http://netload.in/share/fileinfos2.php"
-            src = self.load(apiurl, cookies=False, get={"file_id": match.group(1)})
+            src = self.load(apiurl, cookies=False, get={"file_id": match.group(1)}).strip()
+            if not src and n < 3:
+                sleep(0.2)
+                self.download_api_data(n+1)
+                return
+            else:
+                self.fail(_("No API Data was send"))
+
             self.log.debug("Netload: APIDATA: "+src.strip())
             self.api_data = {}
             if src == "unknown_server_data":
                 self.api_data = False
-            elif not src == "unknown file_data":
-                
+            elif src != "unknown file_data":
                 lines = src.split(";")
                 self.api_data["exists"] = True
                 self.api_data["fileid"] = lines[0]
@@ -167,19 +173,19 @@ class NetloadIn(Hoster):
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1)
             except:
                 open("dump.html", "w").write(page)
-                self.log.debug("Netload: Could not find captcha, try again from begining")
+                self.log.debug("Netload: Could not find captcha, try again from beginning")
                 continue
 
             file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', page).group(1)
             if not captchawaited:
                 wait = self.get_wait_time(page)
+                if i == 1: wait = 1
                 self.log.info(_("Netload: waiting for captcha %d s." % wait))
                 self.setWait(wait)
                 self.wait()
                 captchawaited = True
 
             captcha = self.decryptCaptcha(captcha_url)
-            sleep(4)
             page = self.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, cookies=True)
 
         return False