little plugin fixes

4 files changed, 14 insertions, 15 deletions

diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py
index c75ac1a98..fd833eef2 100644
--- a/module/plugins/hoster/FilejungleCom.py
+++ b/module/plugins/hoster/FilejungleCom.py
@@ -16,16 +16,14 @@
     @author: zoidberg
 """
 
-import re
 from module.plugins.hoster.FileserveCom import FileserveCom, checkFile
-
-# shares code with UploadstationCom
+from module.plugins.Plugin import chunks
 
 class FilejungleCom(FileserveCom):
     __name__ = "FilejungleCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www\.)?filejungle\.com/f/(?P<id>[^/]+).*"
-    __version__ = "0.5"
+    __version__ = "0.51"
     __description__ = """Filejungle.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -37,4 +35,4 @@ class FilejungleCom(FileserveCom):
     LONG_WAIT_PATTERN = r'<h1>Please wait for (\d+) (\w+)\s*to download the next file\.</h1>'
 
 def getInfo(urls):    
-    yield checkFile(FilejungleCom, urls) 
\ No newline at end of file
+    for chunk in chunks(urls, 100): yield checkFile(FilejungleCom, chunk)  
\ No newline at end of file
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index 759fef96f..04c297661 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -20,6 +20,7 @@ from module.network.RequestFactory import getURL
 from module.plugins.ReCaptcha import ReCaptcha
 from module.common.json_layer import json_loads
 from module.utils import parseFileSize
+from module.plugins.Plugin import chunks
 
 def checkFile(plugin, urls):
     html = getURL(plugin.URLS[1], post = {"urls": "\n".join(urls)}, decode=True)
@@ -43,7 +44,7 @@ class FileserveCom(Hoster):
     __name__ = "FileserveCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www\.)?fileserve\.com/file/(?P<id>[^/]+).*"
-    __version__ = "0.5"
+    __version__ = "0.51"
     __description__ = """Fileserve.Com File Download Hoster"""
     __author_name__ = ("jeix", "mkaay", "paul king", "zoidberg")
     __author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "", "zoidberg@mujmail.cz")
@@ -206,5 +207,5 @@ class FileserveCom(Hoster):
                 self.account.relogin(self.user)
                 self.retry(reason=_("Not logged in."))
 
-def getInfo(urls):    
-    yield checkFile(FileserveCom, urls)
\ No newline at end of file
+def getInfo(urls):
+    for chunk in chunks(urls, 100): yield checkFile(FileserveCom, chunk)
\ No newline at end of file
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index b549b3bbd..94d3f65c4 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -55,7 +55,7 @@ class NetloadIn(Hoster):
     __name__ = "NetloadIn"
     __type__ = "hoster"
     __pattern__ = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __description__ = """Netload.in Download Hoster"""
     __author_name__ = ("spoob", "RaNaN", "Gregy")
     __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz")
@@ -166,7 +166,7 @@ class NetloadIn(Hoster):
                 self.log.debug("Netload: We will prepare your download")
                 self.final_wait(page)
                 return True
-            if re.search(r"(We had a reqeust with the IP)", page) is not None:
+            if ">An access request has been made from IP address <" in page:
                 wait = self.get_wait_time(page)
                 if wait == 0:
                     self.log.debug("Netload: Wait was 0 setting 30")
diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py
index ede176e1f..d24682e4d 100644
--- a/module/plugins/hoster/UploadStationCom.py
+++ b/module/plugins/hoster/UploadStationCom.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-

-import re

 from module.plugins.hoster.FileserveCom import FileserveCom, checkFile

+from module.plugins.Plugin import chunks

 

 class UploadStationCom(FileserveCom):

     __name__ = "UploadStationCom"

     __type__ = "hoster"

     __pattern__ = r"http://(?:www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)"

-    __version__ = "0.5"

+    __version__ = "0.51"

     __description__ = """UploadStation.Com File Download Hoster"""

     __author_name__ = ("fragonib", "zoidberg")

     __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "zoidberg@mujmail.cz")

@@ -16,6 +16,6 @@ class UploadStationCom(FileserveCom):
     LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>|&nbsp;)*([^<]*)'

     

     LONG_WAIT_PATTERN = r'<h1>You have to wait (\d+) (\w+) to download the next file\.</h1>'

-

-def getInfo(urls):    

-    yield checkFile(UploadStationCom, urls) 
\ No newline at end of file
+   

+def getInfo(urls):

+    for chunk in chunks(urls, 100): yield checkFile(UploadStationCom, chunk) 
\ No newline at end of file