clean root folder

31 files changed, 10 insertions, 21 deletions

diff --git a/config b/config
index 1982bf6ac..f408b2f22 100644
--- a/config
+++ b/config
@@ -3,7 +3,7 @@ port = 7272
 password = pwhere
 
 [webinterface]
-activated = True 
+activated = False 
 port = 8080
 username = User
 password = webpw
@@ -24,7 +24,7 @@ reconnect_method = reconnect_method
 debug_mode = False
 
 [updates]
-search_updates = asdf
+search_updates = True
 install_updates = False
 
 [reconnectTime]
diff --git a/module/network/Request.py b/module/network/Request.py
index b2bac2d7b..084c84f95 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -244,7 +244,6 @@ class Request:
             if "..." in file_name:
                 download_folder = dirname(file_name) + sep
                 headers = self.get_header()
-                print headers
                 file_name_search = re.search('filename=(?P<quote>\")?(.+)(?(quote)\")', headers)
                 if file_name_search:
                     file_name = file_name_search.group(2)
diff --git a/Plugins/BluehostTo.py b/module/plugins/BluehostTo.py
index 1ecd47122..1ecd47122 100644
--- a/Plugins/BluehostTo.py
+++ b/module/plugins/BluehostTo.py
diff --git a/Plugins/CCF.py b/module/plugins/CCF.py
index d7792dce4..d7792dce4 100644
--- a/Plugins/CCF.py
+++ b/module/plugins/CCF.py
diff --git a/Plugins/DLC.pyc b/module/plugins/DLC.pyc
index 5d4809178..5d4809178 100644
--- a/Plugins/DLC.pyc
+++ b/module/plugins/DLC.pyc
diff --git a/Plugins/DepositfilesCom.py b/module/plugins/DepositfilesCom.py
index b2f6db29c..b2f6db29c 100644
--- a/Plugins/DepositfilesCom.py
+++ b/module/plugins/DepositfilesCom.py
diff --git a/Plugins/FourChan.py b/module/plugins/FourChan.py
index 840274457..840274457 100644
--- a/Plugins/FourChan.py
+++ b/module/plugins/FourChan.py
diff --git a/Plugins/GigasizeCom.py b/module/plugins/GigasizeCom.py
index e9404263c..e9404263c 100644
--- a/Plugins/GigasizeCom.py
+++ b/module/plugins/GigasizeCom.py
diff --git a/Plugins/HoerbuchIn.py b/module/plugins/HoerbuchIn.py
index 02d3a79e7..02d3a79e7 100644
--- a/Plugins/HoerbuchIn.py
+++ b/module/plugins/HoerbuchIn.py
diff --git a/Plugins/LixIn.py b/module/plugins/LixIn.py
index ee7d99a62..ee7d99a62 100644
--- a/Plugins/LixIn.py
+++ b/module/plugins/LixIn.py
diff --git a/Plugins/MegauploadCom.py b/module/plugins/MegauploadCom.py
index bcafec83f..bcafec83f 100644
--- a/Plugins/MegauploadCom.py
+++ b/module/plugins/MegauploadCom.py
diff --git a/Plugins/MyvideoDe.py b/module/plugins/MyvideoDe.py
index 3f7ce915b..3f7ce915b 100644
--- a/Plugins/MyvideoDe.py
+++ b/module/plugins/MyvideoDe.py
diff --git a/Plugins/NetloadIn.py b/module/plugins/NetloadIn.py
index 8bff067de..789c84a2d 100644
--- a/Plugins/NetloadIn.py
+++ b/module/plugins/NetloadIn.py
@@ -26,7 +26,6 @@ class NetloadIn(Plugin):
         self.html = [None, None, None]
         self.want_reconnect = False
         self.init_ocr()
-        self.multi_dl = False
 
     def prepare(self, thread):
         pyfile = self.parent
@@ -46,10 +45,6 @@ class NetloadIn(Plugin):
                 raise Exception, "The file was not found on the server."
 
             pyfile.status.filename = self.get_file_name()
-            
-            if self.config['premium']:
-                pyfile.status.url = self.parent.url
-                return True
 
             self.download_html2()
 
@@ -66,7 +61,6 @@ class NetloadIn(Plugin):
             if tries > 3:
                 raise Exception, "Error while preparing DL, HTML dump: %s %s" % (self.html[0], self.html[1])
 
-
         return True
 
 
@@ -75,10 +69,10 @@ class NetloadIn(Plugin):
         self.html[0] = self.req.load(url, cookies=True)
 
     def download_html2(self):
+        
         url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', self.html[0]).group(1).replace("amp;", "")
 
         for i in range(6):
-
             self.html[1] = self.req.load(url_captcha_html, cookies=True)
 
             try:
@@ -105,7 +99,6 @@ class NetloadIn(Plugin):
     
         raise Exception, "Captcha reading failed"
 
-
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
@@ -140,7 +133,4 @@ class NetloadIn(Plugin):
 
     def proceed(self, url, location):
 
-        if self.config['premium']:
-            self.req.add_auth(self.config['username'], self.config['password'])
-
         self.req.download(url, location, cookies=True)
diff --git a/Plugins/OneKhDe.py b/module/plugins/OneKhDe.py
index 15c3a6872..15c3a6872 100644
--- a/Plugins/OneKhDe.py
+++ b/module/plugins/OneKhDe.py
diff --git a/Plugins/Plugin.py b/module/plugins/Plugin.py
index 0a7b3ecb2..5b3c7ee8c 100644
--- a/Plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -115,7 +115,7 @@ class Plugin():
                 self.config[option] = False if self.config[option].lower() == 'false' else self.config[option]
 
     def init_ocr(self):
-        modul = __import__("captcha." + self.props['name'], fromlist=['captcha'])
+        modul = __import__("module.captcha." + self.props['name'], fromlist=['captcha'])
         captchaClass = getattr(modul, self.props['name'])
         self.ocr = captchaClass()
 
diff --git a/Plugins/RSDF.py b/module/plugins/RSDF.py
index c2406d6e0..c2406d6e0 100644
--- a/Plugins/RSDF.py
+++ b/module/plugins/RSDF.py
diff --git a/Plugins/RSLayerCom.py b/module/plugins/RSLayerCom.py
index e470c1748..e470c1748 100644
--- a/Plugins/RSLayerCom.py
+++ b/module/plugins/RSLayerCom.py
diff --git a/Plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py
index 731554f87..56a38fb9d 100644
--- a/Plugins/RapidshareCom.py
+++ b/module/plugins/RapidshareCom.py
@@ -24,11 +24,12 @@ class RapidshareCom(Plugin):
         self.html_old = None         #time() where loaded the HTML
         self.time_plus_wait = None   #time() + wait in seconds
         self.want_reconnect = False
-        self.multi_dl = False
 
         self.read_config()
         if self.config['premium']:
             self.multi_dl = True
+        else:
+            self.multi_dl = False
 
         self.start_dl = False
 
diff --git a/Plugins/RelinkUs.py b/module/plugins/RelinkUs.py
index 31f592759..31f592759 100644
--- a/Plugins/RelinkUs.py
+++ b/module/plugins/RelinkUs.py
diff --git a/Plugins/ShareonlineBiz.py b/module/plugins/ShareonlineBiz.py
index d42ef9302..d42ef9302 100644
--- a/Plugins/ShareonlineBiz.py
+++ b/module/plugins/ShareonlineBiz.py
diff --git a/Plugins/ShragleCom.py b/module/plugins/ShragleCom.py
index bcf650d69..bcf650d69 100644
--- a/Plugins/ShragleCom.py
+++ b/module/plugins/ShragleCom.py
diff --git a/Plugins/StealthTo.py b/module/plugins/StealthTo.py
index c904a07c3..c904a07c3 100644
--- a/Plugins/StealthTo.py
+++ b/module/plugins/StealthTo.py
diff --git a/Plugins/UploadedTo.py b/module/plugins/UploadedTo.py
index e65be789c..e65be789c 100644
--- a/Plugins/UploadedTo.py
+++ b/module/plugins/UploadedTo.py
diff --git a/Plugins/XupIn.py b/module/plugins/XupIn.py
index 6b1f3be73..6b1f3be73 100644
--- a/Plugins/XupIn.py
+++ b/module/plugins/XupIn.py
diff --git a/Plugins/YoupornCom.py b/module/plugins/YoupornCom.py
index fb0f4131d..fb0f4131d 100644
--- a/Plugins/YoupornCom.py
+++ b/module/plugins/YoupornCom.py
diff --git a/Plugins/YoutubeChannel.py b/module/plugins/YoutubeChannel.py
index 4958d1db5..4958d1db5 100644
--- a/Plugins/YoutubeChannel.py
+++ b/module/plugins/YoutubeChannel.py
diff --git a/Plugins/YoutubeCom.py b/module/plugins/YoutubeCom.py
index 7428f532d..7428f532d 100644
--- a/Plugins/YoutubeCom.py
+++ b/module/plugins/YoutubeCom.py
diff --git a/Plugins/ZippyshareCom.py b/module/plugins/ZippyshareCom.py
index 61408f925..61408f925 100644
--- a/Plugins/ZippyshareCom.py
+++ b/module/plugins/ZippyshareCom.py
diff --git a/Plugins/ZshareNet.py b/module/plugins/ZshareNet.py
index 33667605f..33667605f 100644
--- a/Plugins/ZshareNet.py
+++ b/module/plugins/ZshareNet.py
diff --git a/Plugins/__init__.py b/module/plugins/__init__.py
index 8d1c8b69c..8d1c8b69c 100644
--- a/Plugins/__init__.py
+++ b/module/plugins/__init__.py
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 801eee9c6..c0d0bccce 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -47,7 +47,7 @@ class Core(object):
     """
     def __init__(self):
         self.config = {}
-        self.config['plugin_folder'] = "plugins"
+        self.plugin_folder = "module" + sep + "plugins"
         self.plugins_avaible = {}
 
         self.read_config()
@@ -73,7 +73,7 @@ class Core(object):
 
         self.logger.info(_("Downloadtime: %s") % self.is_dltime()) # debug only
 
-        path.append(self.config['plugin_folder'])
+        path.append(self.plugin_folder)
         self.create_plugin_index()
 
         self.init_server()
@@ -106,9 +106,8 @@ class Core(object):
         return self.config
 
     def create_plugin_index(self):
-        plugin_folder = self.config['plugin_folder']
-        for file_handler in glob(plugin_folder + sep + '*.py') + glob(plugin_folder + sep + 'DLC.pyc'):
-            if file_handler != plugin_folder + sep + "Plugin.py":
+        for file_handler in glob(self.plugin_folder + sep + '*.py') + glob(self.plugin_folder + sep + 'DLC.pyc'):
+            if file_handler != self.plugin_folder + sep + "Plugin.py":
                 plugin_pattern = ""
                 plugin_file = basename(file_handler).replace('.pyc', '').replace('.py', '')
                 for line in open(file_handler, "r").readlines():