summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--module/DownloadThread.py2
-rw-r--r--module/FileList.py2
-rw-r--r--module/ThreadManager.py3
-rw-r--r--module/plugins/container/CCF.py2
-rw-r--r--module/plugins/container/LinkList.py2
-rw-r--r--module/plugins/container/RSDF.py2
-rw-r--r--module/plugins/decrypter/DDLMusicOrg.py2
-rw-r--r--module/plugins/decrypter/FourChanOrg.py2
-rw-r--r--module/plugins/decrypter/HoerbuchIn.py2
-rw-r--r--module/plugins/decrypter/LixIn.py2
-rw-r--r--module/plugins/decrypter/OneKhDe.py2
-rw-r--r--module/plugins/decrypter/RSLayerCom.py2
-rw-r--r--module/plugins/decrypter/RelinkUs.py2
-rw-r--r--module/plugins/decrypter/SecuredIn.py2
-rw-r--r--module/plugins/decrypter/SerienjunkiesOrg.py4
-rw-r--r--module/plugins/decrypter/StealthTo.py2
-rw-r--r--module/plugins/decrypter/YoutubeChannel.py2
-rw-r--r--module/plugins/hoster/DepositfilesCom.py2
-rw-r--r--module/plugins/hoster/DuckloadCom.py2
-rw-r--r--module/plugins/hoster/FilefactoryCom.py2
-rw-r--r--module/plugins/hoster/FilesmonsterCom.py2
-rw-r--r--module/plugins/hoster/FreakshareNet.py2
-rw-r--r--module/plugins/hoster/GigasizeCom.py2
-rw-r--r--module/plugins/hoster/HotfileCom.py2
-rw-r--r--module/plugins/hoster/MegauploadCom.py2
-rw-r--r--module/plugins/hoster/MyvideoDe.py2
-rw-r--r--module/plugins/hoster/NetloadIn.py2
-rw-r--r--module/plugins/hoster/ShareonlineBiz.py2
-rw-r--r--module/plugins/hoster/ShragleCom.py2
-rw-r--r--module/plugins/hoster/StorageTo.py2
-rw-r--r--module/plugins/hoster/UploadedTo.py2
-rw-r--r--module/plugins/hoster/XupIn.py2
-rw-r--r--module/plugins/hoster/YoupornCom.py2
-rw-r--r--module/plugins/hoster/YoutubeCom.py2
-rw-r--r--module/plugins/hoster/ZippyshareCom.py2
-rw-r--r--module/plugins/hoster/ZshareNet.py2
-rw-r--r--module/web/cnl/views.py4
37 files changed, 40 insertions, 39 deletions
diff --git a/module/DownloadThread.py b/module/DownloadThread.py
index 4953ffa53..3cfaed780 100644
--- a/module/DownloadThread.py
+++ b/module/DownloadThread.py
@@ -168,7 +168,7 @@ class DownloadThread(Thread):
def wait(self, pyfile):
pyfile.status.type = "waiting"
while (time() < pyfile.status.waituntil):
- if self.parent.init_reconnect() or self.parent.reconnecting:
+ if self.parent.initReconnect() or self.parent.reconnecting:
pyfile.status.type = "reconnected"
pyfile.status.want_reconnect = False
raise Reconnect
diff --git a/module/FileList.py b/module/FileList.py
index 5282c0be6..665e4bec5 100644
--- a/module/FileList.py
+++ b/module/FileList.py
@@ -17,7 +17,7 @@
@author: mkaay
@author: RaNaN
- @version: v0.3.1
+ @version: v0.3.2
@list-version: v4
"""
diff --git a/module/ThreadManager.py b/module/ThreadManager.py
index bb43bb1db..42117ee14 100644
--- a/module/ThreadManager.py
+++ b/module/ThreadManager.py
@@ -48,9 +48,10 @@ class ThreadManager(Thread):
def run(self):
while True:
- if not self.pause and (len(self.threads) < int(self.parent.config['general']['max_downloads']) or self.isDecryptWaiting()):
+ if (len(self.threads) < int(self.parent.config['general']['max_downloads']) or self.isDecryptWaiting()) and not self.pause:
job = self.getJob()
if job:
+ print "job"
thread = self.createThread(job)
thread.start()
sleep(1)
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 14dd916da..9d7116900 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -5,7 +5,7 @@ import re
import tempfile
import urllib2
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from module.network.MultipartPostHandler import MultipartPostHandler
class CCF(Plugin):
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index 92508ce29..b45ab83d0 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class LinkList(Plugin):
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index 0b6a63722..9604495fd 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -4,7 +4,7 @@
import base64
import binascii
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class RSDF(Plugin):
diff --git a/module/plugins/decrypter/DDLMusicOrg.py b/module/plugins/decrypter/DDLMusicOrg.py
index c927d261c..63c684ff8 100644
--- a/module/plugins/decrypter/DDLMusicOrg.py
+++ b/module/plugins/decrypter/DDLMusicOrg.py
@@ -4,7 +4,7 @@
import re
from time import sleep
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class DDLMusicOrg(Plugin):
diff --git a/module/plugins/decrypter/FourChanOrg.py b/module/plugins/decrypter/FourChanOrg.py
index e3b00c1f7..8960c74eb 100644
--- a/module/plugins/decrypter/FourChanOrg.py
+++ b/module/plugins/decrypter/FourChanOrg.py
@@ -3,7 +3,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class FourChanOrg(Plugin):
diff --git a/module/plugins/decrypter/HoerbuchIn.py b/module/plugins/decrypter/HoerbuchIn.py
index 2c3fd4123..a318a00be 100644
--- a/module/plugins/decrypter/HoerbuchIn.py
+++ b/module/plugins/decrypter/HoerbuchIn.py
@@ -3,7 +3,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class HoerbuchIn(Plugin):
diff --git a/module/plugins/decrypter/LixIn.py b/module/plugins/decrypter/LixIn.py
index d7ef6521d..c44f7e9da 100644
--- a/module/plugins/decrypter/LixIn.py
+++ b/module/plugins/decrypter/LixIn.py
@@ -3,7 +3,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class LixIn(Plugin):
diff --git a/module/plugins/decrypter/OneKhDe.py b/module/plugins/decrypter/OneKhDe.py
index 5f24b543a..9db0a0147 100644
--- a/module/plugins/decrypter/OneKhDe.py
+++ b/module/plugins/decrypter/OneKhDe.py
@@ -4,7 +4,7 @@
import re
from module.unescape import unescape
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class OneKhDe(Plugin):
diff --git a/module/plugins/decrypter/RSLayerCom.py b/module/plugins/decrypter/RSLayerCom.py
index 20cadbe18..a939d9b1f 100644
--- a/module/plugins/decrypter/RSLayerCom.py
+++ b/module/plugins/decrypter/RSLayerCom.py
@@ -4,7 +4,7 @@
import re
from module.unescape import unescape
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class RSLayerCom(Plugin):
diff --git a/module/plugins/decrypter/RelinkUs.py b/module/plugins/decrypter/RelinkUs.py
index 71b441116..c8f8c4084 100644
--- a/module/plugins/decrypter/RelinkUs.py
+++ b/module/plugins/decrypter/RelinkUs.py
@@ -4,7 +4,7 @@
import re
import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class RelinkUs(Plugin):
diff --git a/module/plugins/decrypter/SecuredIn.py b/module/plugins/decrypter/SecuredIn.py
index 510d48b28..5ec33e5c2 100644
--- a/module/plugins/decrypter/SecuredIn.py
+++ b/module/plugins/decrypter/SecuredIn.py
@@ -2,7 +2,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from module.BeautifulSoup import BeautifulSoup
from math import ceil
diff --git a/module/plugins/decrypter/SerienjunkiesOrg.py b/module/plugins/decrypter/SerienjunkiesOrg.py
index d8396bd0b..af95a9c78 100644
--- a/module/plugins/decrypter/SerienjunkiesOrg.py
+++ b/module/plugins/decrypter/SerienjunkiesOrg.py
@@ -2,10 +2,10 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from module.BeautifulSoup import BeautifulSoup
from module.unescape import unescape
-from module.download_thread import CaptchaError
+from module.DownloadThread import CaptchaError
class SerienjunkiesOrg(Plugin):
def __init__(self, parent):
diff --git a/module/plugins/decrypter/StealthTo.py b/module/plugins/decrypter/StealthTo.py
index 855aae001..af8600274 100644
--- a/module/plugins/decrypter/StealthTo.py
+++ b/module/plugins/decrypter/StealthTo.py
@@ -3,7 +3,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class StealthTo(Plugin):
diff --git a/module/plugins/decrypter/YoutubeChannel.py b/module/plugins/decrypter/YoutubeChannel.py
index 73cf76094..497bf5853 100644
--- a/module/plugins/decrypter/YoutubeChannel.py
+++ b/module/plugins/decrypter/YoutubeChannel.py
@@ -3,7 +3,7 @@
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class YoutubeChannel(Plugin):
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index b5ab5c6f7..b8883ac2e 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -3,7 +3,7 @@
import re
import urllib
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class DepositfilesCom(Plugin):
diff --git a/module/plugins/hoster/DuckloadCom.py b/module/plugins/hoster/DuckloadCom.py
index 31b7d112b..c64842846 100644
--- a/module/plugins/hoster/DuckloadCom.py
+++ b/module/plugins/hoster/DuckloadCom.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from time import time
class DuckloadCom(Plugin):
diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index 0125d442e..0a182ad78 100644
--- a/module/plugins/hoster/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from time import time
class FilefactoryCom(Plugin):
diff --git a/module/plugins/hoster/FilesmonsterCom.py b/module/plugins/hoster/FilesmonsterCom.py
index 99a2ccd57..7b764e63a 100644
--- a/module/plugins/hoster/FilesmonsterCom.py
+++ b/module/plugins/hoster/FilesmonsterCom.py
@@ -13,7 +13,7 @@
import re
import urllib
import time
-from Plugin import Plugin
+from module.plugins.Plugin import Plugin
class FilesmonsterCom(Plugin):
diff --git a/module/plugins/hoster/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py
index 8c7dc5a2c..22b488757 100644
--- a/module/plugins/hoster/FreakshareNet.py
+++ b/module/plugins/hoster/FreakshareNet.py
@@ -4,7 +4,7 @@
import re
import urllib
import httplib
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
from time import time
diff --git a/module/plugins/hoster/GigasizeCom.py b/module/plugins/hoster/GigasizeCom.py
index a14e17bf8..65d59426f 100644
--- a/module/plugins/hoster/GigasizeCom.py
+++ b/module/plugins/hoster/GigasizeCom.py
@@ -6,7 +6,7 @@ import re
import tempfile
from time import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class GigasizeCom(Plugin):
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index 2a1117fc5..177e10304 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -3,7 +3,7 @@
import re
from time import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class HotfileCom(Plugin):
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index ffe0bdba7..1ac21e8a7 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -6,7 +6,7 @@ import re
import tempfile
from time import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class MegauploadCom(Plugin):
diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
index 365cca59c..405cd2072 100644
--- a/module/plugins/hoster/MyvideoDe.py
+++ b/module/plugins/hoster/MyvideoDe.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class MyvideoDe(Plugin):
def __init__(self, parent):
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 9891828a2..bc5b437d3 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -8,7 +8,7 @@ from time import time
from time import sleep
import hashlib
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class NetloadIn(Plugin):
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 68bfeab61..02b9d80e9 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -10,7 +10,7 @@ import hashlib
import random
from time import sleep
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class ShareonlineBiz(Plugin):
diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
index fddd113b1..619b63429 100644
--- a/module/plugins/hoster/ShragleCom.py
+++ b/module/plugins/hoster/ShragleCom.py
@@ -4,7 +4,7 @@
import re
import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class ShragleCom(Plugin):
diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py
index fb5a07189..cb18cf504 100644
--- a/module/plugins/hoster/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
@@ -4,7 +4,7 @@
import re
from time import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class StorageTo(Plugin):
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 8020b2ba2..2cfdfb3c7 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -2,7 +2,7 @@
import re
from time import time
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
import hashlib
class UploadedTo(Plugin):
diff --git a/module/plugins/hoster/XupIn.py b/module/plugins/hoster/XupIn.py
index f48a3e944..495387172 100644
--- a/module/plugins/hoster/XupIn.py
+++ b/module/plugins/hoster/XupIn.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class XupIn(Plugin):
diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index db9cdb85f..a32ed34a8 100644
--- a/module/plugins/hoster/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class YoupornCom(Plugin):
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index a3185872d..494158ba3 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class YoutubeCom(Plugin):
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index a40d33260..238edeb84 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -3,7 +3,7 @@
import re
import urllib
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class ZippyshareCom(Plugin):
diff --git a/module/plugins/hoster/ZshareNet.py b/module/plugins/hoster/ZshareNet.py
index c3de0e475..1b1a50bbf 100644
--- a/module/plugins/hoster/ZshareNet.py
+++ b/module/plugins/hoster/ZshareNet.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import re
-from module.Plugin import Plugin
+from module.plugins.Plugin import Plugin
class ZshareNet(Plugin):
diff --git a/module/web/cnl/views.py b/module/web/cnl/views.py
index d42a0e60b..fc02d68a7 100644
--- a/module/web/cnl/views.py
+++ b/module/web/cnl/views.py
@@ -53,7 +53,7 @@ class JsonResponse(HttpResponse):
@local_check
def flash(request):
- return HttpResponse("JDownloader\r\n")
+ return HttpResponse("JDownloader")
@local_check
def add(request):
@@ -137,7 +137,7 @@ def flashgot(request):
settings.PYLOAD.add_package(package, urls, autostart)
- return HttpResponse("\r\n")
+ return HttpResponse("")
@local_check
def crossdomain(request):
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 22:12:39 +0100