27 files changed, 67 insertions, 67 deletions
diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridComHook.py
index 34f44c91d..092921134 100644
--- a/module/plugins/hooks/AlldebridCom.py
+++ b/module/plugins/hooks/AlldebridComHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class AlldebridCom(MultiHook):
-    __name__    = "AlldebridCom"
+class AlldebridComHook(MultiHook):
+    __name__    = "AlldebridComHook"
     __type__    = "hook"
     __version__ = "0.16"
 
diff --git a/module/plugins/hooks/DebridItaliaCom.py b/module/plugins/hooks/DebridItaliaComHook.py
index a970ae195..36b307696 100644
--- a/module/plugins/hooks/DebridItaliaCom.py
+++ b/module/plugins/hooks/DebridItaliaComHook.py
@@ -5,8 +5,8 @@ import re
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class DebridItaliaCom(MultiHook):
-    __name__    = "DebridItaliaCom"
+class DebridItaliaComHook(MultiHook):
+    __name__    = "DebridItaliaComHook"
     __type__    = "hook"
     __version__ = "0.12"
 
diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezComHook.py
index 04da21ee2..43efb5048 100644
--- a/module/plugins/hooks/EasybytezCom.py
+++ b/module/plugins/hooks/EasybytezComHook.py
@@ -5,8 +5,8 @@ import re
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class EasybytezCom(MultiHook):
-    __name__    = "EasybytezCom"
+class EasybytezComHook(MultiHook):
+    __name__    = "EasybytezComHook"
     __type__    = "hook"
     __version__ = "0.07"
 
diff --git a/module/plugins/hooks/FastixRu.py b/module/plugins/hooks/FastixRuHook.py
index 9e74587ac..16e30e93a 100644
--- a/module/plugins/hooks/FastixRu.py
+++ b/module/plugins/hooks/FastixRuHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class FastixRu(MultiHook):
-    __name__    = "FastixRu"
+class FastixRuHook(MultiHook):
+    __name__    = "FastixRuHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMeHook.py
index 31ef8201f..baea44540 100644
--- a/module/plugins/hooks/FreeWayMe.py
+++ b/module/plugins/hooks/FreeWayMeHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class FreeWayMe(MultiHook):
-    __name__    = "FreeWayMe"
+class FreeWayMeHook(MultiHook):
+    __name__    = "FreeWayMeHook"
     __type__    = "hook"
     __version__ = "0.15"
 
diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterComHook.py
index 769e63e81..596a397a4 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterComHook.py
@@ -5,15 +5,16 @@ import re
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class LinkdecrypterCom(MultiHook):
-    __name__    = "LinkdecrypterCom"
+class LinkdecrypterComHook(MultiHook):
+    __name__    = "LinkdecrypterComHook"
     __type__    = "hook"
-    __version__ = "1.03"
+    __version__ = "1.04"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
-                  ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
-                  ("reload"        , "bool"               , "Reload plugin list"                  , True ),
-                  ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
+    __config__ = [("activated"     , "bool"               , "Activated"                    , True ),
+                  ("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
+                  ("reload"        , "bool"               , "Reload plugin list"           , True ),
+                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
     __description__ = """Linkdecrypter.com hook plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hooks/LinksnappyCom.py b/module/plugins/hooks/LinksnappyComHook.py
index a5b77b93f..72282575b 100644
--- a/module/plugins/hooks/LinksnappyCom.py
+++ b/module/plugins/hooks/LinksnappyComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class LinksnappyCom(MultiHook):
-    __name__    = "LinksnappyCom"
+class LinksnappyComHook(MultiHook):
+    __name__    = "LinksnappyComHook"
     __type__    = "hook"
     __version__ = "0.04"
 
diff --git a/module/plugins/hooks/MegaDebridEu.py b/module/plugins/hooks/MegaDebridEuHook.py
index b32656019..0de7b4dcf 100644
--- a/module/plugins/hooks/MegaDebridEu.py
+++ b/module/plugins/hooks/MegaDebridEuHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class MegaDebridEu(MultiHook):
-    __name__    = "MegaDebridEu"
+class MegaDebridEuHook(MultiHook):
+    __name__    = "MegaDebridEuHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/hooks/MegaRapidoNet.py b/module/plugins/hooks/MegaRapidoNetHook.py
index fb5e77994..e113b305e 100644
--- a/module/plugins/hooks/MegaRapidoNet.py
+++ b/module/plugins/hooks/MegaRapidoNetHook.py
@@ -5,8 +5,8 @@ import re
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class MegaRapidoNet(MultiHook):
-    __name__    = "MegaRapidoNet"
+class MegaRapidoNetHook(MultiHook):
+    __name__    = "MegaRapidoNetHook"
     __type__    = "hook"
     __version__ = "0.02"
 
diff --git a/module/plugins/hooks/MultihostersCom.py b/module/plugins/hooks/MultihostersComHook.py
index bf88cfae7..7b5e49c49 100644
--- a/module/plugins/hooks/MultihostersCom.py
+++ b/module/plugins/hooks/MultihostersComHook.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hooks.ZeveraCom import ZeveraCom
+from module.plugins.hooks.ZeveraComHook import ZeveraComHook
 
 
-class MultihostersCom(ZeveraCom):
-    __name__    = "MultihostersCom"
+class MultihostersComHook(ZeveraComHook):
+    __name__    = "MultihostersComHook"
     __type__    = "hook"
     __version__ = "0.02"
 
diff --git a/module/plugins/hooks/MultishareCz.py b/module/plugins/hooks/MultishareCzHook.py
index 6ead88c34..6052b7673 100644
--- a/module/plugins/hooks/MultishareCz.py
+++ b/module/plugins/hooks/MultishareCzHook.py
@@ -5,8 +5,8 @@ import re
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class MultishareCz(MultiHook):
-    __name__    = "MultishareCz"
+class MultishareCzHook(MultiHook):
+    __name__    = "MultishareCzHook"
     __type__    = "hook"
     __version__ = "0.07"
 
diff --git a/module/plugins/hooks/MyfastfileCom.py b/module/plugins/hooks/MyfastfileComHook.py
index 1e7a6421d..20a1cfac2 100644
--- a/module/plugins/hooks/MyfastfileCom.py
+++ b/module/plugins/hooks/MyfastfileComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class MyfastfileCom(MultiHook):
-    __name__    = "MyfastfileCom"
+class MyfastfileComHook(MultiHook):
+    __name__    = "MyfastfileComHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/hooks/NoPremiumPl.py b/module/plugins/hooks/NoPremiumPlHook.py
index 77ee83cb1..b5a007ff9 100644
--- a/module/plugins/hooks/NoPremiumPl.py
+++ b/module/plugins/hooks/NoPremiumPlHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class NoPremiumPl(MultiHook):
-    __name__    = "NoPremiumPl"
+class NoPremiumPlHook(MultiHook):
+    __name__    = "NoPremiumPlHook"
     __type__    = "hook"
     __version__ = "0.03"
 
diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMeHook.py
index 7b9a1f414..d608a2ecd 100644
--- a/module/plugins/hooks/OverLoadMe.py
+++ b/module/plugins/hooks/OverLoadMeHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class OverLoadMe(MultiHook):
-    __name__    = "OverLoadMe"
+class OverLoadMeHook(MultiHook):
+    __name__    = "OverLoadMeHook"
     __type__    = "hook"
     __version__ = "0.04"
 
diff --git a/module/plugins/hooks/PremiumTo.py b/module/plugins/hooks/PremiumToHook.py
index f5636cb72..ef2a84223 100644
--- a/module/plugins/hooks/PremiumTo.py
+++ b/module/plugins/hooks/PremiumToHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class PremiumTo(MultiHook):
-    __name__    = "PremiumTo"
+class PremiumToHook(MultiHook):
+    __name__    = "PremiumToHook"
     __type__    = "hook"
     __version__ = "0.08"
 
diff --git a/module/plugins/hooks/PremiumizeMe.py b/module/plugins/hooks/PremiumizeMeHook.py
index 266c62549..e081fb389 100644
--- a/module/plugins/hooks/PremiumizeMe.py
+++ b/module/plugins/hooks/PremiumizeMeHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class PremiumizeMe(MultiHook):
-    __name__    = "PremiumizeMe"
+class PremiumizeMeHook(MultiHook):
+    __name__    = "PremiumizeMeHook"
     __type__    = "hook"
     __version__ = "0.17"
 
diff --git a/module/plugins/hooks/PutdriveCom.py b/module/plugins/hooks/PutdriveComHook.py
index f665dabee..c3ebf4ff3 100644
--- a/module/plugins/hooks/PutdriveCom.py
+++ b/module/plugins/hooks/PutdriveComHook.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hooks.ZeveraCom import ZeveraCom
+from module.plugins.hooks.ZeveraComHook import ZeveraComHook
 
 
-class PutdriveCom(ZeveraCom):
-    __name__    = "PutdriveCom"
+class PutdriveComHook(ZeveraComHook):
+    __name__    = "PutdriveComHook"
     __type__    = "hook"
     __version__ = "0.01"
 
diff --git a/module/plugins/hooks/RPNetBiz.py b/module/plugins/hooks/RPNetBizHook.py
index a24697265..10332948d 100644
--- a/module/plugins/hooks/RPNetBiz.py
+++ b/module/plugins/hooks/RPNetBizHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class RPNetBiz(MultiHook):
-    __name__    = "RPNetBiz"
+class RPNetBizHook(MultiHook):
+    __name__    = "RPNetBizHook"
     __type__    = "hook"
     __version__ = "0.14"
 
diff --git a/module/plugins/hooks/RapideoPl.py b/module/plugins/hooks/RapideoPlHook.py
index 70d499de5..0400f07ba 100644
--- a/module/plugins/hooks/RapideoPl.py
+++ b/module/plugins/hooks/RapideoPlHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class RapideoPl(MultiHook):
-    __name__    = "RapideoPl"
+class RapideoPlHook(MultiHook):
+    __name__    = "RapideoPlHook"
     __type__    = "hook"
     __version__ = "0.03"
 
diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridComHook.py
index 4260940d0..aa0c9f640 100644
--- a/module/plugins/hooks/RealdebridCom.py
+++ b/module/plugins/hooks/RealdebridComHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class RealdebridCom(MultiHook):
-    __name__    = "RealdebridCom"
+class RealdebridComHook(MultiHook):
+    __name__    = "RealdebridComHook"
     __type__    = "hook"
     __version__ = "0.46"
 
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostToHook.py
index 1e608f87a..a2415129a 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostToHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class RehostTo(MultiHook):
-    __name__    = "RehostTo"
+class RehostToHook(MultiHook):
+    __name__    = "RehostToHook"
     __type__    = "hook"
     __version__ = "0.50"
 
diff --git a/module/plugins/hooks/SimplyPremiumCom.py b/module/plugins/hooks/SimplyPremiumComHook.py
index a5173dbfa..116e3a76e 100644
--- a/module/plugins/hooks/SimplyPremiumCom.py
+++ b/module/plugins/hooks/SimplyPremiumComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class SimplyPremiumCom(MultiHook):
-    __name__    = "SimplyPremiumCom"
+class SimplyPremiumComHook(MultiHook):
+    __name__    = "SimplyPremiumComHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/hooks/SimplydebridCom.py b/module/plugins/hooks/SimplydebridComHook.py
index a37a6eb7f..01629df99 100644
--- a/module/plugins/hooks/SimplydebridCom.py
+++ b/module/plugins/hooks/SimplydebridComHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class SimplydebridCom(MultiHook):
-    __name__    = "SimplydebridCom"
+class SimplydebridComHook(MultiHook):
+    __name__    = "SimplydebridComHook"
     __type__    = "hook"
     __version__ = "0.04"
 
diff --git a/module/plugins/hooks/SmoozedCom.py b/module/plugins/hooks/SmoozedComHook.py
index cd9b2fa6e..24b7c8df0 100644
--- a/module/plugins/hooks/SmoozedCom.py
+++ b/module/plugins/hooks/SmoozedComHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class SmoozedCom(MultiHook):
-    __name__    = "SmoozedCom"
+class SmoozedComHook(MultiHook):
+    __name__    = "SmoozedComHook"
     __type__    = "hook"
     __version__ = "0.03"
 
diff --git a/module/plugins/hooks/UnrestrictLi.py b/module/plugins/hooks/UnrestrictLiHook.py
index 58f31f2aa..f1ffd1886 100644
--- a/module/plugins/hooks/UnrestrictLi.py
+++ b/module/plugins/hooks/UnrestrictLiHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class UnrestrictLi(MultiHook):
-    __name__    = "UnrestrictLi"
+class UnrestrictLiHook(MultiHook):
+    __name__    = "UnrestrictLiHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/hooks/ZeveraCom.py b/module/plugins/hooks/ZeveraComHook.py
index 7fcfb18da..21c1741d2 100644
--- a/module/plugins/hooks/ZeveraCom.py
+++ b/module/plugins/hooks/ZeveraComHook.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.MultiHook import MultiHook
 
 
-class ZeveraCom(MultiHook):
-    __name__    = "ZeveraCom"
+class ZeveraComHook(MultiHook):
+    __name__    = "ZeveraComHook"
     __type__    = "hook"
     __version__ = "0.05"
 
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 942c044c2..6ef803f7a 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -71,16 +71,15 @@ class MultiHook(Hook):
 
 
     def initPlugin(self):
-        plugin, type = self.core.pluginManager.findPlugin(self.__name__)
+        self.pluginname         = self.__name__.rsplit("Hook", 1)[0]
+        plugin, self.plugintype = self.core.pluginManager.findPlugin(self.pluginname)
 
-        if not plugin:
+        if plugin:
+            self.pluginmodule = self.core.pluginManager.loadModule(type, self.pluginname)
+            self.pluginclass  = getattr(self.pluginmodule, self.pluginname)
+        else:
             self.logWarning("Hook plugin will be deactivated due missing plugin reference")
             self.setConfig('activated', False)
-        else:
-            self.pluginname   = self.__name__
-            self.plugintype   = type
-            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name__)
-            self.pluginclass  = getattr(self.pluginmodule, self.__name__)
 
 
     def loadAccount(self):