diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/Plugin.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 7790a0801..9995da59a 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -208,7 +208,7 @@ class Plugin(object): Ocr = self.core.pluginManager.getCaptchaPlugin(self.__name__) - if Ocr and not forceUser: + if Ocr and not forceUser and self.core.captcha: sleep(randint(3000, 5000) / 1000.0) if self.pyfile.abort: raise Abort diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 9735a430d..07b072a4d 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -18,7 +18,7 @@ def getInfo(urls): apiurl = "http://api.netload.in/info.php?auth=Zf9SnQh9WiReEsb18akjvQGqT0I830e8&bz=1&md5=1&file_id=" id_regex = re.compile("http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)") urls_per_query = 80 - + for chunk in chunks(urls, urls_per_query): ids = "" for url in chunk: @@ -37,7 +37,7 @@ def getInfo(urls): result = [] - for i, r in enumerate(api.split()): + for i, r in enumerate(api.splitlines()): try: tmp = r.split(";") try: |