Update pyload to the new plugins structure

5 files changed, 11 insertions, 11 deletions

diff --git a/pyload/plugins/internal/AbstractExtractor.py b/pyload/plugins/internal/AbstractExtractor.py
index d1d1a09cb..39bc46b1e 100644
--- a/pyload/plugins/internal/AbstractExtractor.py
+++ b/pyload/plugins/internal/AbstractExtractor.py
@@ -39,7 +39,7 @@ class AbtractExtractor:
     def __init__(self, m, file, out, fullpath, overwrite, excludefiles, renice):
         """Initialize extractor for specific file
 
-        :param m: ExtractArchive Hook plugin
+        :param m: ExtractArchive Addon plugin
         :param file: Absolute filepath
         :param out: Absolute path to destination directory
         :param fullpath: extract to fullpath
diff --git a/pyload/plugins/internal/DeadCrypter.py b/pyload/plugins/internal/DeadCrypter.py
index c9e1eded1..2d4dfc7e6 100644
--- a/pyload/plugins/internal/DeadCrypter.py
+++ b/pyload/plugins/internal/DeadCrypter.py
@@ -10,7 +10,7 @@ class DeadCrypter(_Crypter):
 
     __pattern__ = None
 
-    __description__ = """ Crypter is no longer available """
+    __description__ = """Crypter is no longer available"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
diff --git a/pyload/plugins/internal/DeadHoster.py b/pyload/plugins/internal/DeadHoster.py
index a7b873d30..72fd356bd 100644
--- a/pyload/plugins/internal/DeadHoster.py
+++ b/pyload/plugins/internal/DeadHoster.py
@@ -18,7 +18,7 @@ class DeadHoster(_Hoster):
 
     __pattern__ = None
 
-    __description__ = """ Hoster is no longer available """
+    __description__ = """Hoster is no longer available"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
diff --git a/pyload/plugins/internal/MultiHoster.py b/pyload/plugins/internal/MultiHoster.py
index 48345eeca..c94f87493 100644
--- a/pyload/plugins/internal/MultiHoster.py
+++ b/pyload/plugins/internal/MultiHoster.py
@@ -2,13 +2,13 @@
 
 import re
 
-from pyload.plugins.base.Hook import Hook
+from pyload.plugins.base.Addon import Addon
 from pyload.utils import remove_chars
 
 
-class MultiHoster(Hook):
+class MultiHoster(Addon):
     __name__ = "MultiHoster"
-    __type__ = "hook"
+    __type__ = "addon"
 	__version__ = "0.20"
 
     __description__ = """Generic MultiHoster plugin"""
diff --git a/pyload/plugins/internal/UpdateManager.py b/pyload/plugins/internal/UpdateManager.py
index 50a965228..7848fa2de 100644
--- a/pyload/plugins/internal/UpdateManager.py
+++ b/pyload/plugins/internal/UpdateManager.py
@@ -7,13 +7,13 @@ from operator import itemgetter
 from os import path, remove, stat
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.base.Hook import Expose, Hook, threaded
+from pyload.plugins.base.Addon import Expose, Addon, threaded
 from pyload.utils import safe_join
 
 
-class UpdateManager(Hook):
+class UpdateManager(Addon):
     __name__ = "UpdateManager"
-    __type__ = "hook"
+    __type__ = "addon"
     __version__ = "0.36"
 
     __config__ = [("activated", "bool", "Activated", True),
@@ -22,7 +22,7 @@ class UpdateManager(Hook):
                   ("reloadplugins", "bool", "Monitor plugins for code changes (debug mode only)", True),
                   ("nodebugupdate", "bool", "Don't check for updates in debug mode", True)]
 
-    __description__ = """ Check for updates """
+    __description__ = """Check for updates"""
     __author_name__ = "Walter Purcaro"
     __author_mail__ = "vuolter@gmail.com"
 
@@ -287,7 +287,7 @@ class UpdateManager(Hook):
                 if path.isfile(filename):
                     try:
                         if type == "addon":
-                            self.manager.deactivateHook(name)
+                            self.manager.deactivateAddon(name)
                         remove(filename)
                     except Exception, e:
                         self.logDebug("Error deleting: %s" % path.basename(filename), e)