summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/plugins/crypter/TnyCz.py4
-rw-r--r--module/plugins/hooks/AndroidPhoneNotify.py4
-rw-r--r--module/plugins/hooks/Checksum.py2
-rw-r--r--module/plugins/hooks/ClickAndLoad.py2
-rw-r--r--module/plugins/hooks/DeleteFinished.py4
-rw-r--r--module/plugins/hooks/DownloadScheduler.py2
-rw-r--r--module/plugins/hooks/ExternalScripts.py2
-rw-r--r--module/plugins/hooks/ExtractArchive.py2
-rw-r--r--module/plugins/hooks/IRCInterface.py2
-rw-r--r--module/plugins/hooks/MultiHome.py2
-rw-r--r--module/plugins/hooks/RestartFailed.py2
-rw-r--r--module/plugins/hooks/UpdateManager.py2
-rw-r--r--module/plugins/hooks/WindowsPhoneNotify.py4
-rw-r--r--module/plugins/hooks/XFileSharingPro.py4
-rw-r--r--module/plugins/hooks/XMPPInterface.py2
-rw-r--r--module/plugins/internal/MultiHook.py2
-rw-r--r--module/plugins/internal/OCR.py2
17 files changed, 22 insertions, 22 deletions
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index f3b245118..b04c1b647 100644
--- a/module/plugins/crypter/TnyCz.py
+++ b/module/plugins/crypter/TnyCz.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
-
import re
+from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+
class TnyCz(SimpleCrypter):
__name__ = "TnyCz"
diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py
index d582a4a31..c9493bfd0 100644
--- a/module/plugins/hooks/AndroidPhoneNotify.py
+++ b/module/plugins/hooks/AndroidPhoneNotify.py
@@ -46,11 +46,11 @@ class AndroidPhoneNotify(Hook):
self.notify(_("Plugins updated"), str(type_plugins))
- def coreReady(self):
+ def activate(self):
self.key = self.getConfig('apikey')
- def coreExiting(self):
+ def exit(self):
if not self.getConfig('notifyexit'):
return
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py
index 13374f7bd..f132c37d1 100644
--- a/module/plugins/hooks/Checksum.py
+++ b/module/plugins/hooks/Checksum.py
@@ -63,7 +63,7 @@ class Checksum(Hook):
'default': r'^(?P<HASH>[0-9A-Fa-f]+)\s+\*?(?P<NAME>.+)$'}
- def coreReady(self):
+ def activate(self):
if not self.getConfig('check_checksum'):
self.logInfo(_("Checksum validation is disabled in plugin configuration"))
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index b910902c6..e9e231a28 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -48,7 +48,7 @@ class ClickAndLoad(Hook):
self.info = {} #@TODO: Remove in 0.4.10
- def coreReady(self):
+ def activate(self):
if not self.config['webinterface']['activated']:
return
diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index 5920b9a35..29bd7a4e1 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -44,11 +44,11 @@ class DeleteFinished(Hook):
# self.initPeriodical()
- def unload(self):
+ def deactivate(self):
self.manager.removeEvent('packageFinished', self.wakeup)
- def coreReady(self):
+ def activate(self):
self.info['sleep'] = True
# interval = self.getConfig('interval')
# self.pluginConfigChanged(self.__name__, 'interval', interval)
diff --git a/module/plugins/hooks/DownloadScheduler.py b/module/plugins/hooks/DownloadScheduler.py
index 314e5913e..773de7c4b 100644
--- a/module/plugins/hooks/DownloadScheduler.py
+++ b/module/plugins/hooks/DownloadScheduler.py
@@ -29,7 +29,7 @@ class DownloadScheduler(Hook):
self.cb = None # callback to scheduler job; will be by removed hookmanager when hook unloaded
- def coreReady(self):
+ def activate(self):
self.updateSchedule()
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index b5164a5aa..140dcb057 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -103,7 +103,7 @@ class ExternalScripts(Hook):
self.callScript(script)
- def coreExiting(self):
+ def exit(self):
for script in self.scripts['pyload_restart' if self.core.do_restart else 'pyload_stop']:
self.callScript(script)
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index f311d5b49..dae04c811 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -154,7 +154,7 @@ class ExtractArchive(Hook):
self.repair = False
- def coreReady(self):
+ def activate(self):
for p in ("UnRar", "SevenZip", "UnZip"):
try:
module = self.core.pluginManager.loadModule("internal", p)
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index 7e4d50384..b3b3d9b89 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -46,7 +46,7 @@ class IRCInterface(Thread, Hook):
self.setDaemon(True)
- def coreReady(self):
+ def activate(self):
self.abort = False
self.more = []
self.new_package = {}
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index af68fe2bc..63c1fee05 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -43,7 +43,7 @@ class MultiHome(Hook):
self.interfaces.append(Interface(interface))
- def coreReady(self):
+ def activate(self):
requestFactory = self.core.requestFactory
oldGetRequest = requestFactory.getRequest
diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index c29b9cee4..eb49a5418 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -40,6 +40,6 @@ class RestartFailed(Hook):
self.interval = self.MIN_CHECK_INTERVAL
- def coreReady(self):
+ def activate(self):
# self.pluginConfigChanged(self.__name__, "interval", self.getConfig('interval'))
self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60)
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index f8eb25bc1..958be4e12 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -50,7 +50,7 @@ class UpdateManager(Hook):
MIN_CHECK_INTERVAL = 3 * 60 * 60 #: 3 hours
- def coreReady(self):
+ def activate(self):
if self.checkonstart:
self.core.api.pauseServer()
self.update()
diff --git a/module/plugins/hooks/WindowsPhoneNotify.py b/module/plugins/hooks/WindowsPhoneNotify.py
index 97e3b6da4..86a5f2308 100644
--- a/module/plugins/hooks/WindowsPhoneNotify.py
+++ b/module/plugins/hooks/WindowsPhoneNotify.py
@@ -47,11 +47,11 @@ class WindowsPhoneNotify(Hook):
self.notify(_("Plugins updated"), str(type_plugins))
- def coreReady(self):
+ def activate(self):
self.key = (self.getConfig('push-id'), self.getConfig('push-url'))
- def coreExiting(self):
+ def exit(self):
if not self.getConfig('notifyexit'):
return
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 10ca4fb9b..f13a78d4a 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -53,7 +53,7 @@ class XFileSharingPro(Hook):
# self.event_list = ["pluginConfigChanged"]
- def coreReady(self):
+ def activate(self):
self.loadPattern()
@@ -104,7 +104,7 @@ class XFileSharingPro(Hook):
dict['re'] = re.compile(dict['pattern'])
- def unload(self):
+ def deactivate(self):
# self.unloadHoster("BasePlugin")
for type, plugin in (("hoster", "XFileSharingPro"),
("crypter", "XFileSharingProFolder")):
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index b61428392..e93da98bf 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -59,7 +59,7 @@ class XMPPInterface(IRCInterface, JabberClient):
]
- def coreReady(self):
+ def activate(self):
self.new_package = {}
self.start()
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index bde0b7dc6..a45d52e8a 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -258,7 +258,7 @@ class MultiHook(Hook):
hdict.pop('new_name', None)
- def unload(self):
+ def deactivate(self):
"""Remove override for all plugins. Scheduler job is removed by hookmanager"""
for plugin in self.supported:
self.unloadPlugin(plugin)
diff --git a/module/plugins/internal/OCR.py b/module/plugins/internal/OCR.py
index 1874ba07d..2349d32af 100644
--- a/module/plugins/internal/OCR.py
+++ b/module/plugins/internal/OCR.py
@@ -36,7 +36,7 @@ class OCR(object):
self.result_captcha = ''
- def unload(self):
+ def deactivate(self):
"""delete all tmp images"""
pass