merged gui

76 files changed, 0 insertions, 6026 deletions

diff --git a/module/plugins/Account.py b/module/plugins/Account.py
deleted file mode 100644
index 61101347d..000000000
--- a/module/plugins/Account.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from random import randrange
-import re
-
-class Account():
-    __name__ = "Account"
-    __version__ = "0.2"
-    __type__ = "account"
-    __description__ = """Account Plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def __init__(self, manager, accounts):
-        self.manager = manager
-        self.core = manager.core
-        self.accounts = {}
-        self.register = {}
-        self.setAccounts(accounts)
-        
-    def login(self, user, data):
-        pass
-    
-    def setAccounts(self, accounts):
-        self.accounts = accounts
-        for user, data in self.accounts.iteritems():
-            self.login(user, data)
-    
-    def updateAccounts(self, user, password, options):
-        if self.accounts.has_key(user):
-            self.accounts[user]["password"] = password
-            self.accounts[user]["options"] = options
-        else:
-            self.accounts[user] = {"password" : password, "options": options}
-            
-        self.login(user, self.accounts[user])
-    
-    def removeAccount(self, user):
-        del self.accounts[user]
-    
-    def getAccountInfo(self, name):
-        return {
-            "validuntil": None, # -1 for unlimited
-            "login": name,
-            #"password": self.accounts[name]["password"], #@XXX: security
-            "options": self.accounts[name]["options"],
-            "trafficleft": None, # -1 for unlimited
-            "maxtraffic": None,
-            "type": self.__name__,
-        }
-    
-    def getAllAccounts(self):
-        return [self.getAccountInfo(user) for user, data in self.accounts.iteritems()]
-    
-    def getAccountRequest(self, plugin):
-        user, data = self.getAccountData(plugin)
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        return req
-        
-    def getAccountData(self, plugin):
-        if not len(self.accounts):
-            return None
-        if not self.register.has_key(plugin):
-            account = self.selectAccount(plugin)
-            self.register[plugin] = account
-        else:
-            account = self.register[plugin]
-        return account
-    
-    def selectAccount(self, plugin):
-        account = self.accounts.items()[randrange(0, len(self.accounts), 1)]
-        return account
-    
-    def canUse(self):
-        return len(self.accounts)
-    
-    def parseTraffic(self, string): #returns kbyte
-        string = string.strip().lower()
-        p = re.compile(r"(\d+[\.,]\d+)(.*)")
-        m = p.match(string)
-        if m:
-            traffic = float(m.group(1).replace(",", "."))
-            unit = m.group(2).strip()
-            if unit == "gb" or unit == "gig" or unit == "gbyte" or unit == "gigabyte":
-                traffic *= 1024*1024
-            elif unit == "mb" or unit == "megabyte" or unit == "mbyte" or unit == "mib":
-                traffic *= 1024
-            return traffic
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
deleted file mode 100644
index e7b7cc7d6..000000000
--- a/module/plugins/Container.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Crypter import Crypter
-
-from os.path import join, exists, basename
-from os import remove
-import re
-
-class Container(Crypter):
-    __name__ = "Container"
-    __version__ = "0.1"
-    __pattern__ = None
-    __type__ = "container"
-    __description__ = """Base container plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-
-    
-        
-    #----------------------------------------------------------------------
-    def preprocessing(self, thread):
-        """prepare"""
-        self.thread = thread
-        
-        self.loadToDisk()
-
-        self.decrypt(self.pyfile)
-        self.deleteTmp()
-        
-        self.createPackages()
-    
-    
-    #----------------------------------------------------------------------
-    def loadToDisk(self):
-        """loads container to disk if its stored remotely and overwrite url, 
-        or check existent on several places at disk"""
-        
-        if self.pyfile.url.startswith("http://"):
-            self.pyfile.name = re.findall("([^\/=]+)", self.pyfile.url)[-1]
-            content = self.load(self.pyfile.url)
-            self.pyfile.url = join(self.config["general"]["download_folder"], self.pyfile.name)
-            f = open(self.pyfile.url, "wb" )
-            f.write(content)
-            f.close()
-            
-        else:
-            self.pyfile.name = basename(self.pyfile.url)
-            if not exists(self.pyfile.url):
-                if exists(join(pypath, self.pyfile.url)):
-                    self.pyfile.url = join(pypath, self.pyfile.url)
-                else:
-                    self.fail(_("File not exists."))
-      
-
-      
-    #----------------------------------------------------------------------
-    def deleteTmp(self):
-        if self.pyfile.name.startswith("tmp_"):
-            remove(self.pyfile.url)
-
-        
diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
deleted file mode 100644
index c72babb15..000000000
--- a/module/plugins/Crypter.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Plugin import Plugin
-
-from os.path import join, exists, basename
-
-class Crypter(Plugin):
-    __name__ = "Crypter"
-    __version__ = "0.1"
-    __pattern__ = None
-    __type__ = "container"
-    __description__ = """Base crypter plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def __init__(self, pyfile):
-        Plugin.__init__(self, pyfile)
-        
-        """ Put all packages here. It's a list of tuples like:
-        ( name, [list of links], folder ) """
-        self.packages = []
-    
-    #----------------------------------------------------------------------
-    def preprocessing(self, thread):
-        """prepare"""
-        self.thread = thread
-
-        self.decrypt(self.pyfile)
-        
-        self.createPackages()
-        
-
-    #----------------------------------------------------------------------
-    def createPackages(self):
-        """ create new packages from self.packages """
-        for pack in self.packages:
-
-            self.log.info(_("Parsed package %s with %s links") % (pack[0], len(pack[1]) ) )
-            
-            self.core.server_methods.add_package(pack[0], pack[1], 1)
-            
diff --git a/module/plugins/Hook.py b/module/plugins/Hook.py
deleted file mode 100644
index fafa95efe..000000000
--- a/module/plugins/Hook.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-    @interface-version: 0.2
-"""
-
-
-
-class Hook():
-    __name__ = "Hook"
-    __version__ = "0.2"
-    __type__ = "hook"
-    __threaded__ = []
-    __config__ = [ ("name", "type", "desc" , "default") ]
-    __description__ = """interface for hook"""
-    __author_name__ = ("mkaay", "RaNaN")
-    __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org")
-    
-    def __init__(self, core):
-        self.core = core 
-        self.log = core.log
-        self.config = core.config
-        
-        self.interval = 60
-        self.lastCall = 0
-        
-        self.setup()
-               
-    def setup(self):
-        """ more init stuff if needed"""
-        pass
-    
-    def isActivated(self):
-        """ checks if hook is activated"""
-        return self.config.getPlugin(self.__name__, "activated")
-    
-    def getConfig(self, option):
-        """ gets config values """
-        return self.config.getPlugin(self.__name__, option)
-        
-    def setConfig(self, option, value):
-        """ sets config value """
-        self.config.setPlugin(self.__name__, option, value)
-    
-    def coreReady(self):
-        pass
-    
-    def downloadStarts(self, pyfile):
-        pass
-    
-    def downloadFinished(self, pyfile):
-        pass
-    
-    def downloadFailed(self, pyfile):
-        pass
-    
-    def packageFinished(self, pypack):
-        pass
-    
-    def packageFailed(self, pypack):
-        pass
-    
-    def beforeReconnecting(self, ip):
-        pass
-    
-    def afterReconnecting(self, ip):
-        pass
-    
-    def periodical(self):
-        pass
diff --git a/module/plugins/Hoster.py b/module/plugins/Hoster.py
deleted file mode 100644
index d4157f1f8..000000000
--- a/module/plugins/Hoster.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Plugin import Plugin
-
-class Hoster(Plugin):
-    __name__ = "Hoster"
-    __version__ = "0.1"
-    __pattern__ = None
-    __type__ = "hoster"
-    __description__ = """Base hoster plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getInfo(self):
-        return
-        
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
deleted file mode 100644
index 1f680032a..000000000
--- a/module/plugins/Plugin.py
+++ /dev/null
@@ -1,268 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-
-    @author: RaNaN, spoob, mkaay
-"""
-
-import logging
-from os.path import exists
-from os.path import join
-
-from time import time
-from time import sleep
-
-from random import randint
-
-import sys
-from os.path import exists
-
-from os import remove
-from os import makedirs
-
-from tempfile import NamedTemporaryFile
-from mimetypes import guess_type
-
-from itertools import islice
-
-def chunks(iterable, size):
-  it = iter(iterable)
-  item = list(islice(it, size))
-  while item:
-    yield item
-    item = list(islice(it, size))
-
-def dec(func):
-    def new(*args):
-        if args[0].pyfile.abort:
-            raise Abort
-        return func(*args)
-    return new
-
-class Abort(Exception):
-    """ raised when aborted """
-
-class Fail(Exception):
-    """ raised when failed """
-
-class Reconnect(Exception):
-    """ raised when reconnected """
-
-class Retry(Exception):
-    """ raised when start again from beginning """
-
-class Plugin(object):
-    __name__ = "Plugin"
-    __version__ = "0.4"
-    __pattern__ = None
-    __type__ = "hoster"
-    __config__ = [ ("name", "type", "desc" , "default") ]
-    __description__ = """Base Plugin"""
-    __author_name__ = ("RaNaN", "spoob", "mkaay")
-    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "mkaay@mkaay.de")
-
-
-    def __init__(self, pyfile):
-        self.config = pyfile.m.core.config
-        self.core = pyfile.m.core
-
-        self.wantReconnect = False
-        self.multiDL = True
-
-        self.waitUntil = 0 # time() + wait in seconds
-        self.waiting = False
-        
-        self.premium = False
-
-        self.ocr = None  # captcha reader instance
-        self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name__) # account handler instance
-        if self.account and not self.account.canUse(): self.account = None
-        if self.account:
-            self.req = self.account.getAccountRequest(self)
-        else:
-            self.req = pyfile.m.core.requestFactory.getRequest(self.__name__)
-
-        self.log = logging.getLogger("log")
-
-        self.pyfile = pyfile
-        self.thread = None # holds thread in future
-
-        self.setup()
-
-    def __call__(self):
-        return self.__name__
-
-    def setup(self):
-        """ more init stuff if needed """
-        pass
-
-    def preprocessing(self, thread):
-        """ handles important things to do before starting """
-        self.thread = thread
-
-        if not self.account:
-            self.req.clearCookies()
-
-        self.pyfile.setStatus("starting")
-
-        return self.process(self.pyfile)
-
-    #----------------------------------------------------------------------
-    def process(self, pyfile):
-        """the 'main' method of every plugin"""
-        raise NotImplementedError
-    
-    def resetAccount(self):
-        self.account = None
-        self.req = self.core.requestFactory.getRequest(self.__name__)
-    
-    def checksum(self, local_file=None):
-        """
-        return codes:
-        0  - checksum ok
-        1  - checksum wrong
-        5  - can't get checksum
-        10 - not implemented
-        20 - unknown error
-        """
-        #@TODO checksum check hook
-
-        return (True, 10)
-
-
-    def setConf(self, option, value):
-        """ sets a config value """
-        self.config.setPlugin(self.__name__, option, value)
-
-    def removeConf(self, option):
-        """ removes a config value """
-        raise NotImplementedError
-
-    def getConf(self, option):
-        """ gets a config value """
-        return self.config.getPlugin(self.__name__, option)
-
-    def setConfig(self, option, value):
-      """ sets a config value """
-      self.setConf(option, value)
-      
-    def getConfig(self, option):
-      """ gets a config value """
-      return self.getConf(option)
-      
-      
-    def setWait(self, seconds, reconnect=False):
-        """ set the wait time to specified seconds """
-        if reconnect:
-            self.wantReconnect = True
-        self.pyfile.waitUntil = time() + int(seconds)
-
-    def wait(self):
-        """ waits the time previously set """
-        self.waiting = True
-        self.pyfile.setStatus("waiting")
-        
-        while self.pyfile.waitUntil > time():
-            self.thread.m.reconnecting.wait(2)
-            
-            if self.pyfile.abort: raise Abort
-            if self.thread.m.reconnecting.isSet():
-                self.waiting = False
-                self.wantReconnect = False
-                raise Reconnect
-        
-        self.waiting = False
-        self.pyfile.setStatus("starting")
-
-    def fail(self, reason):
-        """ fail and give reason """
-        raise Fail(reason)
-
-    def offline(self):
-        """ fail and indicate file is offline """
-        raise Fail("offline")
-
-    def retry(self):
-        """ begin again from the beginning """
-        raise Retry
-
-    def decryptCaptcha(self, url, get={}, post={}, cookies=False, forceUser=False):
-        """ loads the catpcha and decrypt it or ask the user for input """
-        
-        content = self.load(url, get=get, post=post, cookies=cookies)
-        
-        temp = NamedTemporaryFile()
-        temp = open(join("tmp","tmpCaptcha_%s" % self.__name__ ), "wb")
-        
-        temp.write(content)
-        temp.close()
-        
-        
-        Ocr = self.core.pluginManager.getCaptchaPlugin(self.__name__)
-        if Ocr and not forceUser:
-            sleep(randint(3000, 5000) / 1000.0)
-            if self.pyfile.abort: raise Abort
-            
-            ocr = Ocr()
-            result = ocr.get_captcha(temp.name)
-        else:
-            captchaManager = self.core.captchaManager
-            mime = guess_type(temp.name)
-            task = captchaManager.newTask(self)
-            task.setCaptcha(content, mime[0])
-            task.setWaiting()
-            while not task.getStatus() == "done":
-                if not self.core.isClientConnected():
-                    task.removeTask()
-                    #temp.unlink(temp.name)
-                    self.fail(_("No Client connected for captcha decrypting."))
-                if self.pyfile.abort: raise Abort
-                sleep(1)
-            result = task.getResult()
-            task.removeTask()
-
-        if not self.core.debug:
-          try:
-            remove(temp.name)
-          except:
-            pass
-        
-        return result
-
-
-    def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False):
-        """ returns the content loaded """
-        if self.pyfile.abort: raise Abort
-        
-        return self.req.load(url, get, post, ref, cookies, just_header)
-
-    def download(self, url, get={}, post={}, ref=True, cookies=True):
-        """ downloads the url content to disk """
-
-        self.pyfile.setStatus("downloading")
-
-        download_folder = self.config['general']['download_folder']
-        
-        location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding().replace(":", ""))) # remove : for win compability
-
-        if not exists(location): 
-            makedirs(location)
-
-        newname = self.req.download(url, self.pyfile.name, location, get, post, ref, cookies)
-
-        self.pyfile.size = self.req.dl_size
-
-        if newname:
-            self.pyfile.name = newname
diff --git a/module/plugins/ReCaptcha.py b/module/plugins/ReCaptcha.py
deleted file mode 100644
index d29530a64..000000000
--- a/module/plugins/ReCaptcha.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import re
-
-class ReCaptcha():
-    def __init__(self, plugin):
-        self.plugin = plugin
-    
-    def challenge(self, id):
-        js = self.plugin.req.load("http://api.recaptcha.net/challenge", get={"k":id}, cookies=True)
-        
-        try:
-            challenge = re.search("challenge : '(.*?)',", js).group(1)
-            server = re.search("server : '(.*?)',", js).group(1)
-        except:
-            self.plugin.fail("recaptcha error")
-        result = self.plugin.decryptCaptcha("%simage"%server, get={"c":challenge}, cookies=True)
-        
-        return challenge, result
diff --git a/module/plugins/__init__.py b/module/plugins/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/__init__.py
+++ /dev/null
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
deleted file mode 100644
index 044f647be..000000000
--- a/module/plugins/accounts/DepositfilesCom.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-import re
-from time import strptime, mktime
-import hashlib
-
-class DepositfilesCom(Account):
-    __name__ = "DepositfilesCom"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """depositfiles.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        
-        src = req.load("http://depositfiles.com/de/gold/")
-        validuntil = re.search("noch den Gold-Zugriff: <b>(.*?)</b></div>", src).group(1)
-        
-        validuntil = int(mktime(strptime(validuntil, "%Y-%m-%d %H:%M:%S")))
-        
-        out = Account.getAccountInfo(self, user)
-        
-        tmp = {"validuntil":validuntil, "trafficleft":-1}
-        out.update(tmp)
-        return out
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        req.load("http://depositfiles.com/de/gold/payment.php")
-        req.load("http://depositfiles.com/de/login.php", get={"return": "/de/gold/payment.php"}, post={"login": user, "password": data["password"]})
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
deleted file mode 100644
index a9b222a6a..000000000
--- a/module/plugins/accounts/FileserveCom.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-import re
-from time import strptime, mktime
-import hashlib
-
-class FileserveCom(Account):
-    __name__ = "FileserveCom"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """fileserve.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        try:
-            req = self.core.requestFactory.getRequest(self.__name__, user)
-            
-            src = req.load("http://fileserve.com/dashboard.php", cookies=True)
-            
-            out = Account.getAccountInfo(self, user)
-            
-            m = re.search(r"<td><h4>Premium Until</h4></th> <td><h5>(.*?) E(.)T</h5></td>", src)
-            if m:
-                zone = -5 if m.group(2) == "S" else -4
-                validuntil = int(mktime(strptime(m.group(1), "%d %B %Y"))) + 24*3600 + (zone*3600)
-                tmp = {"validuntil":validuntil, "trafficleft":-1}
-            else:
-                tmp = {"trafficleft":-1}
-            out.update(tmp)
-            return out
-        except:
-            return Account.getAccountInfo(user)
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        req.load("http://fileserve.com/login.php",
-                post={"loginUserName": user, "loginUserPassword": data["password"],
-                      "autoLogin": "on", "loginFormSubmit": "Login"}, cookies=True)
-        req.load("http://fileserve.com/dashboard.php", cookies=True)
-        
diff --git a/module/plugins/accounts/HotfileCom.py b/module/plugins/accounts/HotfileCom.py
deleted file mode 100644
index e6e8ba517..000000000
--- a/module/plugins/accounts/HotfileCom.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-import re
-from time import strptime, mktime
-import hashlib
-
-class HotfileCom(Account):
-    __name__ = "HotfileCom"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """hotfile.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        try:
-            req = self.core.requestFactory.getRequest(self.__name__, user)
-            
-            resp = self.apiCall("getuserinfo", user=user)
-            if resp.startswith("."):
-                self.core.debug("HotfileCom API Error: %s" % resp)
-                raise Exception
-            info = {}
-            for p in resp.split("&"):
-                key, value = p.split("=")
-                info[key] = value
-                
-            info["premium_until"] = info["premium_until"].replace("T"," ")
-            zone = info["premium_until"][19:]
-            info["premium_until"] = info["premium_until"][:19]
-            zone = int(zone[:3])
-            
-            validuntil = int(mktime(strptime(info["premium_until"], "%Y-%m-%d %H:%M:%S"))) + (zone*3600)
-            out = Account.getAccountInfo(self, user)
-            tmp = {"validuntil":validuntil, "trafficleft":-1}
-            out.update(tmp)
-            return out
-        except:
-            return Account.getAccountInfo(user)
-    
-    def apiCall(self, method, post={}, user=None):
-        if user:
-            data = None
-            for account in self.accounts.items():
-                if account[0] == user:
-                    data = account[1]
-        else:
-            user, data = self.accounts.items()[0]
-        
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-    
-        digest = req.load("http://api.hotfile.com/", post={"action":"getdigest"})
-        h = hashlib.md5()
-        h.update(data["password"])
-        hp = h.hexdigest()
-        h = hashlib.md5()
-        h.update(hp)
-        h.update(digest)
-        pwhash = h.hexdigest()
-        
-        post.update({"action": method})
-        post.update({"username":user, "passwordmd5dig":pwhash, "digest":digest})
-        return req.load("http://api.hotfile.com/", post=post)
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        cj = self.core.requestFactory.getCookieJar(self.__name__, user)
-        cj.setCookie("hotfile.com", "lang", "en")
-        req.load("http://hotfile.com/", cookies=True)
-        req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, cookies=True)
diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py
deleted file mode 100644
index 5743c7835..000000000
--- a/module/plugins/accounts/NetloadIn.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-
-class NetloadIn(Account):
-    __name__ = "NetloadIn"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """netload.in account plugin"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        req.load("http://netload.in/index.php", None, { "txtuser" : user, "txtpass" : data['password'], "txtcheck" : "login", "txtlogin" : ""}, cookies=True)
-            
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
deleted file mode 100644
index c9766cd57..000000000
--- a/module/plugins/accounts/RapidshareCom.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-
-class RapidshareCom(Account):
-    __name__ = "RapidshareCom"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """Rapidshare.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        try:
-            data = None
-            for account in self.accounts.items():
-                if account[0] == user:
-                    data = account[1]
-            if not data:
-                raise Exception
-            req = self.core.requestFactory.getRequest(self.__name__, user)
-            api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-            api_param_prem = {"sub": "getaccountdetails_v1", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
-            src = req.load(api_url_base, cookies=False, get=api_param_prem)
-            if src.startswith("ERROR"):
-                raise Exception
-            fields = src.split("\n")
-            info = {}
-            for t in fields:
-                if not t.strip():
-                    continue
-                k, v = t.split("=")
-                info[k] = v
-                
-            out = Account.getAccountInfo(self, user)
-            restkb = int(info["tskb"])
-            maxtraffic = int(info["rapids"])/14 * (5*1024*1024) + restkb
-            tmp = {"validuntil":int(info["billeduntil"]), "trafficleft":maxtraffic if int(info["autorefill"]) else restkb, "maxtraffic":maxtraffic}
-            out.update(tmp)
-            return out
-        except:
-            return Account.getAccountInfo(self, user)
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param_prem = {"sub": "getaccountdetails_v1", "type": "prem", "login": user, "password": data["password"], "withcookie": 1}
-        src = req.load(api_url_base, cookies=False, get=api_param_prem)
-        if src.startswith("ERROR"):
-            return
-        fields = src.split("\n")
-        info = {}
-        for t in fields:
-            if not t.strip():
-                continue
-            k, v = t.split("=")
-            info[k] = v
-        cj = self.core.requestFactory.getCookieJar(self.__name__, user)
-        cj.setCookie("rapidshare.com", "enc", info["cookie"])
-            
-
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
deleted file mode 100644
index 611fa759d..000000000
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-from time import strptime, mktime
-import re
-
-class ShareonlineBiz(Account):
-    __name__ = "ShareonlineBiz"
-    __version__ = "0.2"
-    __type__ = "account"
-    __description__ = """share-online.biz account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        src = req.load("https://www.share-online.biz/alpha/user/profile")
-        
-        validuntil = re.search(r"Account gültig bis:.*?<span class='.*?'>(.*?)</span>", src).group(1)
-        validuntil = int(mktime(strptime(validuntil, "%m/%d/%Y, %I:%M:%S %p")))
-        
-        out = Account.getAccountInfo(self, user)
-        tmp = {"validuntil":validuntil, "trafficleft":-1}
-        out.update(tmp)
-        return out
-    
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        post_vars = {"user": user,
-                        "pass": data["password"],
-                        "l_rememberme":"1"}
-        req.lastURL = "http://www.share-online.biz/alpha/"
-        req.load("https://www.share-online.biz/alpha/user/login", cookies=True, post=post_vars)
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
deleted file mode 100644
index 1311ee809..000000000
--- a/module/plugins/accounts/UploadedTo.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Account import Account
-import re
-from time import strptime, mktime
-
-class UploadedTo(Account):
-    __name__ = "UploadedTo"
-    __version__ = "0.1"
-    __type__ = "account"
-    __description__ = """ul.to account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def getAccountInfo(self, user):
-        try:
-            data = None
-            for account in self.accounts.items():
-                if account[0] == user:
-                    data = account[1]
-            if not data:
-                raise Exception
-            req = self.core.requestFactory.getRequest(self.__name__, user)
-            html = req.load("http://uploaded.to/", cookies=True)
-            raw_traffic = re.search(r"Traffic left: </span><span class=.*?>(.*?)</span>", html).group(1)
-            raw_valid = re.search(r"Valid until: </span> <span class=.*?>(.*?)</span>", html).group(1)
-            traffic = int(self.parseTraffic(raw_traffic))
-            validuntil = int(mktime(strptime(raw_valid.strip(), "%d-%m-%Y %H:%M")))
-            out = Account.getAccountInfo(self, user)
-            tmp =  {"validuntil":validuntil, "trafficleft":traffic, "maxtraffic":100*1024*1024}
-            out.update(tmp)
-            return out
-        except:
-            return Account.getAccountInfo(self, user)
-        
-    def login(self, user, data):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        req.load("http://uploaded.to/login", None, { "email" : user, "password" : data["password"]}, cookies=True)
diff --git a/module/plugins/accounts/__init__.py b/module/plugins/accounts/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/accounts/__init__.py
+++ /dev/null
diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py
deleted file mode 100644
index d31742eb5..000000000
--- a/module/plugins/captcha/GigasizeCom.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from captcha import OCR
-
-class GigasizeCom(OCR):
-    def __init__(self):
-        OCR.__init__(self)
-        
-    def get_captcha(self, image):
-        self.load_image(image)
-        self.threshold(2.8)
-        self.run_tesser(True, False, False, True)
-        return self.result_captcha
-
-if __name__ == '__main__':
-    ocr = GigasizeCom()
-    import urllib
-    urllib.urlretrieve('http://www.gigasize.com/randomImage.php', "gigasize_tmp.jpg")
-    
-    print ocr.get_captcha('gigasize_tmp.jpg')
diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py
deleted file mode 100644
index 3ad7b265a..000000000
--- a/module/plugins/captcha/LinksaveIn.py
+++ /dev/null
@@ -1,147 +0,0 @@
-from captcha import OCR
-import Image
-from os import sep
-from os.path import dirname
-from os.path import abspath
-from glob import glob
-
-
-class LinksaveIn(OCR):
-    __name__ = "LinksaveIn"
-    def __init__(self):
-        OCR.__init__(self)
-        self.data_dir = dirname(abspath(__file__)) + sep + "LinksaveIn" + sep
-    
-    def load_image(self, image):
-        im = Image.open(image)
-        frame_nr = 0
-
-        lut = im.resize((256, 1))
-        lut.putdata(range(256))
-        lut = list(lut.convert("RGB").getdata())
-
-        new = Image.new("RGB", im.size)
-        npix = new.load()
-        while True:
-            try:
-                im.seek(frame_nr)
-            except EOFError:
-                break
-            frame = im.copy()
-            pix = frame.load()
-            for x in range(frame.size[0]):
-                for y in range(frame.size[1]):
-                    if lut[pix[x, y]] != (0,0,0):
-                        npix[x, y] = lut[pix[x, y]]
-            frame_nr += 1
-        new.save(self.data_dir+"unblacked.png")
-        self.image = new.copy()
-        self.pixels = self.image.load()
-        self.result_captcha = ''
-    
-    def get_bg(self):
-        stat = {}
-        cstat = {}
-        img = self.image.convert("P")
-        for bgpath in glob(self.data_dir+"bg/*.gif"):
-            stat[bgpath] = 0
-            bg = Image.open(bgpath)
-            
-            bglut = bg.resize((256, 1))
-            bglut.putdata(range(256))
-            bglut = list(bglut.convert("RGB").getdata())
-            
-            lut = img.resize((256, 1))
-            lut.putdata(range(256))
-            lut = list(lut.convert("RGB").getdata())
-            
-            bgpix = bg.load()
-            pix = img.load()
-            for x in range(bg.size[0]):
-                for y in range(bg.size[1]):
-                    rgb_bg = bglut[bgpix[x, y]]
-                    rgb_c = lut[pix[x, y]]
-                    try:
-                        cstat[rgb_c] += 1
-                    except:
-                        cstat[rgb_c] = 1
-                    if rgb_bg == rgb_c:
-                        stat[bgpath] += 1
-        max_p = 0
-        bg = ""
-        for bgpath, value in stat.items():
-            if max_p < value:
-                bg = bgpath
-                max_p = value
-        return bg
-    
-    def substract_bg(self, bgpath):
-        bg = Image.open(bgpath)
-        img = self.image.convert("P")
-        
-        bglut = bg.resize((256, 1))
-        bglut.putdata(range(256))
-        bglut = list(bglut.convert("RGB").getdata())
-        
-        lut = img.resize((256, 1))
-        lut.putdata(range(256))
-        lut = list(lut.convert("RGB").getdata())
-        
-        bgpix = bg.load()
-        pix = img.load()
-        orgpix = self.image.load()
-        for x in range(bg.size[0]):
-            for y in range(bg.size[1]):
-                rgb_bg = bglut[bgpix[x, y]]
-                rgb_c = lut[pix[x, y]]
-                if rgb_c == rgb_bg:
-                    orgpix[x, y] = (255,255,255)
-    
-    def eval_black_white(self):
-        new = Image.new("RGB", (140, 75))
-        pix = new.load()
-        orgpix = self.image.load()
-        thresh = 4
-        for x in range(new.size[0]):
-            for y in range(new.size[1]):
-                rgb = orgpix[x, y]
-                r, g, b = rgb
-                pix[x, y] = (255,255,255)
-                if r > max(b, g)+thresh:
-                    pix[x, y] = (0,0,0)
-                if g < min(r, b):
-                    pix[x, y] = (0,0,0)
-                if g > max(r, b)+thresh:
-                    pix[x, y] = (0,0,0)
-                if b > max(r, g)+thresh:
-                    pix[x, y] = (0,0,0)
-        self.image = new
-        self.pixels = self.image.load()
-    
-    def get_captcha(self, image):
-        self.load_image(image)
-        bg = self.get_bg()
-        self.substract_bg(bg)
-        self.eval_black_white()
-        self.to_greyscale()
-        self.image.save(self.data_dir+"cleaned_pass1.png")
-        self.clean(4)
-        self.clean(4)
-        self.image.save(self.data_dir+"cleaned_pass2.png")
-        letters = self.split_captcha_letters()
-        final = ""
-        for n, letter in enumerate(letters):
-            self.image = letter
-            self.image.save(ocr.data_dir+"letter%d.png" % n)
-            self.run_tesser(True, True, False, False)
-            final += self.result_captcha
-        
-        return final
-
-if __name__ == '__main__':
-    import urllib
-    ocr = LinksaveIn()
-    testurl = "http://linksave.in/captcha/cap.php?hsh=2229185&code=ZzHdhl3UffV3lXTH5U4b7nShXj%2Bwma1vyoNBcbc6lcc%3D"
-    urllib.urlretrieve(testurl, ocr.data_dir+"captcha.gif")
-    
-    print ocr.get_captcha(ocr.data_dir+'captcha.gif')
diff --git a/module/plugins/captcha/MegauploadCom.py b/module/plugins/captcha/MegauploadCom.py
deleted file mode 100644
index 469ee4094..000000000
--- a/module/plugins/captcha/MegauploadCom.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from captcha import OCR
-
-class MegauploadCom(OCR):
-    __name__ = "MegauploadCom"
-    def __init__(self):
-        OCR.__init__(self)
-        
-    def get_captcha(self, image):
-        self.load_image(image)
-        self.run_tesser(True, True, False, True)
-        return self.result_captcha
-
-if __name__ == '__main__':
-    ocr = MegauploadCom()
diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py
deleted file mode 100644
index 7f2e6a8d1..000000000
--- a/module/plugins/captcha/NetloadIn.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from captcha import OCR
-
-class NetloadIn(OCR):
-    __name__ = "NetloadIn"
-    def __init__(self):
-        OCR.__init__(self)
-
-    def get_captcha(self, image):
-        self.load_image(image)
-        self.to_greyscale()
-        self.clean(3)
-        self.clean(3)
-        self.run_tesser(True, True, False, False)
-        
-        self.result_captcha = self.result_captcha.replace(" ", "")[:4] # cut to 4 numbers
-        
-        return self.result_captcha
-
-if __name__ == '__main__':
-    import urllib
-    ocr = NetloadIn()
-    urllib.urlretrieve("http://netload.in/share/includes/captcha.php", "captcha.png")
-
-    print  ocr.get_captcha('captcha.png')
diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py
deleted file mode 100644
index b07fb9b0f..000000000
--- a/module/plugins/captcha/ShareonlineBiz.py
+++ /dev/null
@@ -1,53 +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/>.
-#
-###
-from captcha import OCR
-
-class ShareonlineBiz(OCR):
-    __name__ = "ShareonlineBiz"
-    
-    def __init__(self):
-        OCR.__init__(self)
-        
-    def get_captcha(self, image): 
-        self.load_image(image)
-        self.to_greyscale()
-        self.image = self.image.resize((160, 50))
-        self.pixels = self.image.load()
-        self.threshold(1.85)
-        #self.eval_black_white(240)
-        #self.derotate_by_average()
-
-        letters = self.split_captcha_letters()
-        
-        final = ""
-        for letter in letters:
-            self.image = letter
-            self.run_tesser(True, True, False, False)
-            final += self.result_captcha
-
-        return final
-
-        #tesseract at 60%
-
-if __name__ == '__main__':
-    import urllib
-    ocr = ShareonlineBiz()
-    urllib.urlretrieve("http://www.share-online.biz/captcha.php", "captcha.jpeg")
-    print  ocr.get_captcha('captcha.jpeg')
diff --git a/module/plugins/captcha/__init__.py b/module/plugins/captcha/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/captcha/__init__.py
+++ /dev/null
diff --git a/module/plugins/captcha/captcha.py b/module/plugins/captcha/captcha.py
deleted file mode 100644
index d8c2aa38d..000000000
--- a/module/plugins/captcha/captcha.py
+++ /dev/null
@@ -1,313 +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/>.
-#
-###
-from __future__ import with_statement
-import os
-from os.path import join
-from os.path import abspath
-import logging
-import subprocess
-#import tempfile
-import threading
-
-import Image
-import TiffImagePlugin
-import PngImagePlugin
-import GifImagePlugin
-import JpegImagePlugin
-
-from module.web.ServerThread import Output
-
-class OCR(object):
-    
-    __name__ = "OCR"
-    
-    def __init__(self):
-        self.logger = logging.getLogger("log")
-
-    def load_image(self, image):
-        self.image = Image.open(image)
-        self.pixels = self.image.load()
-        self.result_captcha = ''
-
-    def unload(self):
-        """delete all tmp images"""
-        pass
-
-    def threshold(self, value):
-        self.image = self.image.point(lambda a: a * value + 10)
-
-    def run(self, command, inputdata=None):
-        """Run a command"""
-            
-        popen = subprocess.Popen(command, bufsize = -1, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        popen.wait()
-
-    def run_tesser(self, subset=False, digits=True, lowercase=True, uppercase=True):
-        #self.logger.debug("create tmp tif")
-        
-        
-        #tmp = tempfile.NamedTemporaryFile(suffix=".tif")
-        tmp = open(join("tmp", "tmpTif_%s.tif" % self.__name__), "wb")
-        tmp.close()
-        #self.logger.debug("create tmp txt")
-        #tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt")
-        tmpTxt = open(join("tmp", "tmpTxt_%s.txt" % self.__name__), "wb")
-        tmpTxt.close()
-        
-        self.logger.debug("save tiff")
-        self.image.save(tmp.name, 'TIFF')
-
-        if os.name == "nt":
-            tessparams = [join(pypath,"tesseract","tesseract.exe")]
-        else:
-            tessparams = ['tesseract']
-        
-        tessparams.extend( [abspath(tmp.name), abspath(tmpTxt.name).replace(".txt", "")] )
-
-        if subset and (digits or lowercase or uppercase):
-            #self.logger.debug("create temp subset config")
-            #tmpSub = tempfile.NamedTemporaryFile(suffix=".subset")
-            tmpSub = open(join("tmp", "tmpSub_%s.subset" % self.__name__), "wb")
-            tmpSub.write("tessedit_char_whitelist ")
-            if digits:
-                tmpSub.write("0123456789")
-            if lowercase:
-                tmpSub.write("abcdefghijklmnopqrstuvwxyz")
-            if uppercase:
-                tmpSub.write("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-            tmpSub.write("\n")
-            tessparams.append("nobatch")
-            tessparams.append(abspath(tmpSub.name))
-            tmpSub.close()
-            
-        self.logger.debug("run tesseract")
-        self.run(tessparams)
-        self.logger.debug("read txt")
-
-        with open(tmpTxt.name, 'r') as f:
-            self.result_captcha = f.read().replace("\n", "")
-
-        self.logger.debug(self.result_captcha)
-        
-        try:
-            os.remove(tmp.name)
-            os.remove(tmpTxt.name)
-            if subset and (digits or lowercase or uppercase):
-                os.remove(tmpSub.name)
-        except:
-            pass
-        
-    def get_captcha(self):
-        raise NotImplementedError
-
-    def to_greyscale(self):
-        if self.image.mode != 'L':
-            self.image = self.image.convert('L')
-
-        self.pixels = self.image.load()
-
-    def eval_black_white(self, limit):
-        self.pixels = self.image.load()
-        w, h = self.image.size
-        for x in xrange(w):
-            for y in xrange(h):
-                if self.pixels[x, y] > limit:
-                    self.pixels[x, y] = 255
-                else:
-                    self.pixels[x, y] = 0
-
-    def clean(self, allowed):
-        pixels = self.pixels
-
-        w, h = self.image.size
-
-        for x in xrange(w):
-            for y in xrange(h):
-                if pixels[x, y] == 255: continue
-                # no point in processing white pixels since we only want to remove black pixel
-                count = 0
-
-                try:
-                    if pixels[x-1, y-1] != 255: count += 1
-                    if pixels[x-1, y] != 255: count += 1
-                    if pixels[x-1, y + 1] != 255: count += 1
-                    if pixels[x, y + 1] != 255: count += 1
-                    if pixels[x + 1, y + 1] != 255: count += 1
-                    if pixels[x + 1, y] != 255: count += 1
-                    if pixels[x + 1, y-1] != 255: count += 1
-                    if pixels[x, y-1] != 255: count += 1
-                except:
-                    pass
-
-        # not enough neighbors are dark pixels so mark this pixel
-            # to be changed to white
-                if count < allowed:
-                    pixels[x, y] = 1
-
-            # second pass: this time set all 1's to 255 (white)
-        for x in xrange(w):
-            for y in xrange(h):
-                if pixels[x, y] == 1: pixels[x, y] = 255
-
-        self.pixels = pixels
-
-    def derotate_by_average(self):
-        """rotate by checking each angle and guess most suitable"""
-
-        w, h = self.image.size
-        pixels = self.pixels
-
-        for x in xrange(w):
-            for y in xrange(h):
-                if pixels[x, y] == 0:
-                    pixels[x, y] = 155
-
-        highest = {}
-        counts = {}
-
-        for angle in range(-45, 45):
-
-            tmpimage = self.image.rotate(angle)
-
-            pixels = tmpimage.load()
-
-            w, h = self.image.size
-
-            for x in xrange(w):
-                for y in xrange(h):
-                    if pixels[x, y] == 0:
-                        pixels[x, y] = 255
-
-
-            count = {}
-
-            for x in xrange(w):
-                count[x] = 0
-                for y in xrange(h):
-                    if pixels[x, y] == 155:
-                        count[x] += 1
-
-            sum = 0
-            cnt = 0
-
-            for x in count.values():
-                if x != 0:
-                    sum += x
-                    cnt += 1
-
-            avg = sum / cnt
-            counts[angle] = cnt
-            highest[angle] = 0
-            for x in count.values():
-                if x > highest[angle]:
-                    highest[angle] = x
-
-            highest[angle] = highest[angle] - avg
-
-        hkey = 0
-        hvalue = 0
-
-        for key, value in highest.iteritems():
-            if value > hvalue:
-                hkey = key
-                hvalue = value
-
-        self.image = self.image.rotate(hkey)
-        pixels = self.image.load()
-
-        for x in xrange(w):
-            for y in xrange(h):
-                if pixels[x, y] == 0:
-                    pixels[x, y] = 255
-
-                if pixels[x, y] == 155:
-                    pixels[x, y] = 0
-
-        self.pixels = pixels
-
-    def split_captcha_letters(self):
-        captcha = self.image
-        started = False
-        letters = []
-        width, height = captcha.size
-        bottomY, topY = 0, height
-        pixels = captcha.load()
-
-        for x in xrange(width):
-            black_pixel_in_col = False
-            for y in xrange(height):
-                if pixels[x, y] != 255:
-                    if started == False:
-                        started = True
-                        firstX = x
-                        lastX = x
-
-                    if y > bottomY: bottomY = y
-                    if y < topY: topY = y
-                    if x > lastX: lastX = x
-
-                    black_pixel_in_col = True
-
-            if black_pixel_in_col == False and started == True:
-                rect = (firstX, topY, lastX, bottomY)
-                new_captcha = captcha.crop(rect)
-
-                w, h = new_captcha.size
-                if w > 5 and h > 5:
-                    letters.append(new_captcha)
-
-                started = False
-                bottomY, topY = 0, height
-
-        return letters
-
-    def correct(self, values, var=None):
-
-        if var:
-            result = var
-        else:
-            result = self.result_captcha
-
-        for key, item in values.iteritems():
-
-            if key.__class__ == str:
-                result = result.replace(key, item)
-            else:
-                for expr in key:
-                    result = result.replace(expr, item)
-
-        if var:
-            return result
-        else:
-            self.result_captcha = result
-
-
-if __name__ == '__main__':
-    ocr = OCR()
-    ocr.load_image("B.jpg")
-    ocr.to_greyscale()
-    ocr.eval_black_white(140)
-    ocr.derotate_by_avergage()
-    ocr.run_gocr()
-    print "GOCR", ocr.result_captcha
-    ocr.run_tesser()
-    print "Tesseract", ocr.result_captcha
-    ocr.image.save("derotated.jpg")
-    
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
deleted file mode 100644
index 8b35589f3..000000000
--- a/module/plugins/container/CCF.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import urllib2
-
-from module.plugins.Container import Container
-from module.network.MultipartPostHandler import MultipartPostHandler
-
-from os import makedirs
-from os.path import exists, join
-
-class CCF(Container):
-    __name__ = "CCF"
-    __version__ = "0.2"
-    __pattern__ = r"(?!http://).*\.ccf"
-    __description__ = """CCF Container Convert Plugin"""
-    __author_name__ = ("Willnix")
-    __author_mail__ = ("Willnix@pyload.org")
-
-    def decrypt(self, pyfile):
-    
-        infile = pyfile.url.replace("\n", "")
-
-        opener = urllib2.build_opener(MultipartPostHandler)
-        params = {"src": "ccf",
-            "filename": "test.ccf",
-            "upload": open(infile, "rb")}
-        tempdlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', params).read()
-
-        download_folder = self.config['general']['download_folder']
-        location = download_folder #join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))
-        if not exists(location): 
-            makedirs(location)
-            
-        tempdlc_name = join(location, "tmp_%s.dlc" % pyfile.name)
-        tempdlc = open(tempdlc_name, "w")
-        tempdlc.write(re.search(r'<dlc>(.*)</dlc>', tempdlc_content, re.DOTALL).group(1))
-        tempdlc.close()
-
-        self.packages.append((tempdlc_name, [tempdlc_name], tempdlc_name))
-
diff --git a/module/plugins/container/DLC_25.pyc b/module/plugins/container/DLC_25.pyc
deleted file mode 100644
index 92c9e41ef..000000000
--- a/module/plugins/container/DLC_25.pyc
+++ /dev/null
diff --git a/module/plugins/container/DLC_26.pyc b/module/plugins/container/DLC_26.pyc
deleted file mode 100644
index 1d38fa1d9..000000000
--- a/module/plugins/container/DLC_26.pyc
+++ /dev/null
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
deleted file mode 100644
index c9e7a85a3..000000000
--- a/module/plugins/container/LinkList.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-
-from module.plugins.Container import Container
-
-class LinkList(Container):
-    __name__ = "LinkList"
-    __version__ = "0.1"
-    __pattern__ = r".*\.txt$"
-    __description__ = """Read Link Lists in txt format"""
-    __author_name__ = ("spoob", "jeix")
-    __author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com")
-
-
-    def decrypt(self, pyfile):
-                
-        txt = open(pyfile.url, 'r')
-        links = txt.readlines()
-        curPack = "Parsed links %s" % pyfile.name
-        
-        packages = {curPack:[],}
-        
-        for link in links:
-            link = link.strip()
-            if not link: continue
-            
-            if link.startswith(";"):
-                continue
-            if link.startswith("[") and link.endswith("]"):
-                # new package
-                curPack = link[1:-1]
-                packages[curPack] = []
-                continue
-            packages[curPack].append(link.replace("\n", ""))
-        txt.close()
-        
-        # empty packages fix
-
-        delete = []
-        
-        for key,value in packages.iteritems():
-            if not value:
-                delete.append(key)
-                
-        for key in delete:
-            del packages[key]
-
-        if not self.core.debug:
-            txt = open(linkList, 'w')
-            txt.write("")
-            txt.close()
-            #@TODO: maybe delete read txt file?
-        
-        for name, links in packages.iteritems():
-            self.packages.append((name, links, name))
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
deleted file mode 100644
index de2ff9048..000000000
--- a/module/plugins/container/RSDF.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import base64
-import binascii
-
-from module.plugins.Container import Container
-
-class RSDF(Container):
-    __name__ = "RSDF"
-    __version__ = "0.2"
-    __pattern__ = r"(?!http://).*\.rsdf"
-    __description__ = """RSDF Container Decode Plugin"""
-    __author_name__ = ("RaNaN", "spoob")
-    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
-
-    
-    def decrypt(self, pyfile):
-    
-        from Crypto.Cipher import AES
-
-        infile = pyfile.url.replace("\n", "")
-        Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000')
-
-        IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF')
-        IV_Cipher = AES.new(Key, AES.MODE_ECB)
-        IV = IV_Cipher.encrypt(IV)
-
-        obj = AES.new(Key, AES.MODE_CFB, IV)
-
-        rsdf = open(infile, 'r')
-
-        data = rsdf.read()
-        data = binascii.unhexlify(''.join(data.split()))
-        data = data.splitlines()
-
-        links = []
-        for link in data:
-            link = base64.b64decode(link)
-            link = obj.decrypt(link)
-            decryptedUrl = link.replace('CCF: ', '')
-            links.append(decryptedUrl)
-
-        rsdf.close()
-        
-        self.packages.append((pyfile.name, links, pyfile.name))
diff --git a/module/plugins/container/__init__.py b/module/plugins/container/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/container/__init__.py
+++ /dev/null
diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py
deleted file mode 100644
index 4dff06b21..000000000
--- a/module/plugins/crypter/CryptItCom.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import tempfile
-import re
-from os import remove
-import os.path
-
-from time import time
-from module.plugins.Crypter import Crypter
-
-
-class CryptItCom(Crypter):
-    __name__ = "CryptItCom"
-    __type__ = "container"
-    __pattern__ = r"http://[\w\.]*?crypt-it\.com/(s|e|d|c)/[\w]+"
-    __version__ = "0.1"
-    __description__ = """Crypt.It.com Container Plugin"""
-    __author_name__ = ("jeix")
-    __author_mail__ = ("jeix@hasnomail.de")
-        
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-    
-    def file_exists(self):
-        html = self.load(self.parent.url)
-        if r'<div class="folder">Was ist Crypt-It</div>' in html:
-            return False
-        return True        
-    
-    def proceed(self, url, location):
-        repl_pattern = r"/(s|e|d|c)/"
-        url = re.sub(repl_pattern, r"/d/", url)
-        
-        # download ccf
-        file_name = os.path.join(tempfile.gettempdir(), "pyload_tmp_%d.ccf"%time())
-        file_name = self.req.download(url, file_name)
-        if file_name == "redir.ccf":
-            remove(file_name)
-            raise Exception, _("File not found")
-
-        # and it to package
-        self.links = [file_name]
-        
\ No newline at end of file
diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
deleted file mode 100644
index a82fa5a1c..000000000
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import sleep
-
-from module.plugins.Crypter import Crypter
-
-class DDLMusicOrg(Crypter):
-    __name__ = "DDLMusicOrg"
-    __type__ = "container"
-    __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
-    __version__ = "0.3"
-    __description__ = """ddl-music.org Container Plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-
-    def setup(self):
-        self.multiDL = False
-    
-    def decrypt(self, pyfile):
-        html = self.req.load(self.pyfile.url, cookies=True)
-        
-        if re.search(r"Wer dies nicht rechnen kann", html) != None:
-            self.offline()
-        
-        math = re.search(r"(\d+) ([\+-]) (\d+) =\s+<inp", self.html)
-        id = re.search(r"name=\"id\" value=\"(\d+)\"", self.html).group(1)
-        linknr = re.search(r"name=\"linknr\" value=\"(\d+)\"", self.html).group(1)
-        
-        solve = ""
-        if math.group(2) == "+":
-            solve = int(math.group(1)) + int(math.group(3))
-        else:
-            solve = int(math.group(1)) - int(math.group(3))
-        sleep(3)
-        htmlwithlink = self.req.load(self.pyfile.url, cookies=True, post={"calc%s" % linknr:solve, "send%s" % linknr:"Send", "id":id, "linknr":linknr})
-        m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink)
-        if m:
-            self.packages.append((self.pyfile.package().name, [m.group(1)], self.pyfile.package().folder))
-        else:
-            self.retry()
diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
deleted file mode 100644
index cbcdd920c..000000000
--- a/module/plugins/crypter/FourChanOrg.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-
-class FourChanOrg(Crypter):
-    __name__ = "FourChanOrg"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?(img\.)?(zip\.)?4chan.org/\w+/(res/|imgboard\.html)"
-    __version__ = "0.1"
-    __description__ = """4chan.org Thread Download Plugin"""
-    __author_name__ = ("Spoob")
-    __author_mail__ = ("Spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        url = self.parent.url
-        html = self.req.load(url)
-        link_pattern = ""
-        temp_links = []
-        if "imagebord.html" in url:
-            link_pattern = '[<a href="(res/\d*\.html)">Reply</a>]'
-            temp_links = re.findall(link_pattern, html)
-            for link in re.findall(link_pattern, html):
-                temp_links.append(link)
-        else:
-            temp_links = re.findall('File : <a href="(http://(?:img\.)?(?:zip\.)?4chan\.org/\w{,3}/src/\d*\..{3})"', html)
-        self.links = temp_links
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
deleted file mode 100644
index a40e5104b..000000000
--- a/module/plugins/crypter/HoerbuchIn.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-
-class HoerbuchIn(Crypter):
-    __name__ = "HoerbuchIn"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?hoerbuch\.in/(blog\.php\?id=|download_(.*)\.html)"
-    __version__ = "0.4"
-    __description__ = """Hoerbuch.in Container Plugin"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url)
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        self.download_html()
-        if re.search(r"Download", self.html) != None:
-            return True
-        return False
-
-    def proceed(self, url, location):
-        temp_links = []
-        download_container = ("Download", "Mirror #1", "Mirror #2", "Mirror #3")
-        for container in download_container:
-            download_content = re.search("<BR><B>" + container + ":</B>(.*?)<BR><B>", self.html).group(1)
-            tmp = re.findall('<A HREF="http://www.hoerbuch.in/cj/out.php\?pct=\d+&url=(http://rs\.hoerbuch\.in/.+?)" TARGET="_blank">Part \d+</A>', download_content)
-            if tmp == []: continue
-            for link in tmp:
-                link_html = self.req.load(link, cookies=True)
-                temp_links.append(re.search('<FORM ACTION="(http://.*?)" METHOD="post"', link_html).group(1))
-            break
-
-        self.links = temp_links
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
deleted file mode 100644
index 168be2c27..000000000
--- a/module/plugins/crypter/LixIn.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-
-class LixIn(Crypter):
-    __name__ = "LixIn"
-    __type__ = "container"
-    __pattern__ = r"http://(www.)?lix.in/"
-    __version__ = "0.1"
-    __description__ = """Lix.in Container Plugin"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        url = self.parent.url
-        self.html = self.req.load(url)
-        new_link = ""
-        if not re.search("captcha_img.php", self.html):
-            new_link = re.search(r".*<iframe  name=\"ifram\" src=\"(.*)\" marginwidth=\"0\".*", self.req.load(url, post={"submit" : "continue"})).group(1)
-
-        self.links = [new_link]
diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py
deleted file mode 100644
index cd3a6fe4d..000000000
--- a/module/plugins/crypter/LofCc.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import sleep
-from os.path import join
-
-from module.plugins.Crypter import Crypter
-from module.plugins.ReCaptcha import ReCaptcha
-
-class LofCc(Crypter):
-    __name__ = "LofCc"
-    __type__ = "container"
-    __pattern__ = r"http://lof.cc/(.*)"
-    __version__ = "0.1"
-    __description__ = """lof.cc Plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-
-    def setup(self):
-        self.multiDL = False
-    
-    def decrypt(self, pyfile):
-        html = self.req.load(self.pyfile.url, cookies=True)
-        
-        m = re.search(r"src=\"http://api.recaptcha.net/challenge\?k=(.*?)\"></script>", html)
-        if not m:
-            self.offline()
-        
-        recaptcha = ReCaptcha(self)
-        challenge, code = recaptcha.challenge(m.group(1))
-        
-        resultHTML = self.req.load(self.pyfile.url, post={"recaptcha_challenge_field":challenge, "recaptcha_response_field":code}, cookies=True)
-        
-        if re.search("class=\"error\"", resultHTML):
-            self.retry()
-        
-        dlc = self.req.load(self.pyfile.url+"/dlc", cookies=True)
-        
-        name = re.search(self.__pattern__, self.pyfile.url).group(1)+".dlc"
-        
-        dlcFile = join(self.config["general"]["download_folder"], name)
-        f = open(dlcFile, "wb")
-        f.write(dlc)
-        f.close()
-        
-        self.packages.append((self.pyfile.package().name, [dlcFile], self.pyfile.package().folder))
diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py
deleted file mode 100644
index c77203187..000000000
--- a/module/plugins/crypter/OneKhDe.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.unescape import unescape
-from module.plugins.Crypter import Crypter
-
-class OneKhDe(Crypter):
-    __name__ = "OneKhDe"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?1kh.de/f/"
-    __version__ = "0.1"
-    __description__ = """1kh.de Container Plugin"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        url = self.parent.url
-        self.html = self.req.load(url)
-        temp_links = []
-        link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html)
-        for id in link_ids:
-            new_link = unescape(re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1))
-            temp_links.append(new_link)
-        self.links = temp_links
diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py
deleted file mode 100644
index 9ce211aa1..000000000
--- a/module/plugins/crypter/RSLayerCom.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.unescape import unescape
-from module.plugins.Crypter import Crypter
-
-class RSLayerCom(Crypter):
-    __name__ = "RSLayerCom"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?rs-layer.com/directory-"
-    __version__ = "0.1"
-    __description__ = """RS-Layer.com Container Plugin"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        url = self.parent.url
-        self.html = self.req.load(url)
-        temp_links = []  
-        link_ids = re.findall(r"onclick=\"getFile\(\'([0-9]{7}-.{8})\'\);changeBackgroundColor", self.html)
-        for id in link_ids:
-            new_link = unescape(re.search(r"name=\"file\" src=\"(.*)\"></frame>", self.req.load("http://rs-layer.com/link-" + id + ".html")).group(1))
-            print new_link
-            temp_links.append(new_link)
-        self.links = temp_links
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
deleted file mode 100644
index e043e65a9..000000000
--- a/module/plugins/crypter/RelinkUs.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import time
-
-from module.plugins.Crypter import Crypter
-
-class RelinkUs(Crypter):
-    __name__ = "RelinkUs"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?relink.us/(f|((view|go).php))"
-    __version__ = "1.0"
-    __description__ = """Relink.us Container Plugin"""
-    __author_name__ = ("Sleeper-", "spoob")
-    __author_mail__ = ("@nonymous", "spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        container_id = self.parent.url.split("/")[-1].split("id=")[-1]
-        url = "http://relink.us/view.php?id="+container_id
-        self.html = self.req.load(url, cookies=True)
-        temp_links = []
-
-        # Download Ad-Frames, otherwise we aren't enabled for download
-        iframes = re.findall("src=['\"]([^'\"]*)['\"](.*)></iframe>", self.html)
-        for iframe in iframes:
-            self.req.load("http://relink.us/"+iframe[0], cookies=True)
-
-        link_strings = re.findall(r"onclick=\"getFile\(\'([^)]*)\'\);changeBackgroundColor", self.html)
-
-        for link_string in link_strings:
-            self.req.lastURL = url
-
-            # Set Download File
-            framereq = self.req.load("http://relink.us/frame.php?"+link_string, cookies=True)
-
-            new_link = self.req.lastEffectiveURL
-
-            if re.match(r"http://(www\.)?relink.us/",new_link):
-                # Find iframe
-                new_link = re.search("src=['\"]([^'\"]*)['\"](.*)></iframe>", framereq).group(1)
-                # Wait some secs for relink.us server...
-                time.sleep(5)
-
-            temp_links.append(new_link)
-
-        self.links = temp_links
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
deleted file mode 100644
index 5a246075f..000000000
--- a/module/plugins/crypter/SecuredIn.py
+++ /dev/null
@@ -1,334 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-from module.BeautifulSoup import BeautifulSoup
-
-from math import ceil
-
-class SecuredIn(Crypter):
-    __name__ = "SecuredIn"
-    __type__ = "container"
-    __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html"
-    __version__ = "0.1"
-    __description__ = """secured.in Container Plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-        
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-    
-    def file_exists(self):
-        return True
-    
-    def proceed(self, url, location):
-        links = []
-        ajaxUrl = "http://secured.in/ajax-handler.php"
-        src = self.req.load(url, cookies=True)
-        soup = BeautifulSoup(src)
-        img = soup.find("img", attrs={"id":"captcha_img"})
-        for i in range(3):
-            form = soup.find("form", attrs={"id":"frm_captcha"})
-            captchaHash = form.find("input", attrs={"id":"captcha_hash"})["value"]
-            captchaUrl = "http://secured.in/%s" % img["src"]
-            captchaData = self.req.load(str(captchaUrl), cookies=True)
-            result = self.waitForCaptcha(captchaData, "jpg")
-            src = self.req.load(url, cookies=True, post={"captcha_key":result, "captcha_hash":captchaHash})
-            soup = BeautifulSoup(src)
-            img = soup.find("img", attrs={"id":"captcha_img"})
-            if not img:
-                files = soup.findAll("tr", attrs={"id":re.compile("file-\d+")})
-                dlIDPattern = re.compile("accessDownload\(\d, \d+, '(.*?)', \d\)")
-                cypher = self.Cypher()
-                for cfile in files:
-                    m = dlIDPattern.search(cfile["onclick"])
-                    if m:
-                        crypted = self.req.load(ajaxUrl, cookies=True, post={"cmd":"download", "download_id":m.group(1)})
-                        cypher.reset()
-                        link = cypher.cypher(crypted)
-                        links.append(link)
-                break
-        self.links = links
-
-    class Cypher():
-        def __init__(self):
-            self.reset()
-        
-        def reset(self):
-            self.iatwbfrd = [
-                0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2,
-                0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5,
-                0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1,
-                0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-                0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381,
-                0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
-                0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842,
-                0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-                0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f,
-                0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b,
-                0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, 0x68fb6faf,
-                0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-                0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8,
-                0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
-                0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98,
-                0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-                0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f,
-                0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
-                0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266,
-                0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-                0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2,
-                0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4,
-                0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d,
-                0xa99f8fa1, 0x08ba4799, 0x6e85076a
-            ]

-

-            self.olkemfjq = [
-                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf,
-                0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
-            ]

-

-            self.oqlaoymh = 0
-            self.oqmykrna = 0
-            self.pqmyzkid = 0
-            self.pldmjnde = 0
-            self.ldiwkqly = 0

-

-            self.plkodnyq = [
-                0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e,
-                0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
-                0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8,
-                0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-                0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9,
-                0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
-                0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4,
-                0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-                0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862,
-                0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224,
-                0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e,
-                0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-                0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4,
-                0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b,
-                0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a,
-                0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-                0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be,
-                0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
-                0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357,
-                0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-                0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c,
-                0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8,
-                0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132,
-                0xce77e25b, 0x578fdfe3, 0x3ac372e6
-            ]

-

-            self.pnjzokye = None

-

-            self.thdlpsmy = [
-                0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7,
-                0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785,
-                0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462,
-                0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-                0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7,
-                0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
-                0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548,
-                0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-                0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, 0x3b240b62,
-                0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
-                0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510,
-                0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-                0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc,
-                0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386,
-                0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346,
-                0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-                0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79,
-                0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
-                0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83,
-                0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-                0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1,
-                0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5,
-                0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234,
-                0x92638212, 0x670efa8e, 0x406000e0
-            ]

-

-            self.ybghjtik = [
-                0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c,
-                0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5,
-                0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584,
-                0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-                0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634,
-                0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
-                0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f,
-                0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-                0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, 0x81ac77d6,
-                0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1,
-                0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, 0xc6150eba,
-                0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-                0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad,
-                0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239,
-                0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32,
-                0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-                0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4,
-                0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
-                0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2,
-                0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-                0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7,
-                0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484,
-                0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7,
-                0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-            ]
-        
-        def cypher(self, code):

-            return self.lskdqpyr(code, "")

-

-        def lskdqpyr(self, alokfmth, yoaksjdh):
-            if self.pnjzokye == None or self.pnjzokye.lower() == yoaksjdh:

-                self.yoliukev(yoaksjdh)

-                self.pnjzokye = yoaksjdh

-            alokfmth = self.plaomtje(alokfmth)

-            ykaiumgp = ""

-            alokijuh = len(alokfmth)

-            lokimyas = self.ylomiktb(alokfmth[0:8])

-            palsiuzt = lokimyas[0]

-            tzghbndf = lokimyas[1]

-            awsedrft = [None, None]

-            for kiujzhqa in range(8, alokijuh, 8):

-                lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa+8])

-                awsedrft[0] = lokimyas[0]

-                awsedrft[1] = lokimyas[1]

-                lokimyas = self.okaqnhlp(lokimyas[0], lokimyas[1])

-                lokimyas[0] ^= palsiuzt

-                lokimyas[1] ^= tzghbndf

-                palsiuzt = awsedrft[0]

-                tzghbndf = awsedrft[1]

-                ykaiumgp += self.ykijmtkd(lokimyas)

-            return ykaiumgp

-

-        def okaqnhlp(self, lahgrnvp, trenlpys):
-            ujhaqylw = 0

-            for yalmhopr in range(17, 1, -1):

-                lahgrnvp ^= self.ldiwkqly[yalmhopr]

-                trenlpys ^= (self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff]

-                ujhaqylw = lahgrnvp

-                lahgrnvp = trenlpys

-                trenlpys = ujhaqylw

-            ujhaqylw = lahgrnvp

-            lahgrnvp = trenlpys

-            trenlpys = ujhaqylw

-            trenlpys ^= self.ldiwkqly[1]

-            lahgrnvp ^= self.ldiwkqly[0]

-            return [lahgrnvp, trenlpys]

-

-        def plaomtje(self, yoiumqpy):
-            qkailkzt = ""

-            xoliuzem = 0

-            lyomiujt = 0

-            yploemju = -1

-            for i in range(0, len(yoiumqpy)):

-                yploamzu = ord(yoiumqpy[i])

-                if ord('A') <= yploamzu and yploamzu <= ord('Z'):

-                    xoliuzem = ord(yoiumqpy[i]) - 65

-                elif ord('a') <= yploamzu and yploamzu <= ord('z'):

-                    xoliuzem = ord(yoiumqpy[i]) - 97 + 26

-                elif ord('0') <= yploamzu and yploamzu <= ord('9'):

-                    xoliuzem = ord(yoiumqpy[i]) - 48 + 52

-                elif yploamzu == ord('+'):

-                    xoliuzem = 62

-                elif yploamzu == ord('/'):

-                    xoliuzem = 63

-                else:

-                    continue

-                yploemju += 1

-

-                lxkdmizj = 0

-                switch = yploemju % 4

-                if switch == 0:

-                    lyomiujt = xoliuzem

-                    continue

-                elif switch == 1:

-                    lxkdmizj = lyomiujt << 2 | xoliuzem >> 4

-                    lyomiujt = xoliuzem & 0x0F

-                elif switch == 2:

-                    lxkdmizj = lyomiujt << 4 | xoliuzem >> 2

-                    lyomiujt = xoliuzem & 0x03

-                elif switch == 3:

-                    lxkdmizj = lyomiujt << 6 | xoliuzem >> 0

-                    lyomiujt = xoliuzem & 0x00

-                qkailkzt += unichr(lxkdmizj)

-            return qkailkzt

-

-        def qmyjuila(self, oqlamykt, yalkionj):
-            dolizmvw = 0

-            for iumswkya in range(0, 16):

-                oqlamykt ^= self.ldiwkqly[iumswkya]

-                yalkionj ^= (self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff]

-                dolizmvw = oqlamykt

-                oqlamykt = yalkionj

-                yalkionj = dolizmvw

-            dolizmvw = oqlamykt

-            oqlamykt = yalkionj

-            yalkionj = dolizmvw

-            yalkionj ^= self.ldiwkqly[16]

-            oqlamykt ^= self.ldiwkqly[17]

-            return [oqlamykt, yalkionj]

-

-        def ykijmtkd(self, yoirlkqw):
-            loipamyu = len(yoirlkqw)

-            yoirlkqwchar = []

-            for ymujtnbq in range(0, loipamyu):

-                yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff, yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff]

-                for c in yoir:

-                    yoirlkqwchar.append(chr(c))

-            return "".join(yoirlkqwchar)

-

-        def ylomiktb(self, lofiuzmq):
-            plokimqw = int(ceil(len(lofiuzmq) / 4.0))

-            lopkisdq = []
-            for ypoqlktz in range(0, plokimqw):

-                lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + (ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24))
-            return lopkisdq

-

-        def yoliukev(self, kaiumylq):
-            self.oqlaoymh = self.iatwbfrd

-            self.oqmykrna = self.ybghjtik

-            self.pqmyzkid = self.thdlpsmy

-            self.pldmjnde = self.plkodnyq

-

-            yaqpolft = [0 for i in range(len(kaiumylq))]

-

-            yaqwsedr = 0
-            btzqwsay = 0

-            while yaqwsedr < len(kaiumylq):

-                wlqoakmy = 0

-                for lopiuztr in range(0, 4):

-                    wlqoakmy = wlqoakmy << 8 | ord(kaiumylq[yaqwsedr % len(kaiumylq)])

-                    yaqwsedr += 1

-                yaqpolft[btzqwsay] = wlqoakmy
-                btzqwsay += 1

-            self.ldiwkqly = []

-            for btzqwsay in range(0, 18):

-                self.ldiwkqly.append(self.olkemfjq[btzqwsay])

-            yalopiuq = [0, 0]

-            for btzqwsay in range(0, 18, 2):

-                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

-                self.ldiwkqly[btzqwsay] = yalopiuq[0]

-                self.ldiwkqly[btzqwsay + 1] = yalopiuq[1]

-            for btzqwsay in range(0, 256, 2):

-                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

-                self.oqlaoymh[btzqwsay] = yalopiuq[0]

-                self.oqlaoymh[btzqwsay + 1] = yalopiuq[1]

-            for btzqwsay in range(0, 256, 2):

-                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

-                self.oqmykrna[btzqwsay] = yalopiuq[0]

-                self.oqmykrna[btzqwsay + 1] = yalopiuq[1]

-            for btzqwsay in range(0, 256, 2):

-                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

-                self.pqmyzkid[btzqwsay] = yalopiuq[0]

-                self.pqmyzkid[btzqwsay + 1] = yalopiuq[1]

-            for btzqwsay in range(0, 256, 2):

-                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

-                self.pldmjnde[btzqwsay] = yalopiuq[0]

-                self.pldmjnde[btzqwsay + 1] = yalopiuq[1]
-
diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py
deleted file mode 100644
index 6a7d976ab..000000000
--- a/module/plugins/crypter/SerienjunkiesOrg.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-from module.BeautifulSoup import BeautifulSoup
-from module.unescape import unescape
-from module.plugins.Plugin import Fail
-
-class SerienjunkiesOrg(Crypter):
-    __name__ = "SerienjunkiesOrg"
-    __type__ = "container"
-    __pattern__ = r"http://.*?serienjunkies.org/.*?"
-    __version__ = "0.2"
-    __config__ = [ ("preferredHoster", "str", "preferred hoster" , "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,RapidshareDe") ]
-    __description__ = """serienjunkies.org Container Plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-        
-    def setup(self):
-        self.hosterMap = {
-            "rc": "RapidshareCom",
-            "ff": "FilefactoryCom",
-            "ut": "UploadedTo",
-            "ul": "UploadedTo",
-            "nl": "NetloadIn",
-            "rs": "RapidshareDe"
-        }
-        self.hosterMapReverse = dict((v,k) for k, v in self.hosterMap.iteritems())
-    
-    def getSJSrc(self, url):
-        src = self.req.load(str(url))
-        if not src.find("Enter Serienjunkies") == -1:
-            src = self.req.load(str(url))
-        return src
-    
-    def handleSeason(self, url):
-        src = self.getSJSrc(url)
-        soup = BeautifulSoup(src)
-        post = soup.find("div", attrs={"class": "post-content"})
-        ps = post.findAll("p")
-        hosterPattern = re.compile("^http://download\.serienjunkies\.org/f-.*?/([rcfultns]{2})_.*?\.html$")
-        preferredHoster = self.getConfig("preferredHoster").split(",")
-        self.log.debug("Preferred hoster: %s" % ", ".join(preferredHoster))
-        groups = {}
-        gid = -1
-        seasonName = unescape(soup.find("a", attrs={"rel":"bookmark"}).string)
-        for p in ps:
-            if re.search("<strong>Dauer|<strong>Sprache|<strong>Format", str(p)):
-                var = p.findAll("strong")
-                opts = {"Dauer": "", "Uploader": "", "Sprache": "", "Format": "", u"Größe": ""}
-                for v in var:
-                    n = unescape(v.string)
-                    n = n.strip()
-                    n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
-                    if not opts.has_key(n.strip()):
-                        continue
-                    val = v.nextSibling
-                    if not val:
-                        continue
-                    print type(val), val
-                    val = val.encode("utf-8")
-                    val = unescape(val)
-                    val = val.replace("|", "").strip()
-                    val = val.strip()
-                    val = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', val)
-                    opts[n.strip()] = val.strip()
-                gid += 1
-                groups[gid] = {}
-                groups[gid]["ep"] = []
-                groups[gid]["opts"] = opts
-            elif re.search("<strong>Download:", str(p)):
-                links1 = p.findAll("a", attrs={"href": hosterPattern})
-                links2 = p.findAll("a", attrs={"href": re.compile("^http://serienjunkies.org/safe/.*$")})
-                for link in links1 + links2:
-                    groups[gid]["ep"].append(link["href"])
-        for g in groups.values():
-            links = []
-            linklist = g["ep"]
-            package = "%s (%s, %s)" % (seasonName, g["opts"]["Format"], g["opts"]["Sprache"])
-            linkgroups = {}
-            for link in linklist:
-                key = re.sub("^http://download\.serienjunkies\.org/f-.*?/(.{2})_", "", link)
-                if not linkgroups.has_key(key):
-                    linkgroups[key] = []
-                linkgroups[key].append(link)
-            for group in linkgroups.values():
-                for pHoster in preferredHoster:
-                    hmatch = False
-                    for link in group:
-                        m = hosterPattern.match(link)
-                        if m:
-                            if pHoster == self.hosterMap[m.group(1)]:
-                                links.append(link)
-                                hmatch = True
-                                break
-                    if hmatch:
-                        break
-            self.packages.append((package, links, package))
-    
-    def handleEpisode(self, url):
-        src = self.getSJSrc(url)
-        if not src.find("Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
-            self.fail(_("Downloadlimit reached"))
-        else:
-            soup = BeautifulSoup(src)
-            form = soup.find("form")
-            packageName = soup.find("h1", attrs={"class":"wrap"}).text
-            captchaTag = soup.find(attrs={"src":re.compile("^/secure/")})
-            if not captchaTag:
-                self.retry()
-            
-            captchaUrl = "http://download.serienjunkies.org"+captchaTag["src"]
-            result = self.decryptCaptcha(str(captchaUrl))
-            sinp = form.find(attrs={"name":"s"})
-            
-            self.req.lastUrl = url
-            sj = self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'action': "Download"})
-            
-            soup = BeautifulSoup(sj)
-            rawLinks = soup.findAll(attrs={"action": re.compile("^http://download.serienjunkies.org/")})
-            
-            if not len(rawLinks) > 0:
-                self.retry()
-            
-            links = []
-            for link in rawLinks:
-                frameUrl = link["action"].replace("/go-", "/frame/go-")
-                links.append(self.handleFrame(frameUrl))
-            self.packages.append((packageName, links, packageName))
-    
-    def handleOldStyleLink(self, url):
-        sj = self.req.load(str(url))
-        soup = BeautifulSoup(sj)
-        form = soup.find("form", attrs={"action":re.compile("^http://serienjunkies.org")})
-        captchaTag = form.find(attrs={"src":re.compile("^/safe/secure/")})
-        captchaUrl = "http://serienjunkies.org"+captchaTag["src"]
-        captchaData = self.req.load(str(captchaUrl))
-        result = self.waitForCaptcha(captchaData, "png")
-        url = form["action"]
-        sinp = form.find(attrs={"name":"s"})
-        
-        self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'dl.start': "Download"}, cookies=False, just_header=True)
-        decrypted = self.req.lastEffectiveURL
-        if decrypted == str(url):
-            self.retry()
-        self.packages.append((self.pyfile.package().name, [decrypted], self.pyfile.package().folder))
-    
-    def handleFrame(self, url):
-        self.req.load(str(url), cookies=False, just_header=True)
-        return self.req.lastEffectiveURL
-    
-    def decrypt(self, pyfile):
-        showPattern = re.compile("^http://serienjunkies.org/serie/(.*)/$")
-        seasonPattern = re.compile("^http://serienjunkies.org/.*?/(.*)/$")
-        episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html$")
-        oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$")
-        framePattern = re.compile("^http://download.serienjunkies.org/frame/go-.*?/$")
-        url = pyfile.url
-        if framePattern.match(url):
-            self.packages.append((self.pyfile.package().name, [self.handleFrame(url)], self.pyfile.package().name))
-        elif episodePattern.match(url):
-            self.handleEpisode(url)
-        elif oldStyleLink.match(url):
-            self.handleOldStyleLink(url)
-        elif showPattern.match(url):
-            pass
-        elif seasonPattern.match(url):
-            self.handleSeason(url)
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
deleted file mode 100644
index cf7a79e9b..000000000
--- a/module/plugins/crypter/StealthTo.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-
-class StealthTo(Crypter):
-    __name__ = "StealthTo"
-    __type__ = "container"
-    __pattern__ = r"http://(www\.)?stealth.to/folder/"
-    __version__ = "0.1"
-    __description__ = """Stealth.to Container Plugin"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        url = self.parent.url
-        self.html = self.req.load(url, cookies=True)
-        temp_links = []
-        ids = []
-        ats = [] # authenticity_token
-        inputs = re.findall(r"(<(input|form)[^>]+)", self.html)
-        for input in inputs:
-            if re.search(r"name=\"authenticity_token\"",input[0]):
-                ats.append(re.search(r"value=\"([^\"]+)", input[0]).group(1))
-            if re.search(r"name=\"id\"",input[0]):
-                ids.append(re.search(r"value=\"([^\"]+)", input[0]).group(1))
-                
-        for i in range(0, len(ids)):
-            self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": ("download_" + str(ids[i]))}, cookies=True)
-            new_html = self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": "1"}, cookies=True)
-            temp_links.append(re.search(r"iframe src=\"(.*)\" frameborder", new_html).group(1))
-
-        self.links = temp_links
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
deleted file mode 100644
index b48026654..000000000
--- a/module/plugins/crypter/YoutubeBatch.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-
-class YoutubeBatch(Crypter):
-    __name__ = "YoutubeBatch"
-    __type__ = "container"
-    __pattern__ = r"http://(?:www\.)?(?:de\.)?\youtube\.com/(?:user/.*?/user/(?P<g1>.{16})|(?:.*?feature=PlayList\&|view_play_list\?)p=(?P<g2>.{16}))"
-    __version__ = "0.9"
-    __description__ = """Youtube.com Channel Download Plugin"""
-    __author_name__ = ("RaNaN", "Spoob")
-    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
-
-    def setup(self):
-        compile_id = re.compile(self.__pattern__)
-        match_id = compile_id.match(self.pyfile.url)
-        self.playlist = match_id.group(match_id.lastgroup)
-
-    def file_exists(self):
-        if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/playlists/%s?v=2" % self.playlist):
-            return False
-        return True
-
-    def decrypt(self, pyfile):
-        if not self.file_exists():
-            self.offline()
-        url = "http://gdata.youtube.com/feeds/api/playlists/%s?v=2" % self.playlist           
-        rep = self.load(url)
-        new_links = []
-        new_links.extend(re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)&", rep))
-        self.packages.append((self.pyfile.package().name, new_links, self.pyfile.package().name))
diff --git a/module/plugins/crypter/__init__.py b/module/plugins/crypter/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/crypter/__init__.py
+++ /dev/null
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
deleted file mode 100644
index b9824b863..000000000
--- a/module/plugins/hooks/ClickAndLoad.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: RaNaN
-    @interface-version: 0.2
-"""
-
-import socket
-import thread
-
-from module.plugins.Hook import Hook
-
-class ClickAndLoad(Hook):
-    __name__ = "ClickAndLoad"
-    __version__ = "0.2"
-    __description__ = """Gives abillity to use jd's click and load. depends on webinterface"""
-    __config__ = [ ("activated", "bool", "Activated" , "True"),
-                   ("extern", "bool", "Allow external link adding", "False") ]
-    __author_name__ = ("RaNaN", "mkaay")
-    __author_mail__ = ("RaNaN@pyload.de", "mkaay@mkaay.de")
-    
-    def coreReady(self):
-    	self.port = int(self.core.config['webinterface']['port'])
-        if self.core.config['webinterface']['activated']:
-            try:
-		if self.getConfig("extern"):
-		    ip = "0.0.0.0"
-		else:
-		    ip = "127.0.0.1"
-		
-                thread.start_new_thread(proxy, (ip, self.port, 9666))
-            except:
-                self.logger.error("ClickAndLoad port already in use.")
-
-
-def proxy(*settings):
-    thread.start_new_thread(server, settings)
-    lock = thread.allocate_lock()
-    lock.acquire()
-    lock.acquire()
-
-def server(*settings):
-    try:
-        dock_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        dock_socket.bind((settings[0], settings[2]))
-        dock_socket.listen(5)
-        while True:
-            client_socket = dock_socket.accept()[0]
-            server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            server_socket.connect(("127.0.0.1", settings[1]))
-            thread.start_new_thread(forward, (client_socket, server_socket))
-            thread.start_new_thread(forward, (server_socket, client_socket))
-    except:
-        pass
-    finally:
-        thread.start_new_thread(server, settings)
-
-def forward(source, destination):
-    string = ' '
-    while string:
-        string = source.recv(1024)
-        if string:
-            destination.sendall(string)
-        else:
-            #source.shutdown(socket.SHUT_RD)
-            destination.shutdown(socket.SHUT_WR)
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
deleted file mode 100644
index a3ed2f168..000000000
--- a/module/plugins/hooks/ExternalScripts.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-
-    @author: mkaay
-    @interface-version: 0.1
-"""
-
-from module.plugins.Hook import Hook
-import subprocess
-from os import listdir, sep
-from os.path import join
-import sys
-
-class ExternalScripts(Hook):
-    __name__ = "ExternalScripts"
-    __version__ = "0.1"
-    __description__ = """run external scripts"""
-    __config__ = [ ("activated", "bool", "Activated" , "True") ]
-    __author_name__ = ("mkaay", "RaNaN", "spoob")
-    __author_mail__ = ("mkaay@mkaay.de", "ranan@pyload.org", "spoob@pyload.org")
-
-    def __init__(self, core):
-        Hook.__init__(self, core)
-        self.scripts = {}
-
-        script_folders = [join(pypath, 'scripts','download_preparing'),
-                          join(pypath,'scripts','download_finished'),
-                          join(pypath,'scripts','package_finished'),
-                          join(pypath,'scripts','before_reconnect'),
-                          join(pypath,'scripts','after_reconnect')]
-
-        folder = core.path("scripts")
-
-        self.core.check_file(folder, _("folders for scripts"), True)
-        self.core.check_file(script_folders, _("folders for scripts"), True)
-
-        f = lambda x: False if x.startswith("#") or x.endswith("~") else True
-        self.scripts = {}
-
-
-        self.scripts['download_preparing'] = filter(f, listdir(join(folder, 'download_preparing')))
-        self.scripts['download_finished'] = filter(f, listdir(join(folder, 'download_finished')))
-        self.scripts['package_finished'] = filter(f, listdir(join(folder, 'package_finished')))
-        self.scripts['before_reconnect'] = filter(f, listdir(join(folder, 'before_reconnect')))
-        self.scripts['after_reconnect'] = filter(f, listdir(join(folder, 'after_reconnect')))
-
-        for script_type, script_name in self.scripts.iteritems():
-            if script_name != []:
-                self.log.info("Installed %s Scripts: %s" % (script_type, ", ".join(script_name)))
-
-        #~ self.core.logger.info("Installed Scripts: %s" % str(self.scripts))
-
-        self.folder = folder
-
-    def downloadStarts(self, pyfile):
-        for script in self.scripts['download_preparing']:
-            try:
-                cmd = [join(self.folder, 'download_preparing', script), pyfile.pluginname, pyfile.url]
-                out = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-                out.wait()
-            except:
-                pass
-
-    def downloadFinished(self, pyfile):
-        for script in self.scripts['download_finished']:
-            try:
-                out = subprocess.Popen([join(self.folder, 'download_finished', script), pyfile.pluginname, pyfile.url, pyfile.name, join(self.core.config['general']['download_folder'], pyfile.package().folder, pyfile.name)], stdout=subprocess.PIPE)
-            except:
-                pass
-
-    def packageFinished(self, pypack):
-        for script in self.scripts['package_finished']:
-            folder = self.core.config['general']['download_folder']
-            if self.core.config.get("general", "folder_per_package"):
-                folder = join(folder.decode(sys.getfilesystemencoding()), pypack.folder.decode(sys.getfilesystemencoding()))
-
-            try:
-                out = subprocess.Popen([join(self.folder, 'package_finished', script), pypack.name, folder], stdout=subprocess.PIPE)
-            except:
-                pass
-
-    def beforeReconnecting(self, ip):
-        for script in self.scripts['before_reconnect']:
-            try:
-                out = subprocess.Popen([join(self.folder, 'before_reconnect', script), ip], stdout=subprocess.PIPE)
-                out.wait()
-            except:
-                pass
-
-    def afterReconnecting(self, ip):
-        for script in self.scripts['after_reconnect']:
-            try:
-                out = subprocess.Popen([join(self.folder, 'download_preparing', script), ip], stdout=subprocess.PIPE)
-            except:
-                pass
diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
deleted file mode 100644
index 6c6825954..000000000
--- a/module/plugins/hooks/HotFolder.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: RaNaN
-    @interface-version: 0.2
-"""
-
-from os import makedirs
-from os import listdir
-from os.path import exists
-from os.path import join
-from os.path import isfile
-from shutil import move
-import time
-
-from module.plugins.Hook import Hook
-
-class HotFolder(Hook):
-    __name__ = "HotFolder"
-    __version__ = "0.1"
-    __description__ = """observe folder and file for changes and add container and links"""
-    __config__ = [ ("activated", "bool", "Activated" , "False"),
-                   ("folder", "str", "Folder to observe", "container"),
-                   ("watch_file", "bool", "Observe link file", "False"),
-                   ("keep", "bool", "Keep added containers", "True"),
-                   ("file", "str", "Link file", "links.txt")]
-    __threaded__ = []
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.de")
-    
-    def setup(self):
-        self.interval = 10
-        
-    def periodical(self):
-        
-        if not exists(join(self.getConfig("folder"), "finished")):
-            makedirs(join(self.getConfig("folder"), "finished"))
-          
-        if self.getConfig("watch_file"):
-
-            if not exists(self.getConfig("file")):
-                f = open(self.getConfig("file"), "wb")
-                f.close()
-            
-            
-            f = open(self.getConfig("file"), "rb")
-            urls = [x.strip() for x in f.readlines() if x.strip()]
-            f.close()
-            if urls:
-                name = "%s @ %s" % (self.getConfig("file"), time.strftime("%H:%M:%S %d%b%Y") )
-                f = open(self.getConfig("file"), "wb")
-                f.close()
-            
-                self.core.server_methods.add_package(f.name, urls, 1)
-              
-        for f in listdir(self.getConfig("folder")):
-            path = join(self.getConfig("folder"), f)
-            
-            if not isfile(path) or f.endswith("~") or f.startswith("#"):
-                continue
-            
-            newpath = join(self.getConfig("folder"), "finished", f if self.getConfig("keep") else "tmp_"+f)
-            move(path, newpath)
-            
-            self.log.info(_("Added %s from HotFolder") % f)
-            self.core.server_methods.add_package(f, [newpath], 1)
-            
-        
\ No newline at end of file
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
deleted file mode 100644
index e7e1e6797..000000000
--- a/module/plugins/hooks/IRCInterface.py
+++ /dev/null
@@ -1,364 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: RaNaN
-    @author: jeix
-    @interface-version: 0.2
-"""
-
-from select import select
-import socket
-import sys
-from threading import Thread
-import time
-from time import sleep
-from traceback import print_exc
-
-from module.plugins.Hook import Hook
-
-class IRCInterface(Thread, Hook):
-    __name__ = "IRCInterface"
-    __version__ = "0.1"
-    __description__ = """connect to irc and let owner perform different tasks"""
-    __config__ = [("activated", "bool", "Activated", "False"),
-        ("host", "str", "IRC-Server Address", "Enter your server here!"),
-        ("port", "int", "IRC-Server Port", "6667"),
-        ("ident", "str", "Clients ident", "pyload-irc"),
-        ("realname", "str", "Realname", "pyload-irc"),
-        ("nick", "str", "Nickname the Client will take", "pyLoad-IRC"),
-        ("owner", "str", "Nickname the Client will accept commands from", "Enter your nick here!"),
-        ("info_file", "bool", "Inform about every file finished", "False"),
-        ("info_pack", "bool", "Inform about every package finished", "True")]
-    __author_name__ = ("Jeix")
-    __author_mail__ = ("Jeix@hasnomail.com")
-    
-    def __init__(self, core):
-        Thread.__init__(self)
-        Hook.__init__(self, core)
-        self.setDaemon(True)
-        self.sm = core.server_methods
-        
-    def coreReady(self):
-        self.new_package = {}
-        
-        self.abort = False
-        
-        self.links_added = 0
-        self.more = []
-
-        self.start()
-        
-        
-    def packageFinished(self, pypack):
-        try:
-            if self.getConfig("info_pack"):
-                self.response(_("Package finished: %s") % pypack.name)
-        except:
-            pass
-        
-    def downloadFinished(self, pyfile):
-        try:
-            if self.getConfig("info_file"):
-                self.response(_("Download finished: %s @ %s") % (pyfile.name, pyfile.pluginname) )
-        except:
-            pass
-             
-    def run(self):
-        # connect to IRC etc.
-        self.sock = socket.socket()
-        host = self.getConfig("host")
-        self.sock.connect((host, self.getConfig("port")))
-        nick = self.getConfig("nick")
-        self.sock.send("NICK %s\r\n" % nick)
-        self.sock.send("USER %s %s bla :%s\r\n" % (nick, host, nick))
-        for t in self.getConfig("owner").split():
-            if t.strip().startswith("#"):
-                self.sock.send("JOIN %s\r\n" % t.strip())
-        self.log.info("pyLoad IRC: Connected to %s!" % host)
-        self.log.info("pyLoad IRC: Switching to listening mode!")
-        try:        
-            self.main_loop()
-            
-        except IRCError, ex:
-            self.sock.send("QUIT :byebye\r\n")
-            print_exc()
-            self.sock.close()
-
-            
-    def main_loop(self):
-        readbuffer = ""
-        while True:
-            sleep(1)
-            fdset = select([self.sock], [], [], 0)
-            if self.sock not in fdset[0]:
-                continue
-            
-            if self.abort:
-                raise IRCError("quit")
-            
-            readbuffer += self.sock.recv(1024)
-            temp = readbuffer.split("\n")
-            readbuffer = temp.pop()
-
-            for line in temp:
-                line  = line.rstrip()
-                first = line.split()
-
-                if(first[0] == "PING"):
-                    self.sock.send("PING %s\r\n" % first[1])
-                    
-                if first[0] == "ERROR":
-                    raise IRCError(line)
-                    
-                msg = line.split(None, 3)
-                if len(msg) < 4:
-                    continue
-                    
-                msg = {
-                    "origin":msg[0][1:],
-                    "action":msg[1],
-                    "target":msg[2],
-                    "text":msg[3][1:]
-                }
-                
-                self.handle_events(msg)
-        
-        
-    def handle_events(self, msg):
-        if not msg["origin"].split("!", 1)[0] in self.getConfig("owner").split():
-            return
-            
-        if msg["target"].split("!", 1)[0] != self.getConfig("nick"):
-            return
-            
-        if msg["action"] != "PRIVMSG":
-            return
-            
-        # HANDLE CTCP ANTI FLOOD/BOT PROTECTION
-        if msg["text"] == "\x01VERSION\x01":
-            self.log.debug("Sending CTCP VERSION.")
-            self.sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface"))
-            return
-        elif msg["text"] == "\x01TIME\x01":
-            self.log.debug("Sending CTCP TIME.")
-            self.sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time()))
-            return
-        elif msg["text"] == "\x01LAG\x01":
-            self.log.debug("Received CTCP LAG.") # don't know how to answer
-            return
-         
-        trigger = "pass"
-        args = None
-        
-        temp = msg["text"].split()
-        trigger = temp[0]
-        if len(temp) > 1:
-            args = temp[1:]
-        
-        handler = getattr(self, "event_%s" % trigger, self.event_pass)
-        try:
-            res = handler(args)
-            for line in res:
-                self.response(line, msg["origin"])
-        except Exception, e:
-            self.log.error("pyLoad IRC: "+ repr(e))
-        
-        
-    def response(self, msg, origin=""):
-        if origin == "":
-            for t in self.getConfig("owner").split():
-                self.sock.send("PRIVMSG %s :%s\r\n" % (t.strip(), msg))
-        else:
-            self.sock.send("PRIVMSG %s :%s\r\n" % (origin.split("!", 1)[0], msg))
-        
-        
-#### Events
-    def event_pass(self, args):
-        return []
-        
-    def event_status(self, args):
-        downloads = self.sm.status_downloads()
-        if not downloads:
-            return ["INFO: There are no active downloads currently."]
-            
-        lines = []
-        lines.append("ID - Name - Status - Speed - ETA - Progress")
-        for data in downloads:
-            lines.append("#%d - %s - %s - %s - %s - %s" %
-                     (
-                     data['id'],
-                     data['name'],
-                     data['statusmsg'],
-                     "%.2f kb/s" % data['speed'],
-                     "%s" % data['format_eta'],
-                     "%d%% (%s)" % (data['percent'], data['format_size'])
-                     )
-                     )
-        return lines
-            
-    def event_queue(self, args):
-        ps = self.sm.get_queue()
-        
-        if not ps:
-            return ["INFO: There are no packages in queue."]
-        
-        lines = []
-        for id, pack in ps.iteritems():
-            lines.append('PACKAGE #%s: "%s" with %d links.' % (id, pack['name'], len(pack['links']) ))
-                
-        return lines
-        
-    def event_collector(self, args):
-        ps = self.sm.get_collector()
-        if not ps:
-            return ["INFO: No packages in collector!"]
-        
-        lines = []
-        for id, pack in ps.iteritems():
-            lines.append('PACKAGE #%s: "%s" with %d links.' % (id, pack['name'], len(pack['links']) ))
-                
-        return lines
-            
-    def event_info(self, args):
-        if not args:
-            return ['ERROR: Use info like this: info <id>']
-            
-        info = self.sm.get_file_data(int(args[0]))
-        
-        if not info:
-            return ["ERROR: Link doesn't exists."]
-        
-        id = info.keys()[0]
-        data = info[id]
-        
-        return ['LINK #%s: %s (%s) [%s][%s]' % (id, data['name'], data['format_size'], data['statusmsg'], data['plugin'])]
-        
-    def event_packinfo(self, args):
-        if not args:
-            return ['ERROR: Use packinfo like this: packinfo <id>']
-            
-        lines = []
-        pack = self.sm.get_package_data(int(args[0]))
-        
-        if not pack:
-            return ["ERROR: Package doesn't exists."]
-        
-        id = args[0]
-
-        self.more = []
-        
-        lines.append('PACKAGE #%s: "%s" with %d links' % (id, pack['name'], len(pack["links"])) )
-        for id, pyfile in pack["links"].iteritems():
-            self.more.append('LINK #%s: %s (%s) [%s][%s]' % (id, pyfile["name"], pyfile["format_size"], pyfile["statusmsg"], pyfile["plugin"]))
-
-        if len(self.more) < 6:
-            lines.extend(self.more)
-            self.more = []
-        else:
-            lines.extend(self.more[:6])
-            self.more = self.more[6:]
-            lines.append("%d more links do display." % len(self.more))
-            
-            
-        return lines
-    
-    def event_more(self, args):
-        if not self.more:
-            return ["No more information to display."]
-        
-        lines = self.more[:6]
-        self.more = self.more[6:]
-        lines.append("%d more links do display." % len(self.more))
-        
-        return lines
-    
-    def event_start(self, args):
-        
-        self.sm.unpause_server()
-        return ["INFO: Starting downloads."]
-        
-    def event_stop(self, args):
-    
-        self.sm.pause_server()
-        return ["INFO: No new downloads will be started."]
-    
-    
-    def event_add(self, args):
-        if len(args) < 2:
-            return ['ERROR: Add links like this: "add <packagename|id> links". '\
-                     'This will add the link <link> to to the package <package> / the package with id <id>!']
-            
-
-            
-        pack = args[0].strip()
-        links = [x.strip() for x in args[1:]]
-        
-        count_added = 0
-        count_failed = 0
-        try:
-            id = int(pack) 
-            pack = self.sm.get_package_data(id)
-            if not pack:
-                return ["ERROR: Package doesn't exists."]
-            
-            #add links
-            
-            
-            return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack["name"], id)]
-            
-        except:
-            # create new package
-            id = self.sm.add_package(pack, links, 1)
-            return ["INFO: Created new Package %s [#%d] with %d links." % (pack, id, len(links))]
-             
-        
-    def event_del(self, args):
-        if len(args) < 2:
-            return ["ERROR: Use del command like this: del -p|-l <id> [...] (-p indicates that the ids are from packages, -l indicates that the ids are from links)"]
-            
-        if args[0] == "-p":
-            ret = self.sm.del_packages(map(int, args[1:]))
-            return ["INFO: Deleted %d packages!" % len(args[1:])]
-            
-        elif args[0] == "-l":
-            ret = self.sm.del_links(map(int, args[1:]))
-            return ["INFO: Deleted %d links!" % len(args[1:])]
-
-        else:
-            return ["ERROR: Use del command like this: del <-p|-l> <id> [...] (-p indicates that the ids are from packages, -l indicates that the ids are from links)"]
-            
-    def event_help(self, args):
-        lines = []
-        lines.append("The following commands are available:")
-        lines.append("add <package|packid> <links> [...] Adds link to package. (creates new package if it does not exist)")
-        lines.append("queue                       Shows all packages in the queue")
-        lines.append("collector                   Shows all packages in collector")
-        lines.append("del -p|-l <id> [...]        Deletes all packages|links with the ids specified")
-        lines.append("info <id>                   Shows info of the link with id <id>")
-        lines.append("packinfo <id>               Shows info of the package with id <id>")
-        lines.append("more                        Shows more info when the result was truncated")
-        lines.append("start                       Starts all downloads")
-        lines.append("stop                        Stops the download (but not abort active downloads)")
-        lines.append("status                      Show general download status")
-        lines.append("help                        Shows this help message")
-        return lines
-        
-        
-class IRCError(Exception):
-    def __init__(self, value):
-        self.value = value
-    def __str__(self):
-        return repr(self.value)
\ No newline at end of file
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
deleted file mode 100644
index 3f41938dc..000000000
--- a/module/plugins/hooks/MultiHome.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-
-from module.plugins.Hook import Hook
-from time import time
-
-class MultiHome(Hook):
-    __name__ = "MultiHome"
-    __version__ = "0.1"
-    __description__ = """ip address changer"""
-    __config__ = [ ("activated", "bool", "Activated" , "False"),
-                   ("interfaces", "str", "Interfaces" , "None") ]
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def setup(self):
-        self.register = {}
-        self.interfaces = []
-        self.parseInterfaces(self.getConfig("interfaces").split(";"))
-        if not self.interfaces:
-            self.parseInterfaces([self.config["general"]["download_interface"]])
-            self.setConfig("interfaces", self.toConfig())
-    
-    def toConfig(self):
-        return ";".join([i.adress for i in self.interfaces])
-    
-    def parseInterfaces(self, interfaces):
-        for interface in interfaces:
-            if not interface or str(interface).lower() == "none":
-                continue
-            self.interfaces.append(Interface(interface))
-    
-    def coreReady(self):
-    	requestFactory = self.core.requestFactory
-    	oldGetRequest = requestFactory.getRequest
-        def getRequest(pluginName, account=None, type="HTTP"):
-            iface = self.bestInterface(pluginName, account)
-            if iface:
-                iface.useFor(pluginName, account)
-                requestFactory.iface = iface.adress
-                self.log.debug("Multihome: using address: "+iface.adress)
-            return oldGetRequest(pluginName, account, type)
-        requestFactory.getRequest = getRequest
-    
-    def bestInterface(self, pluginName, account):
-        best = None
-        for interface in self.interfaces:
-            if not best or interface.lastPluginAccess(pluginName, account) < best.lastPluginAccess(pluginName, account):
-                best = interface
-        return best
-
-class Interface(object):
-    def __init__(self, adress):
-        self.adress = adress
-        self.history = {}
-    
-    def lastPluginAccess(self, pluginName, account):
-        if self.history.has_key((pluginName, account)):
-            return self.history[(pluginName, account)]
-        return 0
-    
-    def useFor(self, pluginName, account):
-        self.history[(pluginName, account)] = time()
-    
-    def __repr__(self):
-        return "<Interface - %s>" % self.adress
diff --git a/module/plugins/hooks/UnRar.py b/module/plugins/hooks/UnRar.py
deleted file mode 100644
index faa06d179..000000000
--- a/module/plugins/hooks/UnRar.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: mkaay
-"""
-from __future__ import with_statement
-
-import sys
-
-from module.plugins.Hook import Hook
-from module.pyunrar import Unrar, WrongPasswordError, CommandError, UnknownError
-
-from os.path import exists, join
-from os import remove
-import re
-
-class UnRar(Hook):
-    __name__ = "UnRar"
-    __version__ = "0.1"
-    __description__ = """unrar"""
-    __config__ = [ ("activated", "bool", "Activated", False),
-                   ("fullpath", "bool", "extract full path", True),
-                   ("overwrite", "bool", "overwrite files", True),
-                   ("passwordfile", "str", "unrar passoword file", "unrar_passwords.txt"),
-                   ("deletearchive", "bool", "delete archives when done", False) ]
-    __threaded__ = ["packageFinished"]
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
-    
-    def setup(self):
-        self.comments = ["# one password each line"]
-        self.passwords = []
-        if exists(self.getConfig("passwordfile")):
-            with open(self.getConfig("passwordfile"), "r") as f:
-                for l in f.readlines():
-                    l = l.strip("\n\r")
-                    if l and not l.startswith("#"):
-                        self.passwords.append(l)
-        else:
-            with open(self.getConfig("passwordfile"), "w") as f:
-                f.writelines(self.comments)
-        self.re_splitfile = re.compile("(.*)\.part(\d+)\.rar$")
-    
-    def addPassword(self, pw):
-        if not pw in self.passwords:
-            self.passwords.insert(0, pw)
-            with open(self.getConfig("passwordfile"), "w") as f:
-                f.writelines(self.comments)
-                f.writelines(self.passwords)
-        
-    def removeFiles(self, pack, fname):
-        if not self.getConfig("deletearchive"):
-            return
-        m = self.re_splitfile.search(fname)
-                
-        download_folder = self.core.config['general']['download_folder']
-        if self.core.config['general']['folder_per_package']:
-            folder = join(download_folder, pack.folder.decode(sys.getfilesystemencoding()))
-        else:
-            folder = download_folder
-        if m:
-            nre = re.compile("%s\.part\d+\.rar" % m.group(1))
-            for fid, data in pack.getChildren().iteritems():
-                if nre.match(data["name"]):
-                    remove(join(folder, data["name"]))
-        elif not m and fname.endswith(".rar"):
-            nre = re.compile("^%s\.r..$" % fname.replace(".rar",""))
-            for fid, data in pack.getChildren().iteritems():
-                if nre.match(data["name"]):
-                    remove(join(folder, data["name"]))
-    
-    def packageFinished(self, pack):
-        if pack.password:
-            self.addPassword(pack.password)
-        files = []
-        for fid, data in pack.getChildren().iteritems():
-            m = self.re_splitfile.search(data["name"])
-            if m and int(m.group(2)) == 1:
-                files.append((fid,m.group(0)))
-            elif not m and data["name"].endswith(".rar"):
-                files.append((fid,data["name"]))
-        
-        for fid, fname in files:
-            pyfile = self.core.files.getFile(fid)
-            pyfile.setStatus("custom")
-            def s(p):
-                pyfile.alternativePercent = p
-                
-            download_folder = self.core.config['general']['download_folder']
-            if self.core.config['general']['folder_per_package']:
-                folder = join(download_folder, pack.folder.decode(sys.getfilesystemencoding()))
-            else:
-                folder = download_folder
-            
-            u = Unrar(join(folder, fname))
-            try:
-                success = u.crackPassword(passwords=self.passwords, statusFunction=s, overwrite=True, destination=folder, fullPath=self.getConfig("fullpath"))
-            except WrongPasswordError:
-                self.core.log.info("Unrar of %s failed (wrong password)" % fname)
-                continue
-            except CommandError, e:
-                if re.search("Cannot find volume", e.stderr):
-                    self.core.log.info("Unrar of %s failed (missing volume)" % fname)
-                    continue
-                try:
-                    if e.getExitCode() == 1 and len(u.listContent(u.getPassword())) == 1:
-                        self.core.log.debug("Unrar of %s ok" % fname)
-                        self.removeFiles(pack, fname)
-                except:
-                    self.core.log.info("Unrar of %s failed" % fname)
-                    continue
-            except UnknownError:
-                self.core.log.info("Unrar of %s failed" % fname)
-                continue
-            else:
-                if success:
-                    self.core.log.debug("Unrar of %s ok" % fname)
-                    self.removeFiles(pack, fname)
-                else:
-                    self.core.log.info("Unrar of %s failed (wrong password)" % fname)
-            finally:
-                pyfile.alternativePercent = None
-                pyfile.setStatus("finished")
-
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
deleted file mode 100644
index 2981df9a0..000000000
--- a/module/plugins/hooks/UpdateManager.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-
-    @author: mkaay
-    @interface-version: 0.1
-"""
-
-from module.network.Request import getURL
-from module.plugins.Hook import Hook
-
-class UpdateManager(Hook):
-    __name__ = "UpdateManager"
-    __version__ = "0.1"
-    __description__ = """checks for updates"""
-    __config__ = [ ("activated", "bool", "Activated" , "True"),
-                   ("interval", "int", "Check interval in minutes" , "180")]
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("ranan@pyload.org")
-
-    def setup(self):
-        self.interval = self.getConfig("interval") * 60
-        
-    def coreReady(self):
-        #@TODO check plugins, restart, and other stuff
-        pass
-    
-    def periodical(self):
-        self.checkForUpdate()
-        
-        
-    def checkForUpdate(self):
-        """ checks if an update is available"""
-        
-        try:
-            version_check = getURL("http://get.pyload.org/check/%s/" % self.core.server_methods.get_server_version() )
-            if version_check == "":
-                self.log.info(_("No Updates for pyLoad"))
-                return False
-            else:
-                self.log.info(_("***  New pyLoad Version %s available  ***") % version_check)
-                self.log.info(_("***  Get it here: http://get.pyload.org/get/  ***"))
-                return True
-        except:
-            self.log.error(_("Not able to connect server"))
-
-        
\ No newline at end of file
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
deleted file mode 100644
index 67a7f1b77..000000000
--- a/module/plugins/hooks/XMPPInterface.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    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/>.
-    
-    @author: RaNaN
-    @interface-version: 0.2
-"""
-
-import socket
-import sys
-from threading import Thread
-import time
-from time import sleep
-from traceback import print_exc
-
-from pyxmpp.all import JID,Iq,Presence,Message,StreamError
-from pyxmpp.jabber.client import JabberClient
-from pyxmpp.interface import implements
-from pyxmpp.interfaces import *
-from pyxmpp.streamtls import TLSSettings
-
-from module.plugins.Hook import Hook
-from module.plugins.hooks.IRCInterface import IRCInterface
-
-class XMPPInterface(IRCInterface, JabberClient):
-    __name__ = "XMPPInterface"
-    __version__ = "0.1"
-    __description__ = """connect to jabber and let owner perform different tasks"""
-    __config__ = [("activated", "bool", "Activated", "False"),
-        ("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"),
-        ("pw", "str", "Password", ""),
-        ("owners", "str", "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
-        ("info_file", "bool", "Inform about every file finished", "False"),
-        ("info_pack", "bool", "Inform about every package finished", "True")]
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
-        
-    implements(IMessageHandlersProvider)
-    
-    def __init__(self, core):
-        IRCInterface.__init__(self, core)
-        
-        self.jid = JID(self.getConfig("jid"))
-        password = self.getConfig("pw")
-        
-        # if bare JID is provided add a resource -- it is required
-        if not self.jid.resource:
-            self.jid=JID(self.jid.node, self.jid.domain, "pyLoad")
-     
-        tls_settings = None
-
-        # setup client with provided connection information
-        # and identity data
-        JabberClient.__init__(self, self.jid, password,
-                disco_name="pyLoad XMPP Client", disco_type="bot",
-                tls_settings = tls_settings)
-
-        self.interface_providers = [
-            VersionHandler(self),
-            self,
-        ]
-            
-    def coreReady(self):
-        self.new_package = {}
-    
-        self.start()
-                
-    def packageFinished(self, pypack):
-        
-        try:
-            if self.getConfig("info_pack"):
-                self.announce(_("Package finished: %s") % pypack.name)
-        except:
-            pass
-        
-    def downloadFinished(self, pyfile):
-        try:
-            if self.getConfig("info_file"):
-                self.announce(_("Download finished: %s @ %s") % (pyfile.name, pyfile.pluginname) )
-        except:
-            pass
-             
-    def run(self):
-        # connect to IRC etc.
-        self.connect()
-        try:        
-            self.loop(1)
-        except Exception, ex:
-            self.core.log.error("pyLoad XMPP: %s" % str(ex))
-            
-    def stream_state_changed(self,state,arg):
-        """This one is called when the state of stream connecting the component
-        to a server changes. This will usually be used to let the user
-        know what is going on."""
-        self.log.debug("pyLoad XMPP: *** State changed: %s %r ***" % (state,arg) )
-
-    def get_message_handlers(self):
-        """Return list of (message_type, message_handler) tuples.
-
-        The handlers returned will be called when matching message is received
-        in a client session."""
-        return [
-            ("normal", self.message),
-            ]
-
-    def message(self,stanza):
-        """Message handler for the component."""
-        subject=stanza.get_subject()
-        body=stanza.get_body()
-        t=stanza.get_type()
-        self.log.debug(_(u'pyLoad XMPP: Message from %s received.') % (unicode(stanza.get_from(),)))
-        self.log.debug(_(u'pyLoad XMPP: Body: %s') % body)
-        
-        if stanza.get_type()=="headline":
-            # 'headline' messages should never be replied to
-            return True
-        if subject:
-            subject=u"Re: "+subject
-            
-        to_jid = stanza.get_from()
-        from_jid = stanza.get_to()
-
-        #j = JID()
-        to_name = to_jid.as_utf8()
-        from_name = from_jid.as_utf8()
-        
-        names = self.getConfig("owners").split(";")
-        
-        if to_name in names or to_jid.node+"@"+to_jid.domain in names:
-            
-            messages = []
-            
-            trigger = "pass"
-            args = None
-            
-            temp = body.split()
-            trigger = temp[0]
-            if len(temp) > 1:
-                args = temp[1:]
-        
-            handler = getattr(self, "event_%s" % trigger, self.event_pass)
-            try:
-                res = handler(args)
-                for line in res:
-                    m=Message(
-                        to_jid=to_jid,
-                        from_jid=from_jid,
-                        stanza_type=stanza.get_type(),
-                        subject=subject,
-                        body=line)
-                    
-                    messages.append(m)
-            except Exception, e:
-                    self.log.error("pyLoad XMPP: "+ repr(e))
-            
-            return messages
-        
-        else:
-            return True
-        
-            
-    def announce(self, message):
-        """ send message to all owners"""
-        for user in self.getConfig("owners").split(";"):
-            
-            self.log.debug(_("pyLoad XMPP: Send message to %s") % user)
-            
-            to_jid = JID(user)
-            
-            m = Message(from_jid=self.jid,
-                        to_jid=to_jid,
-                        stanza_type="chat",
-                        body=message)
-            
-            self.stream.send(m)
-        
-           
-class VersionHandler(object):
-    """Provides handler for a version query.
-    
-    This class will answer version query and announce 'jabber:iq:version' namespace
-    in the client's disco#info results."""
-    
-    implements(IIqHandlersProvider, IFeaturesProvider)
-
-    def __init__(self, client):
-        """Just remember who created this."""
-        self.client = client
-
-    def get_features(self):
-        """Return namespace which should the client include in its reply to a
-        disco#info query."""
-        return ["jabber:iq:version"]
-
-    def get_iq_get_handlers(self):
-        """Return list of tuples (element_name, namespace, handler) describing
-        handlers of <iq type='get'/> stanzas"""
-        return [
-            ("query", "jabber:iq:version", self.get_version),
-            ]
-
-    def get_iq_set_handlers(self):
-        """Return empty list, as this class provides no <iq type='set'/> stanza handler."""
-        return []
-
-    def get_version(self,iq):
-        """Handler for jabber:iq:version queries.
-
-        jabber:iq:version queries are not supported directly by PyXMPP, so the
-        XML node is accessed directly through the libxml2 API.  This should be
-        used very carefully!"""
-        iq=iq.make_result_response()
-        q=iq.new_query("jabber:iq:version")
-        q.newTextChild(q.ns(),"name","Echo component")
-        q.newTextChild(q.ns(),"version","1.0")
-        return iq
-    
\ No newline at end of file
diff --git a/module/plugins/hooks/__init__.py b/module/plugins/hooks/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/hooks/__init__.py
+++ /dev/null
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
deleted file mode 100644
index 09545d493..000000000
--- a/module/plugins/hoster/BasePlugin.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-
-class BasePlugin(Hoster):
-    __name__ = "BasePlugin"
-    __type__ = "hoster"
-    __pattern__ = r"^unmatchable$"
-    __version__ = "0.1"
-    __description__ = """Base Plugin when any other didnt fit"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
-
-    def process(self, pyfile):
-        """main function"""
-        
-        if pyfile.url.startswith("http://"):
-
-            pyfile.name = re.findall("([^\/=]+)", pyfile.url)[-1]
-            self.download(pyfile.url)
-            
-        else:
-            self.fail("No Plugin matched and not a downloadable url.")
\ No newline at end of file
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
deleted file mode 100644
index c91341887..000000000
--- a/module/plugins/hoster/DepositfilesCom.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-from module.plugins.Hoster import Hoster
-
-class DepositfilesCom(Hoster):
-    __name__ = "DepositfilesCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?depositfiles\.com(/\w{1,3})?/files/[\w]+"
-    __version__ = "0.1"
-    __description__ = """Depositfiles.com Download Hoster"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def setup(self):
-        self.req.canContinue = self.multiDL = True if self.account else False
-        
-    def process(self, pyfile):
-        self.html = self.load(self.pyfile.url, cookies=False if self.account else False)
-        
-        if re.search(r"Such file does not exist or it has been removed for infringement of copyrights", self.html):
-            self.offline()
-        
-        if not self.account:
-            self.handleFree()
-        
-        pyfile.name = re.search('File name: <b title="(.*)">', self.html).group(1)
-        
-        link = urllib.unquote(re.search('<form action="(http://.+?\.depositfiles.com/.+?)" method="get"', self.html).group(1))
-        self.download(link)
-
-    def handleFree(self):
-        if re.search(r'File is checked, please try again in a minute.', self.html) != None:
-            self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.")
-            self.setWait(61)
-            self.wait()
-            
-        if re.search(r'Such file does not exist or it has been removed for infringement of copyrights', self.html) != None:
-            self.offline()
-            
-        self.html = self.load(self.pyfile.url, post={"gateway_result":"1"})
-        wait_time = int(re.search(r'<span id="download_waiter_remain">(.*?)</span>', self.html).group(1))
-        self.setWait(wait_time)
-        self.log.debug("DepositFiles.com: Waiting %d seconds." % wait_time)
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
deleted file mode 100644
index ff09d9a0a..000000000
--- a/module/plugins/hoster/FileserveCom.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-from module.plugins.ReCaptcha import ReCaptcha
-
-from module.network.Request import getURL

-
-def getInfo(urls):
-    result = []
-    
-    for url in urls:
-        html = getURL(url)

-        if re.search(r'<h1>File not available</h1>', html):

-            result.append((url, 0, 1, url))
-            continue
-        
-        size = re.search(r"<span><strong>(.*?) MB</strong>", html).group(1)

-        size = int(float(size)*1024*1024)
-        

-        name = re.search('<h1>(.*?)<br/></h1>', html).group(1)
-        result.append((name, size, 2, url))
-        
-    yield result
-

-class FileserveCom(Hoster):

-    __name__ = "FileserveCom"

-    __type__ = "hoster"

-    __pattern__ = r"http://(www\.)?fileserve\.com/file/.*?(/.*)?"

-    __version__ = "0.2"

-    __description__ = """Fileserve.Com File Download Hoster"""

-    __author_name__ = ("jeix", "mkaay")

-    __author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de")

-        

-    def setup(self):

-        self.req.canContinue = self.multiDL = True if self.account else False

-        

-    def process(self, pyfile):

-        

-        self.html = self.load(self.pyfile.url, cookies=False if self.account else True)

-        if re.search(r'<h1>File not available</h1>', self.html) != None:

-            self.offline

-            

-        self.pyfile.name = re.search('<h1>(.*?)<br/></h1>', self.html).group(1)

-        
-        if self.account:
-            self.handlePremium()
-        else:
-            self.handleFree()
-    
-    def handlePremium(self):
-        self.download(self.pyfile.url, post={"download":"premium"}, cookies=True)
-    
-    def handleFree(self):
-        

-        if r'<div id="captchaArea" style="display:none;">' in self.html or \

-           r'/showCaptcha\(\);' in self.html:

-            # we got a captcha

-            id = re.search(r"var reCAPTCHA_publickey='(.*?)';", self.html).group(1)

-            recaptcha = ReCaptcha(self)

-            challenge, code = recaptcha.challenge(id)

-            

-            shortencode = re.search(r'name="recaptcha_shortencode_field" value="(.*?)"', self.html).group(1)

-

-            self.html = self.load(r'http://www.fileserve.com/checkReCaptcha.php', post={'recaptcha_challenge_field':challenge,

-                'recaptcha_response_field':code, 'recaptcha_shortencode_field': shortencode})

-                

-            if r'incorrect-captcha-sol' in self.html:

-                self.retry()

-

-        html = self.load(self.pyfile.url, post={"downloadLink":"wait"})

-       

-        wait_time = 30

-        m = re.search(r'<span>(.*?)\sSekunden</span>', html)

-        if m != None:

-            wait_time = int( m.group(1).split('.')[0] ) + 1

-            

-        m = re.search(r'You need to wait (.*?) seconds to start another download.', html)

-        if m != None:

-            wait_time = int( m.group(1) )

-            self.wantReconnect = True

-            

-        if r'Your download link has expired.' in html:

-            self.retry()

-       

-        self.log.debug("%s: Waiting %d seconds." % (self.__name__, wait_time))

-        self.setWait(wait_time)

-        self.wait()

-        

-        self.load(self.pyfile.url, post={"downloadLink":"show"})

-        

-        self.download(self.pyfile.url, post={"download":"normal"})

diff --git a/module/plugins/hoster/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py
deleted file mode 100644
index 1bb36737e..000000000
--- a/module/plugins/hoster/FreakshareNet.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-from time import time
-
-
-class FreakshareNet(Hoster):
-    __name__ = "FreakshareNet"
-    __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?freakshare\.net/files/\S*?/"
-    __version__ = "0.2"
-    __description__ = """Freakshare.com Download Hoster"""
-    __author_name__ = ("sitacuisses","spoob","mkaay")
-    __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de")
-
-    def setup(self):
-        self.html = None
-        self.wantReconnect = False
-        self.multiDL = False
-        self.req_opts = []
-
-    def process(self, pyfile):
-        self.pyfile = pyfile
-        self.prepare()
-        self.get_file_url()
-        
-        self.download(self.pyfile.url, post=self.req_opts)
-        
-    
-    def prepare(self):
-        pyfile = self.pyfile
-
-        self.wantReconnect = False
-        
-        self.download_html()
-
-        if not self.file_exists():
-            self.offline
-            
-        self.setWait( self.get_waiting_time() )
-
-        pyfile.name = self.get_file_name()
-            
-        self.wait()
-
-        return True
-
-    def download_html(self):
-        url = self.pyfile.url
-        self.html = self.load(url, cookies=True)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-        if not self.wantReconnect:
-            self.req_opts = self.get_download_options() # get the Post options for the Request
-            #file_url = self.pyfile.url
-            #return file_url
-        else:
-            self.offline()
-
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-        if not self.wantReconnect:
-            file_name = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center\;\">([^ ]+)", self.html).group(1)
-            return file_name
-        else:
-            return self.pyfile.url
-    
-    def get_waiting_time(self):
-        if self.html == None:
-            self.download_html()
-        timestring = re.search('\s*var\stime\s=\s(\d*?)\.\d*;', self.html).group(1)
-        if timestring:
-            sec = int(timestring) + 1 #add 1 sec as tenths of seconds are cut off
-        else:
-            sec = 0
-        return sec
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-        if re.search(r"Sorry, this Download doesnt exist anymore", self.html) != None:
-            return False
-        else:
-            return True
-
-    def get_download_options(self):
-        re_envelope = re.search(r".*?value=\"Free\sDownload\".*?\n*?(.*?<.*?>\n*)*?\n*\s*?</form>", self.html).group(0) #get the whole request
-        to_sort = re.findall(r"<input\stype=\"hidden\"\svalue=\"(.*?)\"\sname=\"(.*?)\"\s\/>", re_envelope)
-        request_options = []
-        
-        for item in to_sort:       #Name value pairs are output reversed from regex, so we reorder them
-            request_options.append((item[1], item[0]))
-            
-        herewego = self.load(self.pyfile.url, None, request_options, cookies=True) # the actual download-Page
-        
-        to_sort = re.findall(r"<input\stype=\".*?\"\svalue=\"(\S*?)\".*?name=\"(\S*?)\"\s.*?\/>", herewego)
-        request_options = []
-        
-        for item in to_sort:       #Same as above
-            request_options.append((item[1], item[0]))
-
-        return request_options
\ No newline at end of file
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
deleted file mode 100644
index 9303b00c8..000000000
--- a/module/plugins/hoster/Ftp.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-

-

-"""

-    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/>.

-    

-    @author: jeix
-    @author: mkaay

-"""

-

-import logging

-from os.path import exists

-from os.path import join

-from os.path import exists

-from os import makedirs

-import sys

-

-from module.plugins.Hoster import Hoster

-

-

-class Ftp(Hoster):

-    __name__ = "Ftp"

-    __version__ = "0.3"

-    __pattern__ = r'ftp://(.*?:.*?@)?.*?/.*' # ftp://user:password@ftp.server.org/path/to/file

-    __type__ = "hoster"

-    __description__ = """A Plugin that allows you to download from an from an ftp directory"""

-    __author_name__ = ("jeix", "mkaay")

-    __author_mail__ = ("jeix@hasnomail.com", "mkaay@mkaay.de")

-    

-    def process(self, pyfile):

-        self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="FTP")

-        pyfile.name = self.pyfile.url.rpartition('/')[2]

-        

-        self.doDownload(pyfile.url, pyfile.name)

-

-    def doDownload(self, url, filename):

-        self.pyfile.setStatus("downloading")

-        

-        download_folder = self.core.config['general']['download_folder']

-        location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))

-        if not exists(location): 

-            makedirs(location)

-

-        newname = self.req.download(str(url), join(location, filename.decode(sys.getfilesystemencoding())))

-        self.pyfile.size = self.req.dl_size

-

-        if newname:

-            self.pyfile.name = newname

diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
deleted file mode 100644
index 8f231fcd5..000000000
--- a/module/plugins/hoster/HotfileCom.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-from module.plugins.Hoster import Hoster
-from module.plugins.ReCaptcha import ReCaptcha
-
-from module.network.Request import getURL
-from module.plugins.Plugin import chunks
-
-def getInfo(urls):
-    api_url_base = "http://api.hotfile.com/"
-    
-    for chunk in chunks(urls, 90):
-        api_param_file = {"action":"checklinks","links": ",".join(chunk),"fields":"id,status,name,size"} #api only supports old style links
-        src = getURL(api_url_base, post=api_param_file)
-        result = []
-        for i, res in enumerate(src.split("\n")):
-            if not res:
-                continue
-            fields = res.split(",")
-            
-            if fields[1] in ("1", "2"):
-                status = 2
-            elif fields[1]:
-                status = 1
-                
-            result.append((fields[2], int(fields[3]), status, chunk[i]))
-        yield result
-
-class HotfileCom(Hoster):
-    __name__ = "HotfileCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://hotfile.com/dl/"
-    __version__ = "0.3"
-    __description__ = """Hotfile.com Download Hoster"""
-    __author_name__ = ("sitacuisses","spoob","mkaay")
-    __author_mail__ = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de")
-
-    def setup(self):
-        self.html = [None, None]
-        self.wantReconnect = False
-        self.multiDL = False
-        self.htmlwithlink = None
-        self.url = None
-        
-        if self.account:
-            self.multiDL = True
-            self.req.canContinue = True
-    
-    def apiCall(self, method, post, login=False):
-        if not self.account and login:
-            return
-        elif self.account and login:
-            return self.account.apiCall(method, post)
-        post.update({"action": method})
-        return self.load("http://api.hotfile.com/", post=post)
-        
-    def process(self, pyfile):
-        self.wantReconnect = False
-        
-        args = {"links":self.pyfile.url, "fields":"id,status,name,size,sha1"}
-        resp = self.apiCall("checklinks", args)
-        self.apiData = {}
-        for k, v in zip(args["fields"].split(","), resp.strip().split(",")):
-            self.apiData[k] = v
-        
-        if self.apiData["status"] == "0":
-            self.offline()
-
-        pyfile.name = self.apiData["name"]
-        
-        if not self.account:
-            self.downloadHTML()
-                
-            self.setWait(self.getWaitTime())
-            self.wait()
-            
-            self.freeDownload()
-        else:
-            dl = self.account.apiCall("getdirectdownloadlink", {"link":self.pyfile.url})
-            self.download(dl)
-
-    def downloadHTML(self):
-        self.html[0] = self.load(self.pyfile.url, get={"lang":"en"}, cookies=True)
-
-    def freeDownload(self):
-        
-        form_content = re.search(r"<form style=.*(\n<.*>\s*)*?\n<tr>", self.html[0]).group(0)
-        form_posts = re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", form_content)
-        
-        self.html[1] = self.load(self.pyfile.url, post=form_posts, cookies=True)
-        
-        re_captcha = ReCaptcha(self)
-        
-        challenge = re.search(r"http://api\.recaptcha\.net/challenge\?k=([0-9A-Za-z]+)", self.html[1])
-        
-        if challenge:
-            challenge, result = re_captcha.challenge(challenge.group(1))
-            
-            url = re.search(r'<form action="(/dl/[^"]+)', self.html[1] )
-                        
-            self.html[1] = self.load("http://hotfile.com"+url.group(1), post={"action": "checkcaptcha",
-                                             "recaptcha_challenge_field" : challenge,
-                                             "recaptcha_response_field": result})
-            
-            if "Wrong Code. Please try again." in self.html[1]:
-                self.freeDownload()
-                return
-        
-        file_url = re.search(r'a href="(http://hotfile\.com/get/\S*?)"', self.html[1]).group(1)
-        self.download(file_url)
-          
-    def getWaitTime(self):
-        free_limit_pattern = re.compile(r"timerend=d\.getTime\(\)\+(\d+);")
-        matches = free_limit_pattern.findall(self.html[0])
-        if matches:
-            for match in matches:
-                if int(match) == 60000:
-                    continue
-                if int(match) == 0:
-                    continue
-                else:
-                    self.wantReconnect = True
-                    return int(match)/1000 + 65
-            return 65
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
deleted file mode 100644
index a14c2c76f..000000000
--- a/module/plugins/hoster/MegauploadCom.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Hoster import Hoster
-
-from module.network.Request import getURL
-
-def getInfo(urls):
-    url = "http://megaupload.com/mgr_linkcheck.php"
-    
-    ids = [x.split("=")[-1] for x in urls]
-    
-    i = 0
-    post = {}
-    for id in ids:
-        post["id%i"%i] = id
-        i += 1
-        
-    api = getURL(url, {}, post)
-    api = [x.split("&") for x in re.split(r"&?(?=id[\d]+=)", api)]
-    
-    result = []
-    i=0
-    for data in api:
-        if data[0].startswith("id"):
-            tmp = [x.split("=") for x in data]
-            if tmp[2][1] == "3":
-                status = 3
-            elif tmp[0][1] == "0":
-                status = 2
-            elif tmp[0][1] == "1":
-                status = 1
-            else:
-                status = 3
-            
-            name = tmp[3][1]
-            size = tmp[1][1]
-            
-            result.append( (name, size, status, urls[i] ) )
-            i += 1
-    
-    yield result
-
-class MegauploadCom(Hoster):
-    __name__ = "MegauploadCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?(megaupload)\.com/.*?(\?|&)d=[0-9A-Za-z]+"
-    __version__ = "0.1"
-    __description__ = """Megaupload.com Download Hoster"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def setup(self):
-        self.html = [None, None]
-        self.multiDL = False
-        
-    def process(self, pyfile):
-        self.pyfile = pyfile
-        self.download_html()
-        if not self.file_exists():
-            self.offline()
-            
-        self.setWait(45)
-        self.wait()
-            
-        pyfile.name = self.get_file_name()
-        self.download(self.get_file_url())
-
-    def download_html(self):        
-        for i in range(5):
-            self.html[0] = self.load(self.pyfile.url)
-            try:
-                url_captcha_html = re.search('(http://www.{,3}\.megaupload\.com/gencap.php\?.*\.gif)', self.html[0]).group(1)
-            except:
-                continue
-
-            captcha = self.decryptCaptcha(url_captcha_html)
-            captchacode = re.search('name="captchacode" value="(.*)"', self.html[0]).group(1)
-            megavar = re.search('name="megavar" value="(.*)">', self.html[0]).group(1)
-            self.html[1] = self.load(self.pyfile.url, post={"captcha": captcha, "captchacode": captchacode, "megavar": megavar})
-            if re.search(r"Waiting time before each download begins", self.html[1]) != None:
-                break
-
-    def get_file_url(self):
-        file_url_pattern = 'id="downloadlink"><a href="(.*)" onclick="'
-        search = re.search(file_url_pattern, self.html[1])
-        return search.group(1).replace(" ", "%20")
-
-    def get_file_name(self):
-        file_name_pattern = 'id="downloadlink"><a href="(.*)" onclick="'
-        return re.search(file_name_pattern, self.html[1]).group(1).split("/")[-1]
-
-    def file_exists(self):
-        self.download_html()
-        if re.search(r"Unfortunately, the link you have clicked is not available.", self.html[0]) != None or \
-            re.search(r"Download limit exceeded", self.html[0]):
-            return False
-        return True
diff --git a/module/plugins/hoster/MegavideoCom.py b/module/plugins/hoster/MegavideoCom.py
deleted file mode 100644
index 7ea045447..000000000
--- a/module/plugins/hoster/MegavideoCom.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-from module.plugins.Hoster import Hoster
-from module.unescape import unescape
-
-class MegavideoCom(Hoster):
-    __name__ = "MegavideoCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?megavideo.com/\?v=.*"
-    __version__ = "0.1"
-    __description__ = """Megavideo.com Download Hoster"""
-    __author_name__ = ("jeix","mkaay")
-    __author_mail__ = ("jeix@hasnomail.de","mkaay@mkaay.de")
-        
-    def __init__(self, parent):
-        Hoster.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-
-        # get id
-        id = re.search("previewplayer/\\?v=(.*?)&width", self.html).group(1)
-        
-        # check for hd link and return if there
-        if "flashvars.hd = \"1\";" in self.html:
-            content = self.req.load("http://www.megavideo.com/xml/videolink.php?v=%s" % id)
-            return unescape(re.search("hd_url=\"(.*?)\"", content).group(1))
-            
-        # else get normal link
-        s = re.search("flashvars.s = \"(\\d+)\";", self.html).group(1)
-        un = re.search("flashvars.un = \"(.*?)\";", self.html).group(1)
-        k1 = re.search("flashvars.k1 = \"(\\d+)\";", self.html).group(1)
-        k2 = re.search("flashvars.k2 = \"(\\d+)\";", self.html).group(1)
-        return "http://www%s.megavideo.com/files/%s/" % (s, self.__decrypt(un, int(k1), int(k2)))
-        
-    def __decrypt(self, input, k1, k2):
-        req1 = []
-        req3 = 0
-        for c in input:
-            c = int(c, 16)
-            tmp = "".join([str((c >> y) & 1) for y in range(4 -1, -1, -1)])
-            req1.extend([int(x) for x in tmp])            
-        
-        req6 = []
-        req3 = 0
-        while req3 < 384:
-            k1 = (k1 * 11 + 77213) % 81371
-            k2 = (k2 * 17 + 92717) % 192811
-            req6.append((k1 + k2) % 128)
-            req3 += 1
-            
-        req3 = 256
-        while req3 >= 0:
-            req5 = req6[req3]
-            req4 = req3 % 128
-            req8 = req1[req5]
-            req1[req5] = req1[req4]
-            req1[req4] = req8
-            req3 -= 1
-            
-        req3 = 0
-        while req3 < 128:
-            req1[req3] = req1[req3] ^ (req6[req3+256] & 1)
-            req3 += 1
-            
-        out = ""
-        req3 = 0
-        while req3 < len(req1):
-            tmp = req1[req3] * 8
-            tmp += req1[req3+1] * 4
-            tmp += req1[req3+2] * 2
-            tmp += req1[req3+3]
-            
-            out += "%X" % tmp
-            
-            req3 += 4
-            
-        return out.lower()
-    
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-            
-        name = re.search("flashvars.title = \"(.*?)\";", self.html).group(1)
-        name = "%s.flv" % unescape(name.encode("ascii", "ignore")).decode("utf-8").encode("ascii", "ignore").replace("+", " ")
-        return name
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-            
-        if re.search(r"Dieses Video ist nicht verfügbar.", self.html) != None or \
-           re.search(r"This video is unavailable.", self.html) != None:
-            return False
-        else:
-            return True
-            
diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
deleted file mode 100644
index f2d2082a7..000000000
--- a/module/plugins/hoster/MyvideoDe.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-from module.unescape import unescape
-
-class MyvideoDe(Hoster):
-    __name__ = "MyvideoDe"
-    __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?myvideo.de/watch/"
-    __version__ = "0.9"
-    __description__ = """Myvideo.de Video Download Hoster"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-        
-    def setup(self):
-        self.html = None
-        
-    def process(self, pyfile):
-        self.pyfile = pyfile
-        self.download_html()
-        pyfile.name = self.get_file_name()
-        self.download(self.get_file_url())
-
-    def download_html(self):
-        self.html = self.load(self.pyfile.url)
-
-    def get_file_url(self):
-        videoId = re.search(r"addVariable\('_videoid','(.*)'\);p.addParam\('quality'", self.html).group(1)
-        videoServer = re.search("rel='image_src' href='(.*)thumbs/.*' />", self.html).group(1)
-        file_url = videoServer + videoId + ".flv"
-        return file_url
-
-    def get_file_name(self):
-        file_name_pattern = r"<h1 class='globalHd'>(.*)</h1>"
-        return unescape(re.search(file_name_pattern, self.html).group(1).replace("/", "") + '.flv')
-
-    def file_exists(self):
-        self.download_html()
-        self.load(str(self.pyfile.url), cookies=False, just_header=True)
-        if self.req.lastEffectiveURL == "http://www.myvideo.de/":
-            return False
-        return True
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
deleted file mode 100644
index 6f0cb9461..000000000
--- a/module/plugins/hoster/NetloadIn.py
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import sleep
-
-
-from module.plugins.Hoster import Hoster
-from module.network.Request import getURL
-from module.plugins.Plugin import chunks
-
-
-
-def getInfo(urls):
- ##  returns list of tupels (name, size (in bytes), status (see FileDatabase), url)
-
-
-    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:
-            match = id_regex.search(url)
-            if match:
-                ids = ids + match.group(1) +";"
-
-        api = getURL(apiurl+ids)
-
-        if api == None or len(api) < 10:
-            print "Netload prefetch: failed "
-            return
-        if api.find("unknown_auth") >= 0:
-            print "Netload prefetch: Outdated auth code "
-            return
-
-        result = []
-
-        for i, r in enumerate(api.split()):
-            try:
-                tmp = r.split(";")
-                try:
-                    size = int(tmp[2])
-                except:
-                    size = 0
-                result.append( (tmp[1], size, 2 if tmp[3] == "online" else 1, chunk[i] ) )
-            except:
-                print "Netload prefetch: Error while processing response: "
-                print r
-
-        yield result
-
-class NetloadIn(Hoster):
-    __name__ = "NetloadIn"
-    __type__ = "hoster"
-    __pattern__ = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
-    __version__ = "0.2"
-    __description__ = """Netload.in Download Hoster"""
-    __config__ = [ ("dumpgen", "bool", "Generate debug page dumps on stdout", "False") ]
-    __author_name__ = ("spoob", "RaNaN", "Gregy")
-    __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz")
-
-    def setup(self):
-        self.multiDL = False
-        if self.account:
-            self.multiDL = True
-            self.req.canContinue = True
-    
-    def process(self, pyfile):
-        self.url = pyfile.url
-        self.prepare()
-        self.pyfile.setStatus("downloading")
-        self.proceed(self.url)
-
-    def prepare(self):
-        self.download_api_data()
-
-        if self.api_data and self.api_data["filename"]:
-            self.pyfile.name = self.api_data["filename"]
-
-        if self.account:
-            self.log.debug("Netload: Use Premium Account")
-            return True
-
-        if self.download_html():
-            return True
-        else:
-            self.fail("Failed")
-            return False
-            
-    def download_api_data(self):
-        url = self.url
-        id_regex = re.compile("http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)")
-        match = id_regex.search(url)
-        if match:
-            apiurl = "http://netload.in/share/fileinfos2.php"
-            src = self.load(apiurl, cookies=False, get={"file_id": match.group(1)})
-            self.log.debug("Netload: APIDATA: "+src.strip())
-            self.api_data = {}
-            if src == "unknown_server_data":
-                self.api_data = False
-            elif not src == "unknown file_data":
-                
-                lines = src.split(";")
-                self.api_data["exists"] = True
-                self.api_data["fileid"] = lines[0]
-                self.api_data["filename"] = lines[1]
-                self.api_data["size"] = lines[2] #@TODO formatting? (ex: '2.07 KB')
-                self.api_data["status"] = lines[3]
-                if self.api_data["status"] == "online":
-                    self.api_data["checksum"] = lines[4].strip()
-                else:
-                    self.offline();
-            else:
-                self.api_data["exists"] = False
-        else:
-            self.api_data = False
-            self.html[0] = self.load(self.url, cookies=False)
-
-    def final_wait(self, page):
-        wait_time = self.get_wait_time(page)
-        self.setWait(wait_time)
-        self.log.debug(_("Netload: final wait %d seconds" % wait_time))
-        self.wait()
-        self.url = self.get_file_url(page)
-
-    def download_html(self):
-        self.log.debug("Netload: Entering download_html")
-        page = self.load(self.url, cookies=True)
-        captchawaited = False
-        for i in range(10):
-            self.log.debug(_("Netload: try number %d " % i))
-            if self.getConf('dumpgen'):
-                print page
-
-            if re.search(r"(We will prepare your download..)", page) != None:
-                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) != None:
-                wait = self.get_wait_time(page);
-                if wait == 0:
-                    self.log.debug("Netload: Wait was 0 setting 30")
-                    wait = 30
-                self.log.info(_("Netload: waiting between downloads %d s." % wait))
-                self.wantReconnect = True
-                self.setWait(wait)
-                self.wait()
-
-                link = re.search(r"You can download now your next file. <a href=\"(index.php\?id=10&amp;.*)\" class=\"Orange_Link\">Click here for the download</a>", page)
-                if link != None:
-                    self.log.debug("Netload: Using new link found on page")
-                    page = self.load("http://netload.in/" + link.group(1).replace("amp;", ""))
-                else:
-                    self.log.debug("Netload: No new link found, using old one")
-                    page = self.load(self.url, cookies=True)
-                continue
-
-            
-            self.log.debug("Netload: Trying to find captcha")
-
-            url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', page).group(1).replace("amp;", "")
-            page = self.load(url_captcha_html, cookies=True)
-
-            try:
-                captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1)
-            except:
-                open("dump.html", "w").write(page)
-                self.log.debug("Netload: Could not find captcha, try again from begining")
-                continue
-
-            file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', page).group(1)
-            if not captchawaited:
-                wait = self.get_wait_time(page);
-                self.log.info(_("Netload: waiting for captcha %d s." % wait))
-                self.setWait(wait)
-                self.wait()
-                captchawaited = True
-
-            captcha = self.decryptCaptcha(captcha_url)
-            sleep(4)
-            page = self.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, cookies=True)
-
-        return False
-        
-
-    def get_file_url(self, page):
-        try:
-            file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\" >Click here"
-            attempt = re.search(file_url_pattern, page)
-            if attempt != None:
-                return attempt.group(1)
-            else:
-                self.log.debug("Netload: Backup try for final link")
-                file_url_pattern = r"<a href=\"(.+)\" class=\"Orange_Link\">Click here"
-                attempt = re.search(file_url_pattern, page)
-                return "http://netload.in/"+attempt.group(1);
-        except:
-            self.log.debug("Netload: Getting final link failed")
-            return None
-
-    def get_wait_time(self, page):
-        wait_seconds = int(re.search(r"countdown\((.+),'change\(\)'\)", page).group(1)) / 100
-        return wait_seconds
-        
-
-    def proceed(self, url):
-        self.log.debug("Netload: Downloading..")
-
-        self.download(url, cookies=True)
-
diff --git a/module/plugins/hoster/PornhostCom.py b/module/plugins/hoster/PornhostCom.py
deleted file mode 100644
index 5dd681b5b..000000000
--- a/module/plugins/hoster/PornhostCom.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-

-class PornhostCom(Hoster):

-    __name__ = "PornhostCom"

-    __type__ = "hoster"

-    __pattern__ = r'http://[\w\.]*?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'

-    __version__ = "0.2"

-    __description__ = """Pornhost.com Download Hoster"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.de")

-        

-    def process(self, pyfile):

-        self.download_html()

-        if not self.file_exists():

-            offline()

-            

-        pyfile.name = self.get_file_name()

-        self.download(self.get_file_url())

-        

-

-    ###   old interface

-    def download_html(self):

-        url = self.pyfile.url

-        self.html = self.load(url)

-

-    def get_file_url(self):

-        """ returns the absolute downloadable filepath

-        """

-        if self.html == None:

-            self.download_html()

-

-        file_url = re.search(r'download this file</label>.*?<a href="(.*?)"', self.html)

-        if not file_url: 

-            file_url = re.search(r'"(http://dl[0-9]+\.pornhost\.com/files/.*?/.*?/.*?/.*?/.*?/.*?\..*?)"', self.html)

-            if not file_url:

-                file_url = re.search(r'width: 894px; height: 675px">.*?<img src="(.*?)"', self.html)

-                if not file_url:

-                    file_url = re.search(r'"http://file[0-9]+\.pornhost\.com/[0-9]+/.*?"', self.html) # TODO: fix this one since it doesn't match

-

-        file_url = file_url.group(1).strip()

-                    

-        return file_url

-    

-    def get_file_name(self):

-        if self.html == None:

-            self.download_html()

-            

-        name = re.search(r'<title>pornhost\.com - free file hosting with a twist - gallery(.*?)</title>', self.html)

-        if not name:

-            name = re.search(r'id="url" value="http://www\.pornhost\.com/(.*?)/"', self.html)

-            if not name:

-                name = re.search(r'<title>pornhost\.com - free file hosting with a twist -(.*?)</title>', self.html)

-                if not name:

-                    name = re.search(r'"http://file[0-9]+\.pornhost\.com/.*?/(.*?)"', self.html)

-       

-        name = name.group(1).strip() + ".flv"

-        

-        return name

-

-    def file_exists(self):

-        """ returns True or False

-        """

-        if self.html == None:

-            self.download_html()

-        

-        if re.search(r'gallery not found', self.html) != None \

-        or re.search(r'You will be redirected to', self.html) != None:

-            return False

-        else:

-            return True

-            

-            

diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py
deleted file mode 100644
index ea7e1423c..000000000
--- a/module/plugins/hoster/PornhubCom.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-

-class PornhubCom(Hoster):

-    __name__ = "PornhubCom"

-    __type__ = "hoster"

-    __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+'

-    __version__ = "0.2"

-    __description__ = """Pornhub.com Download Hoster"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.de")

-        

-    def process(self, pyfile):

-        self.download_html()

-        if not self.file_exists():

-            offline()

-            

-        pyfile.name = self.get_file_name()

-        self.download(self.get_file_url())

-        

-    def download_html(self):

-        url = self.pyfile.url

-        self.html = self.load(url)

-

-    def get_file_url(self):

-        """ returns the absolute downloadable filepath

-        """

-        if self.html == None:

-            self.download_html()

-

-        url = "http://www.pornhub.com//gateway.php"

-        video_id = self.pyfile.url.split('=')[-1]

-        # thanks to jD team for this one  v

-        post_data = "\x00\x03\x00\x00\x00\x01\x00\x0c\x70\x6c\x61\x79\x65\x72\x43\x6f\x6e\x66\x69\x67\x00\x02\x2f\x31\x00\x00\x00\x44\x0a\x00\x00\x00\x03\x02\x00"

-        post_data += chr(len(video_id))

-        post_data += video_id

-        post_data += "\x02\x00\x02\x2d\x31\x02\x00\x20"

-        post_data += "add299463d4410c6d1b1c418868225f7"

-        

-        content = self.req.load(url, post=str(post_data), no_post_encode=True)

-        file_url = re.search(r'flv_url.*(http.*?)\?r=.*', content).group(1)

-

-        return file_url

-    

-    def get_file_name(self):

-        if self.html == None:

-            self.download_html()

-            

-        name = re.findall('<h1>(.*?)</h1>', self.html)[1] + ".flv"

-        

-        return name

-

-    def file_exists(self):

-        """ returns True or False

-        """

-        if self.html == None:

-            self.download_html()

-        

-        if re.search(r'This video is no longer in our database or is in conversion', self.html) != None:

-            return False

-        else:

-            return True

diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
deleted file mode 100644
index fa5f053de..000000000
--- a/module/plugins/hoster/RapidshareCom.py
+++ /dev/null
@@ -1,188 +0,0 @@
-
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-
-from module.network.Request import getURL
-from module.plugins.Hoster import Hoster
-import hashlib
-
-def getInfo(urls):
-    
-    ids = ""
-    names = ""
-    
-    for url in urls:
-        tmp = url.split("/")
-        ids+= ","+tmp[-2]
-        names+= ","+tmp[-1]
-    
-    url = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles_v1&files=%s&filenames=%s" % (ids[1:], names[1:])
-    
-    
-    api = getURL(url)
-    result = []
-    i = 0
-    for res in api.split():
-        tmp = res.split(",")
-        if tmp[4] in ("0", "4", "5"): status = 1
-        elif tmp[4] == "1": status = 2
-        else: status = 3
-        
-        result.append( (tmp[1], tmp[2], status, urls[i]) ) 
-        i += 1
-        
-    yield result
-
-class RapidshareCom(Hoster):
-    __name__ = "RapidshareCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)"
-    __version__ = "1.1"
-    __description__ = """Rapidshare.com Download Hoster"""
-    __config__ = [ ("server", "str", "Preferred Server", "None") ] 
-    __author_name__ = ("spoob", "RaNaN", "mkaay")
-    __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
-
-    def setup(self):
-        self.html = [None, None]
-        self.no_slots = True
-        self.api_data = None
-        self.multiDL = False
-        if self.account:
-            self.multiDL = True
-            self.req.canContinue = True
-
-    def process(self, pyfile):
-        self.url = self.pyfile.url        
-        self.prepare()
-        self.proceed(self.url)
-         
-    def prepare(self):
-        # self.no_slots = True
-        # self.want_reconnect = False
-
-        self.download_api_data()
-        if self.api_data["status"] == "1":
-            self.pyfile.name = self.get_file_name()
-
-            if self.account:
-                info = self.account.getAccountInfo(self.account.getAccountData(self)[0])
-                self.log.debug(_("%s: Use Premium Account (%sGB left)") % (self.__name__, info["trafficleft"]/1000/1000))
-                if self.api_data["size"] / 1024 > info["trafficleft"]:
-                    self.log.info(_("%s: Not enough traffic left" % self.__name__))
-                    self.resetAcount()
-                else:
-                    self.url = self.api_data["mirror"]
-                    return True
-
-            self.download_html()
-            while self.no_slots:
-                self.setWait(self.get_wait_time())
-                self.wait()
-                # self.pyfile.status.waituntil = self.time_plus_wait
-                # self.pyfile.status.want_reconnect = self.want_reconnect
-                # thread.wait(self.pyfile)
-
-            self.url = self.get_file_url()
-
-            return True
-        elif self.api_data["status"] == "2":
-            self.log.info(_("Rapidshare: Traffic Share (direct download)"))
-            self.pyfile.name = self.get_file_name()
-            # self.pyfile.status.url = self.parent.url
-            return True
-        else:
-            self.fail("Unknown response code.")
-            
-    def download_api_data(self, force=False):
-        """
-        http://images.rapidshare.com/apidoc.txt
-        """
-        if self.api_data and not force:
-            return
-        api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param_file = {"sub": "checkfiles_v1", "files": "", "filenames": "", "incmd5": "1"}
-        m = re.compile(self.__pattern__).search(self.url)
-        if m:
-            api_param_file["files"] = m.group(1)
-            api_param_file["filenames"] = m.group(2)
-            src = self.load(api_url_base, cookies=False, get=api_param_file)
-            if src.startswith("ERROR"):
-                return
-            fields = src.split(",")
-            self.api_data = {}
-            self.api_data["fileid"] = fields[0]
-            self.api_data["filename"] = fields[1]
-            self.api_data["size"] = int(fields[2]) # in bytes
-            self.api_data["serverid"] = fields[3]
-            self.api_data["status"] = fields[4]
-            """
-            status codes:
-                0=File not found
-                1=File OK (Downloading possible without any logging)
-                2=File OK (TrafficShare direct download without any logging)
-                3=Server down
-                4=File marked as illegal
-                5=Anonymous file locked, because it has more than 10 downloads already
-                6=File OK (TrafficShare direct download with enabled logging)
-            """
-            self.api_data["shorthost"] = fields[5]
-            self.api_data["checksum"] = fields[6].strip().lower() # md5
-            
-            self.api_data["mirror"] = "http://rs%(serverid)s%(shorthost)s.rapidshare.com/files/%(fileid)s/%(filename)s" % self.api_data
-
-    def download_html(self):
-        """ gets the url from self.parent.url saves html in self.html and parses
-        """
-        self.html[0] = self.load(self.url, cookies=False)
-        
-    def get_wait_time(self):
-        """downloads html with the important informations
-        """
-        file_server_url = re.search(r"<form action=\"(.*?)\"", self.html[0]).group(1)
-        self.html[1] = self.load(file_server_url, cookies=False, post={"dl.start": "Free"})
-        
-        if re.search(r"is already downloading", self.html[1]):
-            self.log.info(_("Rapidshare: Already downloading, wait 30 minutes"))
-            return 30 * 60
-        self.no_slots = False
-        try:
-            wait_minutes = re.search(r"Or try again in about (\d+) minute", self.html[1]).group(1)
-            self.no_slots = True
-            self.wantReconnect = True
-            return 60 * int(wait_minutes) + 60
-        except:
-            if re.search(r"(Currently a lot of users|no more download slots|servers are overloaded)", self.html[1], re.I) != None:
-                self.log.info(_("Rapidshare: No free slots!"))
-                self.no_slots = True
-                return time() + 130
-            self.no_slots = False
-            wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1)
-            return int(wait_seconds) + 5
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.getConf('server') == "None":
-            file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*"
-        else:
-            file_url_pattern = '(http://rs.*)\';" /> %s<br />' % getConf('server')
-
-        return re.search(file_url_pattern, self.html[1]).group(1)
-
-    def get_file_name(self):
-        if self.api_data["filename"]:
-            return self.api_data["filename"]
-        elif self.html[0]:
-            file_name_pattern = r"<p class=\"downloadlink\">.+/(.+) <font"
-            file_name_search = re.search(file_name_pattern, self.html[0])
-            if file_name_search:
-                return file_name_search.group(1)
-        return self.url.split("/")[-1]
-
-    def proceed(self, url):
-        self.download(url, get={"directstart":1}, cookies=True)
-
diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py
deleted file mode 100644
index 6a9baffbe..000000000
--- a/module/plugins/hoster/RedtubeCom.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-from module.unescape import unescape

-

-class RedtubeCom(Hoster):

-    __name__ = "RedtubeCom"

-    __type__ = "hoster"

-    __pattern__ = r'http://[\w\.]*?redtube\.com/\d+'

-    __version__ = "0.2"

-    __description__ = """Redtube.com Download Hoster"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.de")

-        

-    def process(self, pyfile):

-        self.download_html()

-        if not self.file_exists():

-            offline()

-            

-        pyfile.name = self.get_file_name()

-        self.download(self.get_file_url())

-        

-    def download_html(self):

-        url = self.pyfile.url

-        self.html = self.load(url)

-

-    def get_file_url(self):

-        """ returns the absolute downloadable filepath

-        """

-        if self.html == None:

-            self.download_html()

-

-        file_url = unescape(re.search(r'hashlink=(http.*?)"', self.html).group(1))

-

-        return file_url

-    

-    def get_file_name(self):

-        if self.html == None:

-            self.download_html()

-            

-        name = re.search('<title>(.*?)- RedTube - Free Porn Videos</title>', self.html).group(1).strip() + ".flv"        

-        return name

-

-    def file_exists(self):

-        """ returns True or False

-        """

-        if self.html == None:

-            self.download_html()

-        

-        if re.search(r'This video has been removed.', self.html) != None:

-            return False

-        else:

-            return True

-            

diff --git a/module/plugins/hoster/ShareCx.py b/module/plugins/hoster/ShareCx.py
deleted file mode 100644
index e64459754..000000000
--- a/module/plugins/hoster/ShareCx.py
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-from module.plugins.Plugin import chunks

-from module.network.Request import getURL

-#from module.BeautifulSoup import BeautifulSoup

-

-def getInfo(urls):

-    api_url = "http://www.share.cx/uapi?do=check&links="

-    

-    for chunk in chunks(urls, 90):

-        get = ""

-        for url in chunk:

-            get += ";"+url

-            

-        api = getURL(api_url+get[1:])

-        result = []

-        

-        for i, link in enumerate(api.split()):

-            url,name,size = link.split(";")

-            if name and size:

-                status = 2

-            else:

-                status = 1

-                

-            if not name: name = chunk[i]

-            if not size: size = 0

-                

-            result.append( (name, size, status, chunk[i]) )

-        

-        yield result

-

-class ShareCx(Hoster):

-    __name__ = "ShareCx"

-    __type__ = "hoster"

-    __pattern__ = r"http://[\w\.]*?share\.cx/(files|videos)/\d+"

-    __version__ = "0.1"

-    __description__ = """Share.cx Download Hoster"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.de")

-        

-        

-    def setup(self):

-        self.multiDL = False

-        

-        

-    def process(self, pyfile):

-        self.pyfile = pyfile

-        self.download_html()

-        if not self.file_exists():

-            offline()

-            

-        pyfile.name = self.get_file_name()

-        self.doDownload()

-        

-        

-    def download_html(self):

-        self.html = self.load(self.pyfile.url)

-

-    def doDownload(self):

-        """ returns the absolute downloadable filepath

-        """

-        if self.html == None:

-            self.download_html()

-

-        op          = re.search(r'name="op" value="(.*?)"', self.html).group(1)

-        usr_login   = re.search(r'name="usr_login" value="(.*?)"', self.html).group(1)

-        id          = re.search(r'name="id" value="(.*?)"', self.html).group(1)

-        fname       = re.search(r'name="fname" value="(.*?)"', self.html).group(1)

-        referer     = re.search(r'name="referer" value="(.*?)"', self.html).group(1)

-        method_free = "Datei+herunterladen"

-        

-        self.html   = self.load(self.pyfile.url, post={

-                "op" : op,

-                "usr_login" : usr_login,

-                "id" : id,

-                "fname" : fname,

-                "referer" : referer,

-                "method_free" : method_free

-            })

-            

-            

-        m = re.search(r'startTimer\((\d+)\)', self.html)

-        if m != None:

-            wait_time = int(m.group(1))

-            self.setWait(wait_time)

-            self.wantReconnect = True

-            self.log.debug("%s: IP blocked wait %d seconds." % (self.__name__, wait_time))

-            self.wait()

-            

-        m = re.search(r'countdown">.*?(\d+).*?</span>', self.html)

-        if m == None:

-            m = re.search(r'id="countdown_str".*?<span id=".*?">.*?(\d+).*?</span', self.html)

-        if m != None:

-            wait_time = int(m.group(1))

-            self.setWait(wait_time)

-            self.wantReconnect = False

-            self.log.debug("%s: Waiting %d seconds." % (self.__name__, wait_time))

-            self.wait()

-

-        

-        op = re.search(r'name="op" value="(.*?)"', self.html).group(1)

-        id = re.search(r'name="id" value="(.*?)"', self.html).group(1)

-        rand = re.search(r'name="rand" value="(.*?)"', self.html).group(1)

-        referer = re.search(r'name="referer" value="(.*?)"', self.html).group(1)

-        method_free = re.search(r'name="method_free" value="(.*?)"', self.html).group(1)

-        method_premium = re.search(r'name="method_premium" value="(.*?)"', self.html).group(1)

-        down_script = re.search(r'name="down_script" value="(.*?)"', self.html).group(1)

-

-        data = {

-            "op" : op,

-            "id" : id,

-            "rand" : rand,

-            "referer" : referer,

-            "method_free" : method_free,

-            "method_premium" : method_premium,

-            "down_script" : down_script

-        }

-        

-        if '/captchas/' in self.html:

-            captcha_url = re.search(r'(http://(?:[\w\d]+\.)?.*?/captchas/.*?)').group(1)

-            captcha = self.decryptCaptcha(captcha_url)

-            data["code"] = captcha

-            

-

-        self.download(self.pyfile.url, post=data)

-

-        # soup = BeautifulSoup(html)

-        # form = soup.find("form")

-        # postfields = {}

-        # for input in form,findall("input"):

-           # postfields[input["name"]] = input["value"]

-        # postfields["method_free"] = "Datei herunterladen"

-    

-    def get_file_name(self):

-        if self.html == None:

-            self.download_html()

-            

-        name = re.search(r'alt="Download" /></span>(.*?)</h3>', self.html).group(1)

-        return name

-

-    def file_exists(self):

-        """ returns True or False

-        """

-        if self.html == None:

-            self.download_html()

-        

-        if re.search(r'File not found<br>It was deleted due to inactivity or abuse request', self.html) != None:

-            return False

-

-        return True

-            

-            

diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
deleted file mode 100644
index bc1951602..000000000
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import os.path
-import re
-import tempfile
-from time import time
-from base64 import b64decode
-import hashlib
-import random
-from time import sleep
-
-from module.plugins.Hoster import Hoster
-from module.network.Request import getURL
-from module.plugins.Plugin import chunks
-
-    
-def getInfo(urls):
-    api_url_base = "http://www.share-online.biz/linkcheck/linkcheck.php"
-    
-    for chunk in chunks(urls, 90):
-        api_param_file = {"links": "\n".join(x.replace("http://www.share-online.biz/dl/","") for x in chunk)} #api only supports old style links
-        src = getURL(api_url_base, post=api_param_file)
-        result = []
-        for i, res in enumerate(src.split("\n")):
-            if not res:
-                continue
-            fields = res.split(";")
-            
-            if fields[1] == "OK":
-                status = 2
-            elif fields[1] in ("DELETED", "NOT FOUND"):
-                status = 1
-            else:
-                status = 3
-                
-            result.append((fields[2], int(fields[3]), status, chunk[i]))
-        yield result
-
-class ShareonlineBiz(Hoster):
-    __name__ = "ShareonlineBiz"
-    __type__ = "hoster"
-    __pattern__ = r"(?:http://)?(?:www.)?share-online.biz/(download.php\?id=|dl/)"
-    __version__ = "0.2"
-    __description__ = """Shareonline.biz Download Hoster"""
-    __author_name__ = ("spoob", "mkaay")
-    __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de")
-
-    def setup(self):
-        #self.req.canContinue = self.multiDL = True if self.account else False
-        # range request not working?
-        self.multiDL = True if self.account else False
-
-    def process(self, pyfile):
-        self.convertURL()
-        self.downloadAPIData()
-        pyfile.name = self.api_data["filename"]
-        pyfile.sync()
-        
-        self.downloadHTML()
-        
-        self.download(self.getFileUrl(), cookies=True)
-
-    def downloadAPIData(self):
-        api_url_base = "http://www.share-online.biz/linkcheck/linkcheck.php?md5=1"
-        api_param_file = {"links": self.pyfile.url.replace("http://www.share-online.biz/dl/","")} #api only supports old style links
-        src = self.load(api_url_base, cookies=False, post=api_param_file)
-        
-        fields = src.split(";")
-        self.api_data = {}
-        self.api_data["fileid"] = fields[0]
-        self.api_data["status"] = fields[1]
-        if not self.api_data["status"] == "OK":
-            self.offline()
-        self.api_data["filename"] = fields[2]
-        self.api_data["size"] = fields[3] # in bytes
-        self.api_data["checksum"] = fields[4].strip().lower().replace("\n\n", "") # md5
-
-    def downloadHTML(self):
-        self.html = self.load(self.pyfile.url, cookies=True)
-        
-        if not self.account:
-            html = self.load("%s/free/" % self.pyfile.url, post={"dl_free":"1"}, cookies=True)
-            if re.search(r"/failure/full/1", self.req.lastEffectiveURL):
-                self.setWait(120)
-                self.log.debug("%s: no free slots, waiting 120 seconds" % (self.__name__))
-                self.wait()
-                self.retry()
-            captcha = self.decryptCaptcha("http://www.share-online.biz/captcha.php", get={"rand":"0.%s" % random.randint(10**15,10**16)}, cookies=True)
-                
-            self.log.debug("%s Captcha: %s" % (self.__name__, captcha))
-            sleep(3)
-            
-            html = self.load(self.pyfile.url, post={"captchacode": captcha}, cookies=True)
-            if re.search(r"Der Download ist Ihnen zu langsam", html):
-                #m = re.search("var timeout='(\d+)';", self.html[1])
-                #self.waitUntil = time() + int(m.group(1)) if m else 30
-                return True
-
-            self.retry()
-        else:
-            return True
-    
-    def convertURL(self):
-        self.pyfile.url = self.pyfile.url.replace("http://www.share-online.biz/download.php?id=", "http://www.share-online.biz/dl/")
-    
-    def getFileUrl(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.account:
-            return b64decode(re.search('var dl="(.*?)"', self.html).group(1))
-        file_url_pattern = 'loadfilelink\.decode\("([^"]+)'
-        return b64decode(re.search(file_url_pattern, self.html).group(1))
-
-    def checksum(self, local_file):
-        if self.api_data and self.api_data["checksum"]:
-            h = hashlib.md5()
-            f = open(local_file, "rb")
-            h.update(f.read())
-            f.close()
-            hexd = h.hexdigest()
-            if hexd == self.api_data["checksum"]:
-                return (True, 0)
-            else:
-                return (False, 1)
-        else:
-            return (True, 5)
diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
deleted file mode 100644
index e634607b0..000000000
--- a/module/plugins/hoster/ShragleCom.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import time
-
-from module.plugins.Hoster import Hoster
-
-class ShragleCom(Hoster):
-    __name__ = "ShragleCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://(?:www.)?shragle.com/files/"
-    __version__ = "0.1"
-    __description__ = """Shragle Download PLugin"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
-
-    def __init__(self, parent):
-        Hoster.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.load(url)
-        self.time_plus_wait = time.time() + 10
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-
-        self.fileID = re.search(r"name=\"fileID\" value=\"([^\"]+)", self.html).group(1)
-        self.dlSession = re.search(r"name=\"dlSession\" value=\"([^\"]+)", self.html).group(1)
-        self.userID = ""
-        self.password = ""
-        self.lang = "de"
-        return "http://srv4.shragle.com/download.php"
-
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-
-        file_name_pattern = r"<\/div><h2>(.+)<\/h2"
-        return re.search(file_name_pattern, self.html).group(1)
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-
-        if re.search(r"html", self.html) == None:
-            return False
-        else:
-            return True
-
-    def proceed(self, url, location):
-        self.download(url, location, {'fileID': self.fileID, 'dlSession': self.dlSession, 'userID': self.userID, 'password': self.password, 'lang': self.lang})
diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py
deleted file mode 100644
index f0660b40d..000000000
--- a/module/plugins/hoster/StorageTo.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-
-from module.plugins.Hoster import Hoster
-
-class StorageTo(Hoster):
-    __name__ = "StorageTo"
-    __type__ = "hoster"
-    __pattern__ = r"http://(?:www)?\.storage\.to/get/.*"
-    __version__ = "0.2"
-    __description__ = """Storage.to Download Hoster"""
-    __author_name__ = ("mkaay")
-
-    def setup(self):
-        self.wantReconnect = False
-        self.api_data = None
-        self.html = None
-        self.multiDL = False
-        
-    def process(self, pyfile):
-        self.pyfile = pyfile
-        self.prepare()
-        self.download( self.get_file_url() )
-        
-        
-        
-
-    def prepare(self):
-        pyfile = self.pyfile
-        
-        self.req.clear_cookies()
-
-        self.wantReconnect = False
-
-        if not self.file_exists():
-            self.offline()
-
-        pyfile.name = self.get_file_name()
-        
-        self.setWait( self.get_wait_time() )
-
-        while self.wantReconnect:
-            self.wait()
-            self.download_api_data()
-            self.setWait(  self.get_wait_time() )
-        
-        return True
-    
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.load(url, cookies=True)
-
-    def download_api_data(self):
-        url = self.parent.url
-        info_url = url.replace("/get/", "/getlink/")
-        src = self.load(info_url, cookies=True)
-        pattern = re.compile(r"'(\w+)' : (.*?)[,|\}]")
-        self.api_data = {}
-        for pair in pattern.findall(src):
-            self.api_data[pair[0]] = pair[1].strip("'")
-        print self.api_data
-
-    def get_wait_time(self):
-        if not self.api_data:
-            self.download_api_data()
-        if self.api_data["state"] == "wait":
-            self.wantReconnect = True
-        else:
-            self.wantReconnect = False
-            
-        return int(self.api_data["countdown"]) + 3
-            
-            
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if not self.api_data:
-            self.download_api_data()
-        if self.api_data["state"] == "failed":
-            return False
-        else:
-            return True
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if not self.api_data:
-            self.download_api_data()
-        return self.api_data["link"]
-
-    def get_file_name(self):
-        if not self.html:
-            self.download_html()
-        file_name_pattern = r"<span class=\"orange\">Downloading:</span>(.*?)<span class=\"light\">(.*?)</span>"
-        return re.search(file_name_pattern, self.html).group(1).strip()
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
deleted file mode 100644
index b6bd872f1..000000000
--- a/module/plugins/hoster/UploadedTo.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-from module.plugins.Hoster import Hoster
-from module.network.Request import getURL
-import hashlib
-
-def getInfo(urls):
-    for url in urls:
-        match = re.compile(UploadedTo.__pattern__).search(url)
-        if match:
-            src = getURL("http://uploaded.to/api/file", get={"id": match.group(1).split("/")[0]})
-            if src.find("404 Not Found") >= 0:
-                result.append((url, 0, 1, url))
-                continue
-            lines = src.splitlines()
-            result.append((lines[0], int(lines[1]), 2, url))
-
-class UploadedTo(Hoster):
-    __name__ = "UploadedTo"
-    __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/(?:file/|\?id=)?(.+)"
-    __version__ = "0.4"
-    __description__ = """Uploaded.to Download Hoster"""
-    __author_name__ = ("spoob", "mkaay")
-    __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de")
-
-    
-    def setup(self):
-        self.html = None
-        self.api_data = None
-        self.multiDL = False
-        if self.account:
-            self.multiDL = True
-            self.req.canContinue = True
-        
-    def process(self, pyfile):
-        self.url = False
-        self.pyfile = pyfile
-        self.prepare()
-        self.proceed()
-                
-    
-    def getInfo(self):
-        self.download_api_data()
-        self.pyfile.name = self.api_data["filename"]
-        self.pyfile.sync()
-
-    def prepare(self):        
-        tries = 0
-
-        while not self.url:
-            self.download_html()
-
-            if not self.file_exists():
-                self.offline()
-                
-            self.download_api_data()
-            
-            # self.pyfile.name = self.get_file_name()
-            
-            if self.account:
-                info = self.account.getAccountInfo(self.account.getAccountData(self)[0])
-                self.log.debug(_("%s: Use Premium Account (%sGB left)") % (self.__name__, info["trafficleft"]/1024/1024))
-                if self.api_data["size"]/1024 > info["trafficleft"]:
-                    self.log.info(_("%s: Not enough traffic left" % self.__name__))
-                    self.resetAcount()
-                else:
-                    self.url = self.get_file_url()
-                    self.pyfile.name = self.get_file_name()
-                    return True
-                
-            self.url = self.get_file_url()
-            
-            self.setWait(self.get_waiting_time())
-            self.wait()
-
-            self.pyfile.name = self.get_file_name()
-
-            tries += 1
-            if tries > 5:
-                self.fail("Error while preparing DL")
-        return True
-        
-    def download_api_data(self, force=False):
-        if self.api_data and not force:
-            return
-        match = re.compile(self.__pattern__).search(self.pyfile.url)
-        if match:
-            src = self.load("http://uploaded.to/api/file", cookies=False, get={"id": match.group(1).split("/")[0]})
-            if not src.find("404 Not Found"):
-                return
-            self.api_data = {}
-            lines = src.splitlines()
-            self.api_data["filename"] = lines[0]
-            self.api_data["size"] = int(lines[1]) # in bytes
-            self.api_data["checksum"] = lines[2] #sha1
-
-    def download_html(self):
-        self.html = self.load(self.pyfile.url, cookies=False)
-
-    def get_waiting_time(self):
-        try:
-            wait_minutes = re.search(r"Or wait ([\d\-]+) minutes", self.html).group(1)
-            if int(wait_minutes) < 0: wait_minutes = 1            
-            self.wantReconnect = True
-            return 60 * int(wait_minutes)
-        except:
-            return 0
-
-    def get_file_url(self):
-        if self.account:
-            self.start_dl = True
-            return self.cleanUrl(self.pyfile.url)
-        try:
-            file_url_pattern = r".*<form name=\"download_form\" method=\"post\" action=\"(.*)\">"
-            return re.search(file_url_pattern, self.html).group(1)
-        except:
-            return None
-
-    def get_file_name(self):
-        try:
-            if self.api_data and self.api_data["filename"]:
-                return self.api_data["filename"]
-            file_name = re.search(r"<td><b>\s+(.+)\s", self.html).group(1)
-            file_suffix = re.search(r"</td><td>(\..+)</td></tr>", self.html)
-            if not file_suffix:
-                return file_name
-            return file_name + file_suffix.group(1)
-        except:
-            return self.pyfile.url.split('/')[-1]
-
-    def file_exists(self):
-        if re.search(r"(File doesn't exist)", self.html) != None:
-            return False
-        else:
-            return True
-    
-    def cleanUrl(self, url):
-        url = url.replace("ul.to/", "uploaded.to/file/")
-        url = url.replace("/?id=", "/file/")
-        url = url.replace("?id=", "file/")
-        url = re.sub("/\?(.*?)&id=", "/file/", url, 1)
-        return url
-    
-    def proceed(self):
-        if self.account:
-            self.download(self.url+"?redirect", cookies=True)
-        else:
-            self.download(self.url, cookies=False, post={"download_submit": "Free Download"})
diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py
deleted file mode 100644
index 52ece4ca4..000000000
--- a/module/plugins/hoster/Xdcc.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-

-

-"""

-    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/>.

-    

-    @author: jeix

-"""

-

-import logging

-from os.path import exists

-from os.path import join

-from os.path import exists

-from os import makedirs

-import re

-import sys

-

-from module.plugins.Hoster import Hoster

-

-

-class Xdcc(Hoster):

-    __name__ = "Xdcc"

-    __version__ = "0.2"

-    __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/

-    __type__ = "hoster"

-    __config__ = [

-                    ("nick", "str", "Nickname", "pyload"),

-                    ("ident", "str", "Ident", "pyloadident"),

-                    ("realname", "str", "Realname", "pyloadreal")

-                 ]

-    __description__ = """A Plugin that allows you to download from an IRC XDCC bot"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.com")

-    

-    def process(self, pyfile):

-        self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC")        

-        self.doDownload(pyfile.url)

-

-    def doDownload(self, url):

-        self.pyfile.setStatus("downloading")

-

-        download_folder = self.config['general']['download_folder']

-        location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))

-        if not exists(location): 

-            makedirs(location)

-            

-        m = re.search(r'xdcc://(.*?)/#?(.*?)/(.*?)/#?(\d+)/?', url)

-        server = m.group(1)

-        chan   = m.group(2)

-        bot    = m.group(3)

-        pack   = m.group(4)

-        nick   = self.getConf('nick')

-        ident  = self.getConf('ident')

-        real   = self.getConf('realname')

-        

-        newname = self.req.download(bot, pack, location, nick, ident, real, chan, server)

-        self.pyfile.size = self.req.dl_size

-

-        if newname:

-            self.pyfile.name = newname

-        
\ No newline at end of file
diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
deleted file mode 100644
index 5c07f2c84..000000000
--- a/module/plugins/hoster/YoupornCom.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-
-class YoupornCom(Hoster):
-    __name__ = "YoupornCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?youporn\.com/watch/.+"
-    __version__ = "0.1"
-    __description__ = """Youporn.com Video Download Hoster"""
-    __author_name__ = ("willnix")
-    __author_mail__ = ("willnix@pyload.org")
-
-    def __init__(self, parent):
-        Hoster.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        self.html_old = None         #time() where loaded the HTML
-        self.time_plus_wait = None   #time() + wait in seconds
-
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.load(url, post={"user_choice":"Enter"}, cookies=False)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-
-        file_url = re.search(r'(http://download.youporn.com/download/\d*/.*\?download=1&ll=1&t=dd)">', self.html).group(1)
-        return file_url
-
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-
-        file_name_pattern = r".*<title>(.*) - Free Porn Videos - YouPorn.com Lite \(BETA\)</title>.*"
-        return re.search(file_name_pattern, self.html).group(1).replace("&amp;", "&").replace("/","") + '.flv'
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-        if re.search(r"(.*invalid video_id.*)", self.html) != None:
-            return False
-        else:
-            return True
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
deleted file mode 100644
index 79c359ad7..000000000
--- a/module/plugins/hoster/YoutubeCom.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-
-class YoutubeCom(Hoster):
-    __name__ = "YoutubeCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?(de\.)?\youtube\.com/watch\?v=.*"
-    __version__ = "0.2"
-    __config__ = [ ("quality", "str" , "Quality Setting", "hd") ]
-    __description__ = """Youtube.com Video Download Hoster"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-    
-    def process(self, pyfile):
-        html = self.load(pyfile.url)
-                        
-        if re.search(r"(.*eine fehlerhafte Video-ID\.)", html) != None:
-            self.offline()
-        
-        videoId = pyfile.url.split("v=")[1].split("&")[0]
-        videoHash = re.search(r'&t=(.+?)&', html).group(1)
-        
-        
-        file_name_pattern = '<meta name="title" content="(.+?)">'
-        is_hd_pattern = r"'IS_HD_AVAILABLE': (false|true)"
-        file_suffix = ".flv"
-        is_hd = re.search(is_hd_pattern, html).group(1)
-        hd_available = (is_hd == "true")
-        
-        if self.getConf("quality") == "hd" or self.getConf("quality") == "hq":
-            file_suffix = ".mp4"
-
-        name = (re.search(file_name_pattern, html).group(1).replace("/", "") + file_suffix).decode("utf8")
-        pyfile.name = name #.replace("&amp;", "&").replace("ö", "oe").replace("ä", "ae").replace("ü", "ue")        
-
-        if self.getConf("quality") == "sd":
-            quality = "&fmt=6"
-        elif self.getConf("quality") == "hd" and hd_available:
-            quality = "&fmt=22"
-        else:
-            quality = "&fmt=18"
-            
-        file_url = 'http://youtube.com/get_video?video_id=' + videoId + '&t=' + videoHash + quality + "&asv=2"
-
-        self.download(file_url)
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
deleted file mode 100644
index 3740f8c14..000000000
--- a/module/plugins/hoster/ZippyshareCom.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-from module.plugins.Hoster import Hoster
-
-class ZippyshareCom(Hoster):
-    __name__ = "ZippyshareCom"
-    __type__ = "hoster"
-    __pattern__ = r"(http://)?www?\d{0,2}\.zippyshare.com/v/"
-    __version__ = "0.2"
-    __description__ = """Zippyshare.com Download Hoster"""
-    __author_name__ = ("spoob")
-    __author_mail__ = ("spoob@pyload.org")
-
-    def setup(self):
-        self.html = None
-        self.wantReconnect = False
-        self.multiDL = False
-    
-    def process(self, pyfile):
-        self.pyfile = pyfile
-        self.download_html()
-        if not self.file_exists():
-            self.offline()
-            
-        pyfile.name = self.get_file_name()
-        self.download(self.get_file_url())
-
-    def download_html(self):
-        url = self.pyfile.url
-        self.html = self.load(url, cookies=True)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        file_url_pattern = r"var \w* = '(http%.*?)';"
-        file_url_search = re.search(file_url_pattern, self.html).group(1)
-        file_url = urllib.unquote(file_url_search.replace("nnn", "aaa").replace("unlg", "v").replace("serwus", "zippyshare"))
-        return file_url
-        
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-        if not self.wantReconnect:
-            file_name = re.search(r'Name: </font> <font.*>(.*?)</font>', self.html).group(1)
-            return file_name
-        else:
-            return self.pyfile.url
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-        if re.search(r'File does not exist on this server', self.html) != None:
-            return False
-        else:
-            return True
diff --git a/module/plugins/hoster/__init__.py b/module/plugins/hoster/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/hoster/__init__.py
+++ /dev/null