Cleaned plugin index function

30 files changed, 32 insertions, 166 deletions

diff --git a/module/plugins/BluehostTo.py b/module/plugins/BluehostTo.py
index 1ecd47122..eff8ebcd8 100644
--- a/module/plugins/BluehostTo.py
+++ b/module/plugins/BluehostTo.py
@@ -4,7 +4,7 @@
 import re
 import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class BluehostTo(Plugin):
 
diff --git a/module/plugins/CCF.py b/module/plugins/CCF.py
index d7792dce4..ba5b1c77d 100644
--- a/module/plugins/CCF.py
+++ b/module/plugins/CCF.py
@@ -7,7 +7,7 @@ import re
 import tempfile
 import urllib2
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 from module.network.MultipartPostHandler import MultipartPostHandler
 
 class CCF(Plugin):
@@ -57,4 +57,4 @@ class CCF(Plugin):
 
         self.links.append(tempdlc_name)
 
-        return True
\ No newline at end of file
+        return True
diff --git a/module/plugins/DDLMusicOrg.py b/module/plugins/DDLMusicOrg.py
index 06dbfb31c..e34e6fbde 100644
--- a/module/plugins/DDLMusicOrg.py
+++ b/module/plugins/DDLMusicOrg.py
@@ -4,7 +4,7 @@
 import re
 from time import sleep
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class DDLMusicOrg(Plugin):
 
diff --git a/module/plugins/DepositfilesCom.py b/module/plugins/DepositfilesCom.py
index b2f6db29c..6c5748096 100644
--- a/module/plugins/DepositfilesCom.py
+++ b/module/plugins/DepositfilesCom.py
@@ -3,7 +3,7 @@
 
 import re
 import urllib
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class DepositfilesCom(Plugin):
 
diff --git a/module/plugins/FilefactoryCom.py b/module/plugins/FilefactoryCom.py
index 65f79390d..ff069b20f 100644
--- a/module/plugins/FilefactoryCom.py
+++ b/module/plugins/FilefactoryCom.py
@@ -3,7 +3,7 @@
 
 import re
 import urllib
-from Plugin import Plugin
+from module.Plugin import Plugin
 from time import time
 
 class FilefactoryCom(Plugin):
diff --git a/module/plugins/FourChanOrg.py b/module/plugins/FourChanOrg.py
index 383785951..e3b00c1f7 100644
--- a/module/plugins/FourChanOrg.py
+++ b/module/plugins/FourChanOrg.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class FourChanOrg(Plugin):
 
diff --git a/module/plugins/GigasizeCom.py b/module/plugins/GigasizeCom.py
index e9404263c..e22fe8593 100644
--- a/module/plugins/GigasizeCom.py
+++ b/module/plugins/GigasizeCom.py
@@ -6,7 +6,7 @@ import re
 import tempfile
 from time import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class GigasizeCom(Plugin):
 
diff --git a/module/plugins/HoerbuchIn.py b/module/plugins/HoerbuchIn.py
index 02d3a79e7..ae7ae9774 100644
--- a/module/plugins/HoerbuchIn.py
+++ b/module/plugins/HoerbuchIn.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class HoerbuchIn(Plugin):
 
diff --git a/module/plugins/HotfileCom.py b/module/plugins/HotfileCom.py
index 10a8fd5a8..7ae432c78 100644
--- a/module/plugins/HotfileCom.py
+++ b/module/plugins/HotfileCom.py
@@ -4,7 +4,7 @@
 import re
 import urllib
 from time import time
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class HotfileCom(Plugin):
 
diff --git a/module/plugins/LixIn.py b/module/plugins/LixIn.py
index ee7d99a62..d7ef6521d 100644
--- a/module/plugins/LixIn.py
+++ b/module/plugins/LixIn.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class LixIn(Plugin):
 
diff --git a/module/plugins/MegauploadCom.py b/module/plugins/MegauploadCom.py
index bcafec83f..3736503c0 100644
--- a/module/plugins/MegauploadCom.py
+++ b/module/plugins/MegauploadCom.py
@@ -5,7 +5,7 @@ import os
 import re
 import tempfile
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class MegauploadCom(Plugin):
 
diff --git a/module/plugins/MyvideoDe.py b/module/plugins/MyvideoDe.py
index 3f7ce915b..5e2eb0b39 100644
--- a/module/plugins/MyvideoDe.py
+++ b/module/plugins/MyvideoDe.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class MyvideoDe(Plugin):
 
diff --git a/module/plugins/NetloadIn.py b/module/plugins/NetloadIn.py
index 21fba5aa3..b9fb4cfed 100644
--- a/module/plugins/NetloadIn.py
+++ b/module/plugins/NetloadIn.py
@@ -8,7 +8,7 @@ from time import time
 from time import sleep
 import hashlib
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class NetloadIn(Plugin):
 
diff --git a/module/plugins/OneKhDe.py b/module/plugins/OneKhDe.py
index 15c3a6872..5f24b543a 100644
--- a/module/plugins/OneKhDe.py
+++ b/module/plugins/OneKhDe.py
@@ -4,7 +4,7 @@
 import re
 
 from module.unescape import unescape
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class OneKhDe(Plugin):
 
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
deleted file mode 100644
index 7b726c3ac..000000000
--- a/module/plugins/Plugin.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-#Copyright (C) 2009 kingzero, RaNaN
-#
-#This program is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 3 of the License,
-#or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-###
-import ConfigParser
-import logging
-import re
-
-from module.network.Request import Request
-
-class Plugin():
-
-    def __init__(self, parent):
-        self.parser = ConfigParser.SafeConfigParser()
-        self.config = {}
-        props = {}
-        props['name'] = "BasePlugin"
-        props['version'] = "0.2"
-        props['pattern'] = None
-        props['type'] = "hoster"
-        props['description'] = """Base Plugin"""
-        props['author_name'] = ("RaNaN", "spoob", "mkaay")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org", "mkaay@mkaay.de")
-        self.props = props
-        self.parent = parent
-        self.req = Request()
-        self.html = 0
-        self.time_plus_wait = 0 #time() + wait in seconds
-        self.want_reconnect = False
-        self.multi_dl = True
-        self.ocr = None #captcha reader instance
-        self.logger = logging.getLogger("log")
-    
-    def prepare(self, thread):
-        pyfile = self.parent
-
-        self.want_reconnect = False
-
-        pyfile.status.exists = self.file_exists()
-
-        if not pyfile.status.exists:
-            raise Exception, "The file was not found on the server."
-            return False
-
-        pyfile.status.filename = self.get_file_name()
-            
-        pyfile.status.waituntil = self.time_plus_wait
-        pyfile.status.url = self.get_file_url()
-        pyfile.status.want_reconnect = self.want_reconnect
-
-        thread.wait(self.parent)
-
-        return True
-
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        pass
-
-    def download_html(self):
-        """ gets the url from self.parent.url saves html in self.html and parses
-        """
-        html = ""
-        self.html = html
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        return self.parent.url
-
-    def get_file_name(self):
-        return re.findall("([^\/=]+)", self.parent.url)[-1]
-
-    def wait_until(self):
-        if self.html != None:
-            self.download_html()
-        return self.time_plus_wait
-
-    def proceed(self, url, location, folder=""):
-        self.req.download(url, location, folder)
-
-    def set_config(self):
-        pass
-
-    def get_config(self, value):
-        self.parser.read("pluginconfig")
-        return self.parser.get(self.props['name'], value)
-
-    def read_config(self):
-        self.parser.read("pluginconfig")
-
-        if self.parser.has_section(self.props['name']):
-            for option in self.parser.options(self.props['name']):
-                self.config[option] = self.parser.get(self.props['name'], option, raw=True)
-                self.config[option] = False if self.config[option].lower() == 'false' else self.config[option]
-
-    def init_ocr(self):
-        modul = __import__("module.captcha." + self.props['name'], fromlist=['captcha'])
-        captchaClass = getattr(modul, self.props['name'])
-        self.ocr = captchaClass()
-
-    def __call__(self):
-        return self.props['name']
-    
-    def check_file(self, local_file):
-        """
-        return codes:
-        0  - checksum ok
-        1  - checksum wrong
-        5  - can't get checksum
-        10 - not implemented
-        20 - unknown error
-        """
-    	return (True, 10)
diff --git a/module/plugins/RSDF.py b/module/plugins/RSDF.py
index c2406d6e0..50fca9b1f 100644
--- a/module/plugins/RSDF.py
+++ b/module/plugins/RSDF.py
@@ -4,7 +4,7 @@
 import base64
 import binascii
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class RSDF(Plugin):
 
diff --git a/module/plugins/RSLayerCom.py b/module/plugins/RSLayerCom.py
index e470c1748..20cadbe18 100644
--- a/module/plugins/RSLayerCom.py
+++ b/module/plugins/RSLayerCom.py
@@ -4,7 +4,7 @@
 import re
 
 from module.unescape import unescape
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class RSLayerCom(Plugin):
 
diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py
index 08b7bdea4..e2602bdd6 100644
--- a/module/plugins/RapidshareCom.py
+++ b/module/plugins/RapidshareCom.py
@@ -4,7 +4,7 @@
 import re
 from time import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 import hashlib
 
 class RapidshareCom(Plugin):
diff --git a/module/plugins/RelinkUs.py b/module/plugins/RelinkUs.py
index 31f592759..4bfa5a18b 100644
--- a/module/plugins/RelinkUs.py
+++ b/module/plugins/RelinkUs.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class RelinkUs(Plugin):
 
diff --git a/module/plugins/ShareonlineBiz.py b/module/plugins/ShareonlineBiz.py
index cb7030e87..a798ccefa 100644
--- a/module/plugins/ShareonlineBiz.py
+++ b/module/plugins/ShareonlineBiz.py
@@ -7,7 +7,7 @@ import tempfile
 from time import time
 from base64 import b64decode
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class ShareonlineBiz(Plugin):
 
diff --git a/module/plugins/ShragleCom.py b/module/plugins/ShragleCom.py
index bcf650d69..c0cc9de72 100644
--- a/module/plugins/ShragleCom.py
+++ b/module/plugins/ShragleCom.py
@@ -4,7 +4,7 @@
 import re
 import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class ShragleCom(Plugin):
 
@@ -69,4 +69,4 @@ class ShragleCom(Plugin):
             return True
 
     def proceed(self, url, location):
-        self.req.download(url, location, {'fileID': self.fileID, 'dlSession': self.dlSession, 'userID': self.userID, 'password': self.password, 'lang': self.lang})
\ No newline at end of file
+        self.req.download(url, location, {'fileID': self.fileID, 'dlSession': self.dlSession, 'userID': self.userID, 'password': self.password, 'lang': self.lang})
diff --git a/module/plugins/StealthTo.py b/module/plugins/StealthTo.py
index c904a07c3..855aae001 100644
--- a/module/plugins/StealthTo.py
+++ b/module/plugins/StealthTo.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class StealthTo(Plugin):
 
diff --git a/module/plugins/StorageTo.py b/module/plugins/StorageTo.py
index 14cb657d9..dbff844ad 100644
--- a/module/plugins/StorageTo.py
+++ b/module/plugins/StorageTo.py
@@ -4,7 +4,7 @@
 import re
 from time import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class StorageTo(Plugin):
 
diff --git a/module/plugins/UploadedTo.py b/module/plugins/UploadedTo.py
index e00d72f51..bcb0a7008 100644
--- a/module/plugins/UploadedTo.py
+++ b/module/plugins/UploadedTo.py
@@ -3,7 +3,7 @@
 
 import re
 from time import time
-from Plugin import Plugin
+from module.Plugin import Plugin
 import hashlib
 
 class UploadedTo(Plugin):
diff --git a/module/plugins/XupIn.py b/module/plugins/XupIn.py
index 6b1f3be73..d044f2389 100644
--- a/module/plugins/XupIn.py
+++ b/module/plugins/XupIn.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class XupIn(Plugin):
 
diff --git a/module/plugins/YoupornCom.py b/module/plugins/YoupornCom.py
index fb0f4131d..e501954da 100644
--- a/module/plugins/YoupornCom.py
+++ b/module/plugins/YoupornCom.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class YoupornCom(Plugin):
 
@@ -59,4 +59,4 @@ class YoupornCom(Plugin):
         if re.search(r"(.*invalid video_id.*)", self.html) != None:
             return False
         else:
-            return True
\ No newline at end of file
+            return True
diff --git a/module/plugins/YoutubeChannel.py b/module/plugins/YoutubeChannel.py
index 4958d1db5..27a4ff8a7 100644
--- a/module/plugins/YoutubeChannel.py
+++ b/module/plugins/YoutubeChannel.py
@@ -3,7 +3,7 @@
 
 import re
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class YoutubeChannel(Plugin):
 
diff --git a/module/plugins/YoutubeCom.py b/module/plugins/YoutubeCom.py
index 7428f532d..c93c662d1 100644
--- a/module/plugins/YoutubeCom.py
+++ b/module/plugins/YoutubeCom.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class YoutubeCom(Plugin):
 
diff --git a/module/plugins/ZippyshareCom.py b/module/plugins/ZippyshareCom.py
index 61408f925..0c638087b 100644
--- a/module/plugins/ZippyshareCom.py
+++ b/module/plugins/ZippyshareCom.py
@@ -3,7 +3,7 @@
 
 import re
 import urllib
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class ZippyshareCom(Plugin):
 
diff --git a/module/plugins/ZshareNet.py b/module/plugins/ZshareNet.py
index 33667605f..08f28a35c 100644
--- a/module/plugins/ZshareNet.py
+++ b/module/plugins/ZshareNet.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class ZshareNet(Plugin):