From 81508f295cffc40c479fe72f24bdf1dbbedf5d92 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Wed, 5 May 2010 23:03:43 +0200
Subject: refactored plugins, new plugin manager

---
 module/plugins/Container.py                  |  29 +++
 module/plugins/Crypter.py                    |  28 +++
 module/plugins/Hook.py                       |  16 +-
 module/plugins/Hoster.py                     |  29 +++
 module/plugins/Plugin.py                     |  29 ++-
 module/plugins/container/CCF.py              |  21 +-
 module/plugins/container/LinkList.py         |  21 +-
 module/plugins/container/RSDF.py             |  21 +-
 module/plugins/crypter/DDLMusicOrg.py        |  56 +++++
 module/plugins/crypter/FourChanOrg.py        |  39 ++++
 module/plugins/crypter/HoerbuchIn.py         |  46 ++++
 module/plugins/crypter/LixIn.py              |  34 +++
 module/plugins/crypter/OneKhDe.py            |  36 +++
 module/plugins/crypter/RSLayerCom.py         |  37 +++
 module/plugins/crypter/RelinkUs.py           |  58 +++++
 module/plugins/crypter/SecuredIn.py          | 334 ++++++++++++++++++++++++++
 module/plugins/crypter/SerienjunkiesOrg.py   | 217 +++++++++++++++++
 module/plugins/crypter/StealthTo.py          |  45 ++++
 module/plugins/crypter/YoutubeChannel.py     |  52 +++++
 module/plugins/crypter/__init__.py           |   0
 module/plugins/decrypter/DDLMusicOrg.py      |  58 -----
 module/plugins/decrypter/FourChanOrg.py      |  41 ----
 module/plugins/decrypter/HoerbuchIn.py       |  48 ----
 module/plugins/decrypter/LixIn.py            |  36 ---
 module/plugins/decrypter/OneKhDe.py          |  38 ---
 module/plugins/decrypter/RSLayerCom.py       |  39 ----
 module/plugins/decrypter/RelinkUs.py         |  60 -----
 module/plugins/decrypter/SecuredIn.py        | 335 ---------------------------
 module/plugins/decrypter/SerienjunkiesOrg.py | 217 -----------------
 module/plugins/decrypter/StealthTo.py        |  47 ----
 module/plugins/decrypter/YoutubeChannel.py   |  54 -----
 module/plugins/decrypter/__init__.py         |   0
 module/plugins/hooks/ClickAndLoad.py         |  14 +-
 module/plugins/hooks/ContainerDownload.py    |  14 +-
 module/plugins/hooks/ExternalScripts.py      |  14 +-
 module/plugins/hooks/LinuxFileEvents.py      |  11 +-
 module/plugins/hoster/DepositfilesCom.py     |  22 +-
 module/plugins/hoster/DuckloadCom.py         |  22 +-
 module/plugins/hoster/FilefactoryCom.py      |  22 +-
 module/plugins/hoster/FilesmonsterCom.py     |  24 +-
 module/plugins/hoster/FreakshareNet.py       |  22 +-
 module/plugins/hoster/GigasizeCom.py         |  22 +-
 module/plugins/hoster/HotfileCom.py          |  22 +-
 module/plugins/hoster/MegauploadCom.py       |  22 +-
 module/plugins/hoster/MegavideoCom.py        |  23 +-
 module/plugins/hoster/MyvideoDe.py           |  23 +-
 module/plugins/hoster/NetloadIn.py           |  22 +-
 module/plugins/hoster/RapidshareCom.py       |  22 +-
 module/plugins/hoster/ShareonlineBiz.py      |  22 +-
 module/plugins/hoster/ShragleCom.py          |  22 +-
 module/plugins/hoster/StorageTo.py           |  21 +-
 module/plugins/hoster/UploadedTo.py          |  22 +-
 module/plugins/hoster/XupIn.py               |  22 +-
 module/plugins/hoster/YoupornCom.py          |  22 +-
 module/plugins/hoster/YoutubeCom.py          |  22 +-
 module/plugins/hoster/ZippyshareCom.py       |  22 +-
 module/plugins/hoster/ZshareNet.py           |  22 +-
 57 files changed, 1322 insertions(+), 1317 deletions(-)
 create mode 100644 module/plugins/Container.py
 create mode 100644 module/plugins/Crypter.py
 create mode 100644 module/plugins/Hoster.py
 create mode 100644 module/plugins/crypter/DDLMusicOrg.py
 create mode 100644 module/plugins/crypter/FourChanOrg.py
 create mode 100644 module/plugins/crypter/HoerbuchIn.py
 create mode 100644 module/plugins/crypter/LixIn.py
 create mode 100644 module/plugins/crypter/OneKhDe.py
 create mode 100644 module/plugins/crypter/RSLayerCom.py
 create mode 100644 module/plugins/crypter/RelinkUs.py
 create mode 100644 module/plugins/crypter/SecuredIn.py
 create mode 100644 module/plugins/crypter/SerienjunkiesOrg.py
 create mode 100644 module/plugins/crypter/StealthTo.py
 create mode 100644 module/plugins/crypter/YoutubeChannel.py
 create mode 100644 module/plugins/crypter/__init__.py
 delete mode 100644 module/plugins/decrypter/DDLMusicOrg.py
 delete mode 100644 module/plugins/decrypter/FourChanOrg.py
 delete mode 100644 module/plugins/decrypter/HoerbuchIn.py
 delete mode 100644 module/plugins/decrypter/LixIn.py
 delete mode 100644 module/plugins/decrypter/OneKhDe.py
 delete mode 100644 module/plugins/decrypter/RSLayerCom.py
 delete mode 100644 module/plugins/decrypter/RelinkUs.py
 delete mode 100644 module/plugins/decrypter/SecuredIn.py
 delete mode 100644 module/plugins/decrypter/SerienjunkiesOrg.py
 delete mode 100644 module/plugins/decrypter/StealthTo.py
 delete mode 100644 module/plugins/decrypter/YoutubeChannel.py
 delete mode 100644 module/plugins/decrypter/__init__.py

(limited to 'module/plugins')

diff --git a/module/plugins/Container.py b/module/plugins/Container.py
new file mode 100644
index 000000000..2a7196f14
--- /dev/null
+++ b/module/plugins/Container.py
@@ -0,0 +1,29 @@
+# -*- 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 Container(Plugin):
+    __name__ = "Container"
+    __version__ = "0.1"
+    __pattern__ = None
+    __type__ = "container"
+    __description__ = """Base container plugin"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
new file mode 100644
index 000000000..31ea43262
--- /dev/null
+++ b/module/plugins/Crypter.py
@@ -0,0 +1,28 @@
+# -*- 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 Crypter(Plugin):
+    __version__ = "0.1"
+    __pattern__ = None
+    __type__ = "container"
+    __description__ = """Base crypter plugin"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
diff --git a/module/plugins/Hook.py b/module/plugins/Hook.py
index 4a385c417..81188c147 100644
--- a/module/plugins/Hook.py
+++ b/module/plugins/Hook.py
@@ -22,22 +22,22 @@ import logging
 
 
 class Hook():
+    __name__ = "Hook"
+    __version__ = "0.2"
+    __type__ = "hook"
+    __description__ = """interface for hook"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
+    
     def __init__(self, core):
         self.logger = logging.getLogger("log")
         self.configParser = core.parser_plugins
         self.config = {}
-        props = {}
-        props['name'] = "Hook"
-        props['version'] = "0.2"
-        props['description'] = """interface for hook"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
         self.core = core
     
     def readConfig(self):
         self.configParser.loadData()
-        section = self.props['name']
+        section = self.__name__
         try:
             self.config = self.configParser.getConfig()[section]
         except:
diff --git a/module/plugins/Hoster.py b/module/plugins/Hoster.py
new file mode 100644
index 000000000..0ed528924
--- /dev/null
+++ b/module/plugins/Hoster.py
@@ -0,0 +1,29 @@
+# -*- 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")
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
index c4ac8ee12..107c4f0ca 100644
--- a/module/plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -32,19 +32,17 @@ from os import makedirs
 from module.DownloadThread import CaptchaError
 
 class Plugin():
-
+    __name__ = "Plugin"
+    __version__ = "0.4"
+    __pattern__ = None
+    __type__ = "hoster"
+    __description__ = """Base Plugin"""
+    __author_name__ = ("RaNaN", "spoob", "mkaay")
+    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "mkaay@mkaay.de")
+    
     def __init__(self, parent):
         self.configparser = parent.core.parser_plugins
         self.config = {}
-        props = {}
-        props['name'] = "BasePlugin"
-        props['version'] = "0.3"
-        props['pattern'] = None
-        props['type'] = "hoster"
-        props['description'] = """Base Plugin"""
-        props['author_name'] = ("RaNaN", "spoob", "mkaay")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org", "mkaay@mkaay.de")
-        self.props = props
         self.parent = parent
         self.req = Request()
         self.html = 0
@@ -115,20 +113,20 @@ class Plugin():
 
     def set_config(self):
         for k, v in self.config.items():
-            self.configparser.set(self.props['name'], {"option": k}, v)
+            self.configparser.set(self.__name__, {"option": k}, v)
 
     def remove_config(self, option):
-        self.configparser.remove(self.props['name'], option)
+        self.configparser.remove(self.__name__, option)
 
     def get_config(self, value, default=None):
         self.configparser.loadData()
-        return self.configparser.get(self.props['name'], value, default=default)
+        return self.configparser.get(self.__name__, value, default=default)
 
     def read_config(self):
         self.configparser.loadData()
         try:
             self.verify_config()
-            self.config = self.configparser.getConfig()[self.props['name']]
+            self.config = self.configparser.getConfig()[self.__name__]
         except:
             pass
     
@@ -136,8 +134,7 @@ class Plugin():
         pass
 
     def init_ocr(self):
-        modul = __import__("module.plugins.captcha." + self.props['name'], fromlist=['captcha'])
-        captchaClass = getattr(modul, self.props['name'])
+        captchaClass = self.core.pluginManager.getCaptchaPlugin(self.__name__)
         self.ocr = captchaClass()
 
     def __call__(self):
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 9d7116900..1e25ef623 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -5,22 +5,19 @@ import re
 import tempfile
 import urllib2
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 from module.network.MultipartPostHandler import MultipartPostHandler
 
-class CCF(Plugin):
+class CCF(Container):
+    __name__ = "CCF"
+    __version__ = "0.1"
+    __pattern__ = r"(?!http://).*\.ccf"
+    __description__ = """CCF Container Convert Plugin"""
+    __author_name__ = ("Willnix")
+    __author_mail__ = ("Willnix@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "CCF"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.ccf"
-        props['version'] = "0.1"
-        props['description'] = """CCF Container Convert Plugin"""
-        props['author_name'] = ("Willnix")
-        props['author_mail'] = ("Willnix@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.multi_dl = True
         self.links = []
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index b45ab83d0..cadf491a9 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -2,21 +2,18 @@
 # -*- coding: utf-8 -*-
 
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 
-class LinkList(Plugin):
+class LinkList(Container):
+    __name__ = "LinkList"
+    __version__ = "0.1"
+    __pattern__ = r"(?!http://).*\.txt"
+    __description__ = """Read Link Lists in txt format"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "LinkList"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.txt"
-        props['version'] = "0.1"
-        props['description'] = """Read Link Lists in txt format"""
-        props['author_name'] = ("Spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.read_config()
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index 9604495fd..c906fe05a 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -4,21 +4,18 @@
 import base64
 import binascii
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 
-class RSDF(Plugin):
+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 __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RSDF"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.rsdf"
-        props['version'] = "0.2"
-        props['description'] = """RSDF Container Decode Plugin"""
-        props['author_name'] = ("RaNaN", "spoob")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.multi_dl = True
         self.links = []
diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
new file mode 100644
index 000000000..1c5632cda
--- /dev/null
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -0,0 +1,56 @@
+#!/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.1"
+    __description__ = """ddl-music.org 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 download_html(self):
+        url = self.parent.url
+        self.html = self.req.load(url, cookies=True)
+
+    def file_exists(self):
+        """ returns True or False
+        """
+        if not self.html:
+            self.download_html()
+        if re.search(r"Wer dies nicht rechnen kann", self.html) != None:
+            return True
+        return False
+
+    def proceed(self, url, location):
+        for i in range(5):
+            self.download_html()
+            posturl = re.search(r"id=\"captcha\" action=\"(/captcha/ddlm_cr\d\.php)\"", self.html).group(1)
+            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("http://ddl-music.org%s" % posturl, 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.links = [m.group(1)]
+                return
+        self.links = False
diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
new file mode 100644
index 000000000..cbcdd920c
--- /dev/null
+++ b/module/plugins/crypter/FourChanOrg.py
@@ -0,0 +1,39 @@
+#!/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
new file mode 100644
index 000000000..a40e5104b
--- /dev/null
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -0,0 +1,46 @@
+#!/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
new file mode 100644
index 000000000..168be2c27
--- /dev/null
+++ b/module/plugins/crypter/LixIn.py
@@ -0,0 +1,34 @@
+#!/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/OneKhDe.py b/module/plugins/crypter/OneKhDe.py
new file mode 100644
index 000000000..c77203187
--- /dev/null
+++ b/module/plugins/crypter/OneKhDe.py
@@ -0,0 +1,36 @@
+#!/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
new file mode 100644
index 000000000..9ce211aa1
--- /dev/null
+++ b/module/plugins/crypter/RSLayerCom.py
@@ -0,0 +1,37 @@
+#!/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
new file mode 100644
index 000000000..e043e65a9
--- /dev/null
+++ b/module/plugins/crypter/RelinkUs.py
@@ -0,0 +1,58 @@
+#!/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
new file mode 100644
index 000000000..5a246075f
--- /dev/null
+++ b/module/plugins/crypter/SecuredIn.py
@@ -0,0 +1,334 @@
+# -*- 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
new file mode 100644
index 000000000..af95a9c78
--- /dev/null
+++ b/module/plugins/crypter/SerienjunkiesOrg.py
@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.Plugin import Plugin
+from module.BeautifulSoup import BeautifulSoup
+from module.unescape import unescape
+from module.DownloadThread import CaptchaError
+
+class SerienjunkiesOrg(Plugin):
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "SerienjunkiesOrg"
+        props['type'] = "container"
+        props['pattern'] = r"http://.*?serienjunkies.org/.*?"
+        props['version'] = "0.2"
+        props['description'] = """serienjunkies.org Container Plugin"""
+        props['author_name'] = ("mkaay")
+        props['author_mail'] = ("mkaay@mkaay.de")
+        self.props = props
+        self.parent = parent
+        self.html = None
+        self.multi_dl = False
+        
+        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())
+        episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html$")
+        oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$")
+        if episodePattern.match(self.parent.url) or oldStyleLink.match(self.parent.url):
+            self.decryptNow = False
+        else:
+            self.decryptNow = True
+    
+    def prepare(self, thread):
+        pyfile = self.parent
+
+        self.want_reconnect = False
+
+        pyfile.status.exists = self.file_exists()
+
+        if not pyfile.status.exists:
+            raise Exception, "File not found"
+            return False
+
+        pyfile.status.filename = self.get_file_name()
+            
+        pyfile.status.waituntil = self.time_plus_wait
+        pyfile.status.url = self.get_file_url()
+        pyfile.status.want_reconnect = self.want_reconnect
+
+        thread.wait(self.parent)
+        
+        return True
+    
+    def get_file_name(self):
+        showPattern = re.compile("^http://serienjunkies.org/serie/(.*)/$")
+        seasonPattern = re.compile("^http://serienjunkies.org/.*?/(.*)/$")
+        m = showPattern.match(self.parent.url)
+        if not m:
+            m = seasonPattern.match(self.parent.url)
+        if m:
+            return m.group(1)
+        return "n/a"
+    
+    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 file_exists(self):
+        return True
+    
+    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.get_config("preferredHoster").split(",")
+        self.logger.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)
+                    val = v.nextSibling
+                    val = val.encode("utf-8")
+                    val = unescape(val)
+                    val = val.replace("|", "").strip()
+                    n = n.strip()
+                    n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
+                    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"])
+        packages = {}
+        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-.*?/([rcfultns]{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
+            packages[package] = links
+        return packages
+    
+    def handleEpisode(self, url):
+        if not self.parent.core.isGUIConnected():
+            raise CaptchaError
+        for i in range(3):
+            src = self.getSJSrc(url)
+            if not src.find("Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
+                self.logger.info("Downloadlimit reached")
+                return False
+            else:
+                soup = BeautifulSoup(src)
+                form = soup.find("form")
+                captchaTag = soup.find(attrs={"src":re.compile("^/secure/")})
+                captchaUrl = "http://download.serienjunkies.org"+captchaTag["src"]
+                captchaData = self.req.load(str(captchaUrl))
+                result = self.waitForCaptcha(captchaData, "png")
+                url = "http://download.serienjunkies.org"+form["action"]
+                sinp = form.find(attrs={"name":"s"})
+                
+                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:
+                    continue
+                
+                links = []
+                for link in rawLinks:
+                    frameUrl = link["action"].replace("/go-", "/frame/go-")
+                    links.append(self.handleFrame(frameUrl))
+                return links
+    
+    def handleOldStyleLink(self, url):
+        if not self.parent.core.isGUIConnected():
+            raise CaptchaError
+        for i in range(3):
+            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):
+                continue
+            return [decrypted]
+        return False
+    
+    def handleFrame(self, url):
+        self.req.load(str(url), cookies=False, just_header=True)
+        return self.req.lastEffectiveURL
+    
+    def proceed(self, url, location):
+        links = False
+        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-.*?/$")
+        showPattern = re.compile("^http://serienjunkies.org/serie/.*/$")
+        seasonPattern = re.compile("^http://serienjunkies.org/.*?/.*/$")
+        if framePattern.match(url):
+            links = [self.handleFrame(url)]
+        elif episodePattern.match(url):
+            links = self.handleEpisode(url)
+        elif oldStyleLink.match(url):
+            links = self.handleOldStyleLink(url)
+        elif showPattern.match(url):
+            pass
+        elif seasonPattern.match(url):
+            links = self.handleSeason(url)
+        self.links = links
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
new file mode 100644
index 000000000..cf7a79e9b
--- /dev/null
+++ b/module/plugins/crypter/StealthTo.py
@@ -0,0 +1,45 @@
+#!/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/YoutubeChannel.py b/module/plugins/crypter/YoutubeChannel.py
new file mode 100644
index 000000000..292be06af
--- /dev/null
+++ b/module/plugins/crypter/YoutubeChannel.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.Crypter import Crypter
+
+class YoutubeChannel(Crypter):
+    __name__ = "YoutubeChannel"
+    __type__ = "container"
+    __pattern__ = r"http://(www\.)?(de\.)?\youtube\.com/user/*"
+    __version__ = "0.9"
+    __description__ = """Youtube.com Channel Download Plugin"""
+    __author_name__ = ("RaNaN", "Spoob")
+    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
+
+    def __init__(self, parent):
+        Crypter.__init__(self, parent)
+        self.parent = parent
+        self.html = None
+        self.read_config()
+        self.user = re.search(r"/user/(.+)", self.parent.url).group(1).split("#")[0]
+
+    def file_exists(self):
+        if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/users/%s" % self.user):
+            return False
+        return True
+
+    def proceed(self, url, location):
+        max_videos = self.config['max_videos']
+        if not max_videos:
+            max_videos = 1000 #max video a user can upload
+        page = 0
+        temp_links = []
+        if "," in self.config['video_groups']:
+            video_groups = self.config['video_groups'].split(",")
+        else:
+            video_groups = [self.config['video_groups']]
+        for group in video_groups:
+            for start_index in range(1, int(max_videos), 50):
+                max_results = max_videos - page * 50
+                if max_results > 50:
+                    max_results = 50
+                url = "http://gdata.youtube.com/feeds/api/users/%s/%s?max-results=%i&start-index=%i" % (self.user, group, max_results, start_index)
+                rep = self.req.load(url)
+                new_links = re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)&", rep)
+                if new_links != []:
+                    temp_links.extend(new_links)
+                else:
+                    break
+                page += 1
+        self.links = temp_links
diff --git a/module/plugins/crypter/__init__.py b/module/plugins/crypter/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/module/plugins/decrypter/DDLMusicOrg.py b/module/plugins/decrypter/DDLMusicOrg.py
deleted file mode 100644
index 63c684ff8..000000000
--- a/module/plugins/decrypter/DDLMusicOrg.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import sleep
-
-from module.plugins.Plugin import Plugin
-
-class DDLMusicOrg(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "DDLMusicOrg"
-        props['type'] = "container"
-        props['pattern'] = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
-        props['version'] = "0.1"
-        props['description'] = """ddl-music.org Container Plugin"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url, cookies=True)
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if not self.html:
-            self.download_html()
-        if re.search(r"Wer dies nicht rechnen kann", self.html) != None:
-            return True
-        return False
-
-    def proceed(self, url, location):
-        for i in range(5):
-            self.download_html()
-            posturl = re.search(r"id=\"captcha\" action=\"(/captcha/ddlm_cr\d\.php)\"", self.html).group(1)
-            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("http://ddl-music.org%s" % posturl, 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.links = [m.group(1)]
-                return
-        self.links = False
diff --git a/module/plugins/decrypter/FourChanOrg.py b/module/plugins/decrypter/FourChanOrg.py
deleted file mode 100644
index 8960c74eb..000000000
--- a/module/plugins/decrypter/FourChanOrg.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-
-class FourChanOrg(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "FourChanOrg"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?(img\.)?(zip\.)?4chan.org/\w+/(res/|imgboard\.html)"
-        props['version'] = "0.1"
-        props['description'] = """4chan.org Thread Download Plugin"""
-        props['author_name'] = ("Spoob")
-        props['author_mail'] = ("Spoob@pyload.org")
-        self.props = props
-        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/decrypter/HoerbuchIn.py b/module/plugins/decrypter/HoerbuchIn.py
deleted file mode 100644
index a318a00be..000000000
--- a/module/plugins/decrypter/HoerbuchIn.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-
-class HoerbuchIn(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "HoerbuchIn"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?hoerbuch\.in/(blog\.php\?id=|download_(.*)\.html)"
-        props['version'] = "0.4"
-        props['description'] = """Hoerbuch.in Container Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        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/decrypter/LixIn.py b/module/plugins/decrypter/LixIn.py
deleted file mode 100644
index c44f7e9da..000000000
--- a/module/plugins/decrypter/LixIn.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-
-class LixIn(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "LixIn"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www.)?lix.in/"
-        props['version'] = "0.1"
-        props['description'] = """Lix.in Container Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        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/decrypter/OneKhDe.py b/module/plugins/decrypter/OneKhDe.py
deleted file mode 100644
index 9db0a0147..000000000
--- a/module/plugins/decrypter/OneKhDe.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.unescape import unescape
-from module.plugins.Plugin import Plugin
-
-class OneKhDe(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "OneKhDe"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?1kh.de/f/"
-        props['version'] = "0.1"
-        props['description'] = """1kh.de Container Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        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/decrypter/RSLayerCom.py b/module/plugins/decrypter/RSLayerCom.py
deleted file mode 100644
index a939d9b1f..000000000
--- a/module/plugins/decrypter/RSLayerCom.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.unescape import unescape
-from module.plugins.Plugin import Plugin
-
-class RSLayerCom(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RSLayerCom"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?rs-layer.com/directory-"
-        props['version'] = "0.1"
-        props['description'] = """RS-Layer.com Container Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        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/decrypter/RelinkUs.py b/module/plugins/decrypter/RelinkUs.py
deleted file mode 100644
index c8f8c4084..000000000
--- a/module/plugins/decrypter/RelinkUs.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import time
-
-from module.plugins.Plugin import Plugin
-
-class RelinkUs(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RelinkUs"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?relink.us/(f|((view|go).php))"
-        props['version'] = "1"
-        props['description'] = """Relink.us Container Plugin"""
-        props['author_name'] = ("Sleeper-", "spoob")
-        props['author_mail'] = ("@nonymous", "spoob@pyload.org")
-        self.props = props
-        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/decrypter/SecuredIn.py b/module/plugins/decrypter/SecuredIn.py
deleted file mode 100644
index 5ec33e5c2..000000000
--- a/module/plugins/decrypter/SecuredIn.py
+++ /dev/null
@@ -1,335 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-from module.BeautifulSoup import BeautifulSoup
-
-from math import ceil
-
-class SecuredIn(Plugin):
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "SecuredIn"
-        props['type'] = "container"
-        props['pattern'] = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html"
-        props['version'] = "0.1"
-        props['description'] = """secured.in Container Plugin"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
-        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/decrypter/SerienjunkiesOrg.py b/module/plugins/decrypter/SerienjunkiesOrg.py
deleted file mode 100644
index af95a9c78..000000000
--- a/module/plugins/decrypter/SerienjunkiesOrg.py
+++ /dev/null
@@ -1,217 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-from module.BeautifulSoup import BeautifulSoup
-from module.unescape import unescape
-from module.DownloadThread import CaptchaError
-
-class SerienjunkiesOrg(Plugin):
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "SerienjunkiesOrg"
-        props['type'] = "container"
-        props['pattern'] = r"http://.*?serienjunkies.org/.*?"
-        props['version'] = "0.2"
-        props['description'] = """serienjunkies.org Container Plugin"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-        
-        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())
-        episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html$")
-        oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$")
-        if episodePattern.match(self.parent.url) or oldStyleLink.match(self.parent.url):
-            self.decryptNow = False
-        else:
-            self.decryptNow = True
-    
-    def prepare(self, thread):
-        pyfile = self.parent
-
-        self.want_reconnect = False
-
-        pyfile.status.exists = self.file_exists()
-
-        if not pyfile.status.exists:
-            raise Exception, "File not found"
-            return False
-
-        pyfile.status.filename = self.get_file_name()
-            
-        pyfile.status.waituntil = self.time_plus_wait
-        pyfile.status.url = self.get_file_url()
-        pyfile.status.want_reconnect = self.want_reconnect
-
-        thread.wait(self.parent)
-        
-        return True
-    
-    def get_file_name(self):
-        showPattern = re.compile("^http://serienjunkies.org/serie/(.*)/$")
-        seasonPattern = re.compile("^http://serienjunkies.org/.*?/(.*)/$")
-        m = showPattern.match(self.parent.url)
-        if not m:
-            m = seasonPattern.match(self.parent.url)
-        if m:
-            return m.group(1)
-        return "n/a"
-    
-    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 file_exists(self):
-        return True
-    
-    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.get_config("preferredHoster").split(",")
-        self.logger.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)
-                    val = v.nextSibling
-                    val = val.encode("utf-8")
-                    val = unescape(val)
-                    val = val.replace("|", "").strip()
-                    n = n.strip()
-                    n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
-                    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"])
-        packages = {}
-        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-.*?/([rcfultns]{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
-            packages[package] = links
-        return packages
-    
-    def handleEpisode(self, url):
-        if not self.parent.core.isGUIConnected():
-            raise CaptchaError
-        for i in range(3):
-            src = self.getSJSrc(url)
-            if not src.find("Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
-                self.logger.info("Downloadlimit reached")
-                return False
-            else:
-                soup = BeautifulSoup(src)
-                form = soup.find("form")
-                captchaTag = soup.find(attrs={"src":re.compile("^/secure/")})
-                captchaUrl = "http://download.serienjunkies.org"+captchaTag["src"]
-                captchaData = self.req.load(str(captchaUrl))
-                result = self.waitForCaptcha(captchaData, "png")
-                url = "http://download.serienjunkies.org"+form["action"]
-                sinp = form.find(attrs={"name":"s"})
-                
-                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:
-                    continue
-                
-                links = []
-                for link in rawLinks:
-                    frameUrl = link["action"].replace("/go-", "/frame/go-")
-                    links.append(self.handleFrame(frameUrl))
-                return links
-    
-    def handleOldStyleLink(self, url):
-        if not self.parent.core.isGUIConnected():
-            raise CaptchaError
-        for i in range(3):
-            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):
-                continue
-            return [decrypted]
-        return False
-    
-    def handleFrame(self, url):
-        self.req.load(str(url), cookies=False, just_header=True)
-        return self.req.lastEffectiveURL
-    
-    def proceed(self, url, location):
-        links = False
-        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-.*?/$")
-        showPattern = re.compile("^http://serienjunkies.org/serie/.*/$")
-        seasonPattern = re.compile("^http://serienjunkies.org/.*?/.*/$")
-        if framePattern.match(url):
-            links = [self.handleFrame(url)]
-        elif episodePattern.match(url):
-            links = self.handleEpisode(url)
-        elif oldStyleLink.match(url):
-            links = self.handleOldStyleLink(url)
-        elif showPattern.match(url):
-            pass
-        elif seasonPattern.match(url):
-            links = self.handleSeason(url)
-        self.links = links
diff --git a/module/plugins/decrypter/StealthTo.py b/module/plugins/decrypter/StealthTo.py
deleted file mode 100644
index af8600274..000000000
--- a/module/plugins/decrypter/StealthTo.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-
-class StealthTo(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "StealthTo"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?stealth.to/folder/"
-        props['version'] = "0.1"
-        props['description'] = """Stealth.to Container Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        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/decrypter/YoutubeChannel.py b/module/plugins/decrypter/YoutubeChannel.py
deleted file mode 100644
index 497bf5853..000000000
--- a/module/plugins/decrypter/YoutubeChannel.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Plugin import Plugin
-
-class YoutubeChannel(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "YoutubeChannel"
-        props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?(de\.)?\youtube\.com/user/*"
-        props['version'] = "0.9"
-        props['description'] = """Youtube.com Channel Download Plugin"""
-        props['author_name'] = ("RaNaN", "Spoob")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
-        self.props = props
-        self.parent = parent
-        self.html = None
-        self.read_config()
-        self.user = re.search(r"/user/(.+)", self.parent.url).group(1).split("#")[0]
-
-    def file_exists(self):
-        if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/users/%s" % self.user):
-            return False
-        return True
-
-    def proceed(self, url, location):
-        max_videos = self.config['max_videos']
-        if not max_videos:
-            max_videos = 1000 #max video a user can upload
-        page = 0
-        temp_links = []
-        if "," in self.config['video_groups']:
-            video_groups = self.config['video_groups'].split(",")
-        else:
-            video_groups = [self.config['video_groups']]
-        for group in video_groups:
-            for start_index in range(1, int(max_videos), 50):
-                max_results = max_videos - page * 50
-                if max_results > 50:
-                    max_results = 50
-                url = "http://gdata.youtube.com/feeds/api/users/%s/%s?max-results=%i&start-index=%i" % (self.user, group, max_results, start_index)
-                rep = self.req.load(url)
-                new_links = re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)&", rep)
-                if new_links != []:
-                    temp_links.extend(new_links)
-                else:
-                    break
-                page += 1
-        self.links = temp_links
diff --git a/module/plugins/decrypter/__init__.py b/module/plugins/decrypter/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index 52088bf29..adb26eab0 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -25,15 +25,11 @@ import thread
 from module.plugins.Hook import Hook
 
 class ClickAndLoad(Hook):
-    def __init__(self, core):
-        Hook.__init__(self, core)
-        props = {}
-        props['name'] = "ClickAndLoad"
-        props['version'] = "0.2"
-        props['description'] = """Gives abillity to use jd's click and load. depends on webinterface"""
-        props['author_name'] = ("RaNaN", "mkaay")
-        props['author_mail'] = ("RaNaN@pyload.de", "mkaay@mkaay.de")
-        self.props = props
+    __name__ = "ClickAndLoad"
+    __version__ = "0.2"
+    __description__ = """Gives abillity to use jd's click and load. depends on webinterface"""
+    __author_name__ = ("RaNaN", "mkaay")
+    __author_mail__ = ("RaNaN@pyload.de", "mkaay@mkaay.de")
     
     def coreReady(self):
     	self.port = int(self.core.config['webinterface']['port'])
diff --git a/module/plugins/hooks/ContainerDownload.py b/module/plugins/hooks/ContainerDownload.py
index f520b705c..673931391 100644
--- a/module/plugins/hooks/ContainerDownload.py
+++ b/module/plugins/hooks/ContainerDownload.py
@@ -23,15 +23,11 @@ from module.plugins.Hook import Hook
 from os.path import join, abspath
 
 class ContainerDownload(Hook):
-    def __init__(self, core):
-        Hook.__init__(self, core)
-        props = {}
-        props['name'] = "ContainerDownload"
-        props['version'] = "0.1"
-        props['description'] = """add the downloaded container to current package"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
+    __name__ = "ContainerDownload"
+    __version__ = "0.1"
+    __description__ = """add the downloaded container to current package"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
     
     def downloadFinished(self, pyfile):
         filename = pyfile.status.filename
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 50f6149a2..9e0f3855c 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -24,16 +24,14 @@ from os import listdir, sep
 from os.path import join
 
 class ExternalScripts(Hook):
+    __name__ = "ExternalScripts"
+    __version__ = "0.1"
+    __description__ = """run external scripts"""
+    __author_name__ = ("mkaay", "RaNaN", "spoob")
+    __author_mail__ = ("mkaay@mkaay.de", "ranan@pyload.org", "spoob@pyload.org")
+    
     def __init__(self, core):
         Hook.__init__(self, core)
-        props = {}
-        props['name'] = "ExternalScripts"
-        props['version'] = "0.1"
-        props['description'] = """run external scripts"""
-        props['author_name'] = ("mkaay", "RaNaN", "spoob")
-        props['author_mail'] = ("mkaay@mkaay.de", "ranan@pyload.org", "spoob@pyload.org")
-        self.props = props
-        self.core = core
         self.scripts = {}
         
         script_folders = [join(core.path, 'scripts','download_preparing'),
diff --git a/module/plugins/hooks/LinuxFileEvents.py b/module/plugins/hooks/LinuxFileEvents.py
index da1b06f13..44f3f00e8 100644
--- a/module/plugins/hooks/LinuxFileEvents.py
+++ b/module/plugins/hooks/LinuxFileEvents.py
@@ -22,14 +22,15 @@ from module.plugins.Hook import Hook
 import os
 
 class LinuxFileEvents(Hook):
+    __name__ = "LinuxFileEvents"
+    __version__ = "0.1"
+    __description__ = """monitors files and directories for changes"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
+    
     def __init__(self, core):
         Hook.__init__(self, core)
         props = {}
-        props['name'] = "LinuxFileEvents"
-        props['version'] = "0.1"
-        props['description'] = """monitors files and directories for changes"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
         self.props = props
 
         return #@TODO remove when working correctly
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index b8883ac2e..f4ccf45c8 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -3,21 +3,19 @@
 
 import re
 import urllib
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class DepositfilesCom(Plugin):
+class DepositfilesCom(Hoster):
+    __name__ = "DepositfilesCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://depositfiles.com/.{2,}/files/"
+    __version__ = "0.1"
+    __description__ = """Depositfiles.com Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "DepositfilesCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://depositfiles.com/.{2,}/files/"
-        props['version'] = "0.1"
-        props['description'] = """Depositfiles.com Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.multi_dl = False
diff --git a/module/plugins/hoster/DuckloadCom.py b/module/plugins/hoster/DuckloadCom.py
index c64842846..34a6a5146 100644
--- a/module/plugins/hoster/DuckloadCom.py
+++ b/module/plugins/hoster/DuckloadCom.py
@@ -2,22 +2,20 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 from time import time
 
-class DuckloadCom(Plugin):
+class DuckloadCom(Hoster):
+    __name__ = "DuckloadCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www\.)?duckload\.com/divx/"
+    __version__ = "0.1"
+    __description__ = """Duckload.com Download Hoster"""
+    __author_name__ = ("wugy")
+    __author_mail__ = ("wugy@qip.ru")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "DuckloadCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www\.)?duckload\.com/divx/"
-        props['version'] = "0.1"
-        props['description'] = """Duckload.com Download Plugin"""
-        props['author_name'] = ("wugy")
-        props['author_mail'] = ("wugy@qip.ru")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.want_reconnect = False
diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index 0a182ad78..fe68c914f 100644
--- a/module/plugins/hoster/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -2,22 +2,20 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 from time import time
 
-class FilefactoryCom(Plugin):
+class FilefactoryCom(Hoster):
+    __name__ = "FilefactoryCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www\.)?filefactory\.com/file/"
+    __version__ = "0.1"
+    __description__ = """Filefactory.com Download Hoster"""
+    __author_name__ = ("sitacuisses","spoob","mkaay")
+    __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "FilefactoryCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www\.)?filefactory\.com/file/"
-        props['version'] = "0.1"
-        props['description'] = """Filefactory.com Download Plugin"""
-        props['author_name'] = ("sitacuisses","spoob","mkaay")
-        props['author_mail'] = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.want_reconnect = False
diff --git a/module/plugins/hoster/FilesmonsterCom.py b/module/plugins/hoster/FilesmonsterCom.py
index 7b764e63a..f52e01760 100644
--- a/module/plugins/hoster/FilesmonsterCom.py
+++ b/module/plugins/hoster/FilesmonsterCom.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Plugin for www.filesmonster.com
+# Hoster for www.filesmonster.com
 # this plugin isn't fully implemented yet,but it does download
 # todo:
 # detect, if reconnect is necessary
@@ -13,21 +13,19 @@
 import re
 import urllib
 import time
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class FilesmonsterCom(Plugin):
+class FilesmonsterCom(Hoster):
+    __name__ = "FilesmonsterCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(www.)??filesmonster.com/download.php"
+    __version__ = "0.1"
+    __description__ = """Filesmonster.com Download Hoster"""
+    __author_name__ = ("sitacuisses","spoob")
+    __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "FilesmonsterCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www.)??filesmonster.com/download.php"
-        props['version'] = "0.1"
-        props['description'] = """Filesmonster.com Download Plugin"""
-        props['author_name'] = ("sitacuisses","spoob")
-        props['author_mail'] = ("sitacuisses@yahoo.de","spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.want_reconnect = False
diff --git a/module/plugins/hoster/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py
index 22b488757..e772c84c2 100644
--- a/module/plugins/hoster/FreakshareNet.py
+++ b/module/plugins/hoster/FreakshareNet.py
@@ -4,23 +4,21 @@
 import re
 import urllib
 import httplib
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 from time import time
 
 
-class FreakshareNet(Plugin):
+class FreakshareNet(Hoster):
+    __name__ = "FreakshareNet"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www\.)?freakshare\.net/files/\S*?/"
+    __version__ = "0.1"
+    __description__ = """Freakshare.com Download Hoster"""
+    __author_name__ = ("sitacuisses","spoob","mkaay")
+    __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "FreakshareNet"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www\.)?freakshare\.net/files/\S*?/"
-        props['version'] = "0.1"
-        props['description'] = """Freakshare.com Download Plugin"""
-        props['author_name'] = ("sitacuisses","spoob","mkaay")
-        props['author_mail'] = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.want_reconnect = False
diff --git a/module/plugins/hoster/GigasizeCom.py b/module/plugins/hoster/GigasizeCom.py
index 65d59426f..38d26a404 100644
--- a/module/plugins/hoster/GigasizeCom.py
+++ b/module/plugins/hoster/GigasizeCom.py
@@ -6,21 +6,19 @@ import re
 import tempfile
 from time import time
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class GigasizeCom(Plugin):
+class GigasizeCom(Hoster):
+    __name__ = "GigasizeCom"
+    __type__ = "hoster"
+    __pattern__ = r"(?:http://)?(?:www.)?gigasize.com/get.php\?d="
+    __version__ = "0.1"
+    __description__ = """Gigasize.com Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "GigasizeCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"(?:http://)?(?:www.)?gigasize.com/get.php\?d="
-        props['version'] = "0.1"
-        props['description'] = """Gigasize.com Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.want_reconnect = False
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index 177e10304..a606619cd 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -3,21 +3,19 @@
 
 import re
 from time import time
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class HotfileCom(Plugin):
+class HotfileCom(Hoster):
+    __name__ = "HotfileCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://hotfile.com/dl/"
+    __version__ = "0.1"
+    __description__ = """Hotfile.com Download Hoster"""
+    __author_name__ = ("sitacuisses","spoob","mkaay")
+    __author_mail__ = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "HotfileCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://hotfile.com/dl/"
-        props['version'] = "0.1"
-        props['description'] = """Hotfile.com Download Plugin"""
-        props['author_name'] = ("sitacuisses","spoob","mkaay")
-        props['author_mail'] = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.want_reconnect = False
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 1ac21e8a7..10c3ec370 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -6,21 +6,19 @@ import re
 import tempfile
 from time import time
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class MegauploadCom(Plugin):
+class MegauploadCom(Hoster):
+    __name__ = "MegauploadCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www.)megaupload.com/"
+    __version__ = "0.1"
+    __description__ = """Megaupload.com Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "MegauploadCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www.)megaupload.com/"
-        props['version'] = "0.1"
-        props['description'] = """Megaupload.com Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.time_plus_wait = None
         self.html = [None, None]
diff --git a/module/plugins/hoster/MegavideoCom.py b/module/plugins/hoster/MegavideoCom.py
index 9e6df3cc9..7ea045447 100644
--- a/module/plugins/hoster/MegavideoCom.py
+++ b/module/plugins/hoster/MegavideoCom.py
@@ -3,21 +3,20 @@
 
 import re
 from time import time
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 from module.unescape import unescape
 
-class MegavideoCom(Plugin):
+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):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "MegavideoCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?megavideo.com/\?v=.*"
-        props['version'] = "0.1"
-        props['description'] = """Megavideo.com Download Plugin"""
-        props['author_name'] = ("jeix","mkaay")
-        props['author_mail'] = ("jeix@hasnomail.de","mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         
diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
index 405cd2072..5412fd570 100644
--- a/module/plugins/hoster/MyvideoDe.py
+++ b/module/plugins/hoster/MyvideoDe.py
@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class MyvideoDe(Plugin):
+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 __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "MyvideoDe"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?myvideo.de/watch/"
-        props['version'] = "0.9"
-        props['description'] = """Myvideo.de Video Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.url = self.parent.url
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index bc5b437d3..c6f9da434 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -8,21 +8,19 @@ from time import time
 from time import sleep
 import hashlib
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class NetloadIn(Plugin):
+class NetloadIn(Hoster):
+    __name__ = "NetloadIn"
+    __type__ = "hoster"
+    __pattern__ = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
+    __version__ = "0.1"
+    __description__ = """Netload.in Download Hoster"""
+    __author_name__ = ("spoob", "RaNaN")
+    __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "NetloadIn"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
-        props['version'] = "0.1"
-        props['description'] = """Netload.in Download Plugin"""
-        props['author_name'] = ("spoob", "RaNaN")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None, None]
         self.want_reconnect = False
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 45b078275..cfed29331 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -5,22 +5,20 @@
 import re
 from time import time
 
-from module.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 import hashlib
 
-class RapidshareCom(Plugin):
+class RapidshareCom(Hoster):
+    __name__ = "RapidshareCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)"
+    __version__ = "1.0"
+    __description__ = """Rapidshare.com Download Hoster"""
+    __author_name__ = ("spoob", "RaNaN", "mkaay")
+    __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RapidshareCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)"
-        props['version'] = "1.0"
-        props['description'] = """Rapidshare.com Download Plugin"""
-        props['author_name'] = ("spoob", "RaNaN", "mkaay")
-        props['author_mail'] = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.time_plus_wait = None   #time() + wait in seconds
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 02b9d80e9..9cc0f8263 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -10,21 +10,19 @@ import hashlib
 import random
 from time import sleep
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class ShareonlineBiz(Plugin):
+class ShareonlineBiz(Hoster):
+    __name__ = "ShareonlineBiz"
+    __type__ = "hoster"
+    __pattern__ = r"(?:http://)?(?:www.)?share-online.biz/download.php\?id="
+    __version__ = "0.1"
+    __description__ = """Shareonline.biz Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "ShareonlineBiz"
-        props['type'] = "hoster"
-        props['pattern'] = r"(?:http://)?(?:www.)?share-online.biz/download.php\?id="
-        props['version'] = "0.1"
-        props['description'] = """Shareonline.biz Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.want_reconnect = False
diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
index 619b63429..e634607b0 100644
--- a/module/plugins/hoster/ShragleCom.py
+++ b/module/plugins/hoster/ShragleCom.py
@@ -4,21 +4,19 @@
 import re
 import time
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class ShragleCom(Plugin):
+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):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "ShragleCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www.)?shragle.com/files/"
-        props['version'] = "0.1"
-        props['description'] = """Shragle Download PLugin"""
-        props['author_name'] = ("RaNaN")
-        props['author_mail'] = ("RaNaN@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.multi_dl = False
diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py
index cb18cf504..d0a332baf 100644
--- a/module/plugins/hoster/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
@@ -4,21 +4,18 @@
 import re
 from time import time
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class StorageTo(Plugin):
+class StorageTo(Hoster):
+    __name__ = "StorageTo"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www)?\.storage\.to/get/.*"
+    __version__ = "0.1"
+    __description__ = """Storage.to Download Hoster"""
+    __author_name__ = ("mkaay")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "StorageTo"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www)?\.storage\.to/get/.*"
-        props['version'] = "0.1"
-        props['description'] = """Storage.to Download Plugin"""
-        props['author_name'] = ("mkaay")
-        props['author_mail'] = ("mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.time_plus_wait = None
         self.want_reconnect = False
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 2cfdfb3c7..93caa39b3 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -2,22 +2,20 @@
 
 import re
 from time import time
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 import hashlib
 
-class UploadedTo(Plugin):
+class UploadedTo(Hoster):
+    __name__ = "UploadedTo"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/(?:file/|\?id=)?(.+)"
+    __version__ = "0.3"
+    __description__ = """Uploaded.to Download Hoster"""
+    __author_name__ = ("spoob", "mkaay")
+    __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "UploadedTo"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/(?:file/|\?id=)?(.+)"
-        props['version'] = "0.3"
-        props['description'] = """Uploaded.to Download Plugin"""
-        props['author_name'] = ("spoob", "mkaay")
-        props['author_mail'] = ("spoob@pyload.org", "mkaay@mkaay.de")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.time_plus_wait = None	#time() + wait in seconds
diff --git a/module/plugins/hoster/XupIn.py b/module/plugins/hoster/XupIn.py
index 495387172..bf39990f9 100644
--- a/module/plugins/hoster/XupIn.py
+++ b/module/plugins/hoster/XupIn.py
@@ -2,21 +2,19 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class XupIn(Plugin):
+class XupIn(Hoster):
+    __name__ = "XupIn"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www.)?xup.in/"
+    __version__ = "0.1"
+    __description__ = """Xup.in Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "XupIn"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www.)?xup.in/"
-        props['version'] = "0.1"
-        props['description'] = """Xup.in Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.multi_dl = False
diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index a32ed34a8..31e18821f 100644
--- a/module/plugins/hoster/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
@@ -2,21 +2,19 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class YoupornCom(Plugin):
+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):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "YoupornCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?youporn\.com/watch/.+"
-        props['version'] = "0.1"
-        props['description'] = """Youporn.com Video Download Plugin"""
-        props['author_name'] = ("willnix")
-        props['author_mail'] = ("willnix@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.html_old = None         #time() where loaded the HTML
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 494158ba3..6c952e2ba 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -2,21 +2,19 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class YoutubeCom(Plugin):
+class YoutubeCom(Hoster):
+    __name__ = "YoutubeCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(www\.)?(de\.)?\youtube\.com/watch\?v=.*"
+    __version__ = "0.2"
+    __description__ = """Youtube.com Video Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "YoutubeCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?(de\.)?\youtube\.com/watch\?v=.*"
-        props['version'] = "0.2"
-        props['description'] = """Youtube.com Video Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.read_config()
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 238edeb84..fb2702ee7 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -3,21 +3,19 @@
 
 import re
 import urllib
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class ZippyshareCom(Plugin):
+class ZippyshareCom(Hoster):
+    __name__ = "ZippyshareCom"
+    __type__ = "hoster"
+    __pattern__ = r"(http://)?www?\d{0,2}\.zippyshare.com/v/"
+    __version__ = "0.1"
+    __description__ = """Zippyshare.com Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "ZippyshareCom"
-        props['type'] = "hoster"
-        props['pattern'] = r"(http://)?www?\d{0,2}\.zippyshare.com/v/"
-        props['version'] = "0.1"
-        props['description'] = """Zippyshare.com Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.want_reconnect = False
diff --git a/module/plugins/hoster/ZshareNet.py b/module/plugins/hoster/ZshareNet.py
index 1b1a50bbf..2bc75ee4e 100644
--- a/module/plugins/hoster/ZshareNet.py
+++ b/module/plugins/hoster/ZshareNet.py
@@ -2,21 +2,19 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Plugin import Plugin
+from module.plugins.Hoster import Hoster
 
-class ZshareNet(Plugin):
+class ZshareNet(Hoster):
+    __name__ = "ZshareNet"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www.)?zshare.net/"
+    __version__ = "0.1"
+    __description__ = """Zshare.net Download Hoster"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "ZshareNet"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www.)?zshare.net/"
-        props['version'] = "0.1"
-        props['description'] = """Zshare.net Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Hoster.__init__(self, parent)
         self.parent = parent
         self.html = [None, None]
         self.html_old = None         #time() where loaded the HTML
-- 
cgit v1.2.3