refactored plugins, new plugin manager

21 files changed, 212 insertions, 253 deletions

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