Fix refs on hook plugins + add missing __init__ files

30 files changed, 213 insertions, 64 deletions

diff --git a/pyload/plugins/base/Hook.py b/pyload/plugins/base/Hook.py
new file mode 100644
index 000000000..a866278ba
--- /dev/null
+++ b/pyload/plugins/base/Hook.py
@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+
+from traceback import print_exc
+
+from pyload.plugins.Plugin import Base
+
+
+class Expose(object):
+    """ used for decoration to declare rpc services """
+
+    def __new__(cls, f, *args, **kwargs):
+        addonManager.addRPC(f.__module__, f.func_name, f.func_doc)
+        return f
+
+
+def threaded(f):
+
+    def run(*args,**kwargs):
+        addonManager.startThread(f, *args, **kwargs)
+    return run
+
+
+class Hook(Base):
+    """
+    Base class for hook plugins.
+    """
+    __name__ = "Hook"
+    __type__ = "hook"
+    __version__ = "0.2"
+
+    __config__ = [("name", "type", "desc", "default")]
+
+    __description__ = """Interface for hook"""
+    __author_name__ = ("mkaay", "RaNaN")
+    __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org")
+
+    #: automatically register event listeners for functions, attribute will be deleted dont use it yourself
+    event_map = None
+
+    # Alternative to event_map
+    #: List of events the plugin can handle, name the functions exactly like eventname.
+    event_list = None  # dont make duplicate entries in event_map
+
+    #: periodic call interval in secondc
+    interval = 60
+
+
+    def __init__(self, core, manager):
+        Base.__init__(self, core)
+
+        #: Provide information in dict here, usable by API `getInfo`
+        self.info = None
+
+        #: Callback of periodical job task, used by AddonManager
+        self.cb = None
+
+        #: `AddonManager`
+        self.manager = manager
+
+        #register events
+        if self.event_map:
+            for event, funcs in self.event_map.iteritems():
+                if type(funcs) in (list, tuple):
+                    for f in funcs:
+                        self.manager.addEvent(event, getattr(self,f))
+                else:
+                    self.manager.addEvent(event, getattr(self,funcs))
+
+            #delete for various reasons
+            self.event_map = None
+
+        if self.event_list:
+            for f in self.event_list:
+                self.manager.addEvent(f, getattr(self,f))
+
+            self.event_list = None
+
+        self.setup()
+        self.initPeriodical()
+
+
+    def initPeriodical(self):
+        if self.interval >=1:
+            self.cb = self.core.scheduler.addJob(0, self._periodical, threaded=False)
+
+    def _periodical(self):
+        try:
+            if self.isActivated(): self.periodical()
+        except Exception, e:
+            self.logError(_("Error executing hook: %s") % e)
+            if self.core.debug:
+                print_exc()
+
+        self.cb = self.core.scheduler.addJob(self.interval, self._periodical, threaded=False)
+
+
+    def __repr__(self):
+        return "<Hook %s>" % self.__name__
+
+    def setup(self):
+        """ more init stuff if needed """
+        pass
+
+    def unload(self):
+        """ called when hook was deactivated """
+        pass
+
+    def isActivated(self):
+        """ checks if hook is activated"""
+        return self.config.getPlugin(self.__name__, "activated")
+
+
+    #event methods - overwrite these if needed
+    def coreReady(self):
+        pass
+
+    def coreExiting(self):
+        pass
+
+    def downloadPreparing(self, pyfile):
+        pass
+
+    def downloadFinished(self, pyfile):
+        pass
+
+    def downloadFailed(self, pyfile):
+        pass
+
+    def packageFinished(self, pypack):
+        pass
+
+    def beforeReconnecting(self, ip):
+        pass
+
+    def afterReconnecting(self, ip):
+        pass
+
+    def periodical(self):
+        pass
+
+    def newCaptchaTask(self, task):
+        """ new captcha task for the plugin, it MUST set the handler and timeout or will be ignored """
+        pass
+
+    def captchaCorrect(self, task):
+        pass
+
+    def captchaInvalid(self, task):
+        pass
diff --git a/pyload/plugins/captcha/__init__.py b/pyload/plugins/captcha/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pyload/plugins/captcha/__init__.py
diff --git a/pyload/plugins/hook/AlldebridCom.py b/pyload/plugins/hook/AlldebridCom.py
index 7882b9bc2..8eade2941 100644
--- a/pyload/plugins/hook/AlldebridCom.py
+++ b/pyload/plugins/hook/AlldebridCom.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class AlldebridCom(MultiHoster):
     __name__ = "AlldebridCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.13"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class AlldebridCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Alldebrid.com addon plugin"""
+    __description__ = """Alldebrid.com hook plugin"""
     __author_name__ = "Andy Voigt"
     __author_mail__ = "spamsales@online.de"
 
diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index 51b363eed..fdd1e567c 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -5,7 +5,7 @@ from thread import start_new_thread
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
 class BypassCaptchaException(Exception):
@@ -23,9 +23,9 @@ class BypassCaptchaException(Exception):
         return "<BypassCaptchaException %s>" % self.err
 
 
-class BypassCaptcha(Addon):
+class BypassCaptcha(Hook):
     __name__ = "BypassCaptcha"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.04"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index 1cd605b5e..45890815c 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -9,12 +9,12 @@ from thread import start_new_thread
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
-class Captcha9kw(Addon):
+class Captcha9kw(Hook):
     __name__ = "Captcha9kw"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.09"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index a2c9086c8..8f6f8d68b 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -11,7 +11,7 @@ from time import sleep
 from urllib import urlencode
 
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
 class CaptchaBrotherhoodException(Exception):
@@ -29,9 +29,9 @@ class CaptchaBrotherhoodException(Exception):
         return "<CaptchaBrotherhoodException %s>" % self.err
 
 
-class CaptchaBrotherhood(Addon):
+class CaptchaBrotherhood(Hook):
     __name__ = "CaptchaBrotherhood"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.05"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index ed2602e32..6e7a585ad 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -12,7 +12,7 @@ from time import sleep
 from pyload.utils import json_loads
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getRequest
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
 class DeathByCaptchaException(Exception):
@@ -44,9 +44,9 @@ class DeathByCaptchaException(Exception):
         return "<DeathByCaptchaException %s>" % self.err
 
 
-class DeathByCaptcha(Addon):
+class DeathByCaptcha(Hook):
     __name__ = "DeathByCaptcha"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.03"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/DebridItaliaCom.py b/pyload/plugins/hook/DebridItaliaCom.py
index 0cb7a6f4f..4272b758f 100644
--- a/pyload/plugins/hook/DebridItaliaCom.py
+++ b/pyload/plugins/hook/DebridItaliaCom.py
@@ -5,7 +5,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class DebridItaliaCom(MultiHoster):
     __name__ = "DebridItaliaCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.07"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -14,7 +14,7 @@ class DebridItaliaCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Debriditalia.com addon plugin"""
+    __description__ = """Debriditalia.com hook plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
diff --git a/pyload/plugins/hook/EasybytezCom.py b/pyload/plugins/hook/EasybytezCom.py
index a04111f78..9d1cdc0db 100644
--- a/pyload/plugins/hook/EasybytezCom.py
+++ b/pyload/plugins/hook/EasybytezCom.py
@@ -7,14 +7,14 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class EasybytezCom(MultiHoster):
     __name__ = "EasybytezCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.03"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """EasyBytez.com addon plugin"""
+    __description__ = """EasyBytez.com hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index 87979a8a8..3f0f64f1e 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -9,12 +9,12 @@ from uuid import uuid4
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
-class ExpertDecoders(Addon):
+class ExpertDecoders(Hook):
     __name__ = "ExpertDecoders"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.01"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/FastixRu.py b/pyload/plugins/hook/FastixRu.py
index fed0d57fa..9e2abd92a 100644
--- a/pyload/plugins/hook/FastixRu.py
+++ b/pyload/plugins/hook/FastixRu.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class FastixRu(MultiHoster):
     __name__ = "FastixRu"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -15,7 +15,7 @@ class FastixRu(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Fastix.ru addon plugin"""
+    __description__ = """Fastix.ru hook plugin"""
     __author_name__ = "Massimo Rosamilia"
     __author_mail__ = "max@spiritix.eu"
 
diff --git a/pyload/plugins/hook/FreeWayMe.py b/pyload/plugins/hook/FreeWayMe.py
index e468bd3ab..635bc3415 100644
--- a/pyload/plugins/hook/FreeWayMe.py
+++ b/pyload/plugins/hook/FreeWayMe.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class FreeWayMe(MultiHoster):
     __name__ = "FreeWayMe"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.11"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -15,7 +15,7 @@ class FreeWayMe(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """FreeWay.me addon plugin"""
+    __description__ = """FreeWay.me hook plugin"""
     __author_name__ = "Nicolas Giese"
     __author_mail__ = "james@free-way.me"
 
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 916638192..7317f234d 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -9,7 +9,7 @@ from pycurl import FORM_FILE, LOW_SPEED_TIME
 from thread import start_new_thread
 
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
 class ImageTyperzException(Exception):
@@ -27,9 +27,9 @@ class ImageTyperzException(Exception):
         return "<ImageTyperzException %s>" % self.err
 
 
-class ImageTyperz(Addon):
+class ImageTyperz(Hook):
     __name__ = "ImageTyperz"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.04"
 
     __config__ = [("activated", "bool", "Activated", False),
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index 6c59ee5c6..418ec4ac4 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -3,18 +3,18 @@
 import re
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 from pyload.utils import remove_chars
 
 
-class LinkdecrypterCom(Addon):
+class LinkdecrypterCom(Hook):
     __name__ = "LinkdecrypterCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.19"
 
     __config__ = [("activated", "bool", "Activated", False)]
 
-    __description__ = """Linkdecrypter.com addon plugin"""
+    __description__ = """Linkdecrypter.com hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/hook/LinksnappyCom.py b/pyload/plugins/hook/LinksnappyCom.py
index 4a89b75d1..9086e3c2a 100644
--- a/pyload/plugins/hook/LinksnappyCom.py
+++ b/pyload/plugins/hook/LinksnappyCom.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class LinksnappyCom(MultiHoster):
     __name__ = "LinksnappyCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.01"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class LinksnappyCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Linksnappy.com addon plugin"""
+    __description__ = """Linksnappy.com hook plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
diff --git a/pyload/plugins/hook/MegaDebridEu.py b/pyload/plugins/hook/MegaDebridEu.py
index 3faa823bf..0345e47fa 100644
--- a/pyload/plugins/hook/MegaDebridEu.py
+++ b/pyload/plugins/hook/MegaDebridEu.py
@@ -7,13 +7,13 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class MegaDebridEu(MultiHoster):
     __name__ = "MegaDebridEu"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False)]
 
-    __description__ = """mega-debrid.eu addon plugin"""
+    __description__ = """mega-debrid.eu hook plugin"""
     __author_name__ = "D.Ducatel"
     __author_mail__ = "dducatel@je-geek.fr"
 
diff --git a/pyload/plugins/hook/MultishareCz.py b/pyload/plugins/hook/MultishareCz.py
index 34ba3760a..9e1bd50a4 100644
--- a/pyload/plugins/hook/MultishareCz.py
+++ b/pyload/plugins/hook/MultishareCz.py
@@ -8,14 +8,14 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class MultishareCz(MultiHoster):
     __name__ = "MultishareCz"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.04"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")]
 
-    __description__ = """MultiShare.cz addon plugin"""
+    __description__ = """MultiShare.cz hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/hook/MyfastfileCom.py b/pyload/plugins/hook/MyfastfileCom.py
index 40f5fb680..216dcaf5d 100644
--- a/pyload/plugins/hook/MyfastfileCom.py
+++ b/pyload/plugins/hook/MyfastfileCom.py
@@ -7,7 +7,7 @@ from pyload.utils import json_loads
 
 class MyfastfileCom(MultiHoster):
     __name__ = "MyfastfileCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class MyfastfileCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Myfastfile.com addon plugin"""
+    __description__ = """Myfastfile.com hook plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
diff --git a/pyload/plugins/hook/OverLoadMe.py b/pyload/plugins/hook/OverLoadMe.py
index 87f4b5852..fae4209f8 100644
--- a/pyload/plugins/hook/OverLoadMe.py
+++ b/pyload/plugins/hook/OverLoadMe.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class OverLoadMe(MultiHoster):
     __name__ = "OverLoadMe"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.01"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class OverLoadMe(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 12)]
 
-    __description__ = """Over-Load.me addon plugin"""
+    __description__ = """Over-Load.me hook plugin"""
     __author_name__ = "marley"
     __author_mail__ = "marley@over-load.me"
 
diff --git a/pyload/plugins/hook/PremiumTo.py b/pyload/plugins/hook/PremiumTo.py
index 761731435..b95b15b53 100644
--- a/pyload/plugins/hook/PremiumTo.py
+++ b/pyload/plugins/hook/PremiumTo.py
@@ -6,14 +6,14 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class PremiumTo(MultiHoster):
     __name__ = "PremiumTo"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.04"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Premium.to addon plugin"""
+    __description__ = """Premium.to hook plugin"""
     __author_name__ = ("RaNaN", "zoidberg", "stickell")
     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
diff --git a/pyload/plugins/hook/PremiumizeMe.py b/pyload/plugins/hook/PremiumizeMe.py
index 05ff781e6..b6d89adb6 100644
--- a/pyload/plugins/hook/PremiumizeMe.py
+++ b/pyload/plugins/hook/PremiumizeMe.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class PremiumizeMe(MultiHoster):
     __name__ = "PremiumizeMe"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.12"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class PremiumizeMe(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Premiumize.me addon plugin"""
+    __description__ = """Premiumize.me hook plugin"""
     __author_name__ = "Florian Franzen"
     __author_mail__ = "FlorianFranzen@gmail.com"
 
diff --git a/pyload/plugins/hook/RPNetBiz.py b/pyload/plugins/hook/RPNetBiz.py
index 8f3fd298f..b46e326e6 100644
--- a/pyload/plugins/hook/RPNetBiz.py
+++ b/pyload/plugins/hook/RPNetBiz.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class RPNetBiz(MultiHoster):
     __name__ = "RPNetBiz"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.1"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class RPNetBiz(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """RPNet.biz addon plugin"""
+    __description__ = """RPNet.biz hook plugin"""
     __author_name__ = "Dman"
     __author_mail__ = "dmanugm@gmail.com"
 
diff --git a/pyload/plugins/hook/RealdebridCom.py b/pyload/plugins/hook/RealdebridCom.py
index cb56052a9..c1c519ace 100644
--- a/pyload/plugins/hook/RealdebridCom.py
+++ b/pyload/plugins/hook/RealdebridCom.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class RealdebridCom(MultiHoster):
     __name__ = "RealdebridCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.43"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -16,7 +16,7 @@ class RealdebridCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Real-Debrid.com addon plugin"""
+    __description__ = """Real-Debrid.com hook plugin"""
     __author_name__ = "Devirex Hazzard"
     __author_mail__ = "naibaf_11@yahoo.de"
 
diff --git a/pyload/plugins/hook/RehostTo.py b/pyload/plugins/hook/RehostTo.py
index 87196ff09..059f36284 100644
--- a/pyload/plugins/hook/RehostTo.py
+++ b/pyload/plugins/hook/RehostTo.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class RehostTo(MultiHoster):
     __name__ = "RehostTo"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.43"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -15,7 +15,7 @@ class RehostTo(MultiHoster):
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
 
-    __description__ = """Rehost.to addon plugin"""
+    __description__ = """Rehost.to hook plugin"""
     __author_name__ = "RaNaN"
     __author_mail__ = "RaNaN@pyload.org"
 
diff --git a/pyload/plugins/hook/SimplyPremiumCom.py b/pyload/plugins/hook/SimplyPremiumCom.py
index 3bed0cd2b..f0df36b22 100644
--- a/pyload/plugins/hook/SimplyPremiumCom.py
+++ b/pyload/plugins/hook/SimplyPremiumCom.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class SimplyPremiumCom(MultiHoster):
     __name__ = "SimplyPremiumCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", "False"),
@@ -16,7 +16,7 @@ class SimplyPremiumCom(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
                   ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
 
-    __description__ = """Simply-Premium.com addon plugin"""
+    __description__ = """Simply-Premium.com hook plugin"""
     __author_name__ = "EvolutionClip"
     __author_mail__ = "evolutionclip@live.de"
 
diff --git a/pyload/plugins/hook/SimplydebridCom.py b/pyload/plugins/hook/SimplydebridCom.py
index 212a56a45..f7c899a48 100644
--- a/pyload/plugins/hook/SimplydebridCom.py
+++ b/pyload/plugins/hook/SimplydebridCom.py
@@ -6,14 +6,14 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class SimplydebridCom(MultiHoster):
     __name__ = "SimplydebridCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.01"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Simply-Debrid.com addon plugin"""
+    __description__ = """Simply-Debrid.com hook plugin"""
     __author_name__ = "Kagenoshin"
     __author_mail__ = "kagenoshin@gmx.ch"
 
diff --git a/pyload/plugins/hook/UnrestrictLi.py b/pyload/plugins/hook/UnrestrictLi.py
index 237814f3e..2ca5ad907 100644
--- a/pyload/plugins/hook/UnrestrictLi.py
+++ b/pyload/plugins/hook/UnrestrictLi.py
@@ -7,7 +7,7 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class UnrestrictLi(MultiHoster):
     __name__ = "UnrestrictLi"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", False),
@@ -17,7 +17,7 @@ class UnrestrictLi(MultiHoster):
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24),
                   ("history", "bool", "Delete History", False)]
 
-    __description__ = """Unrestrict.li addon plugin"""
+    __description__ = """Unrestrict.li hook plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index 7e46f7430..e926d6655 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -2,12 +2,12 @@
 
 import re
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.base.Hook import Hook
 
 
-class XFileSharingPro(Addon):
+class XFileSharingPro(Hook):
     __name__ = "XFileSharingPro"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.12"
 
     __config__ = [("activated", "bool", "Activated", True),
@@ -15,7 +15,7 @@ class XFileSharingPro(Addon):
                   ("includeList", "str", "Include hosters (comma separated)", ""),
                   ("excludeList", "str", "Exclude hosters (comma separated)", "")]
 
-    __description__ = """XFileSharingPro addon plugin"""
+    __description__ = """XFileSharingPro hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/hook/ZeveraCom.py b/pyload/plugins/hook/ZeveraCom.py
index 8f784ba9b..155143f64 100644
--- a/pyload/plugins/hook/ZeveraCom.py
+++ b/pyload/plugins/hook/ZeveraCom.py
@@ -6,14 +6,14 @@ from pyload.plugins.internal.MultiHoster import MultiHoster
 
 class ZeveraCom(MultiHoster):
     __name__ = "ZeveraCom"
-    __type__ = "addon"
+    __type__ = "hook"
     __version__ = "0.02"
 
     __config__ = [("activated", "bool", "Activated", False),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", "")]
 
-    __description__ = """Real-Debrid.com addon plugin"""
+    __description__ = """Real-Debrid.com hook plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/hook/__init__.py b/pyload/plugins/hook/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pyload/plugins/hook/__init__.py