diff options
Diffstat (limited to 'module/plugins/internal/Addon.py')
| -rw-r--r-- | module/plugins/internal/Addon.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py index e41325a80..5f2e53bf0 100644 --- a/module/plugins/internal/Addon.py +++ b/module/plugins/internal/Addon.py @@ -13,7 +13,6 @@ class Expose(object): def threaded(fn): - def run(*args, **kwargs): hookManager.startThread(fn, *args, **kwargs) @@ -23,7 +22,7 @@ def threaded(fn): class Addon(Plugin): __name__ = "Addon" __type__ = "hook" #@TODO: Change to `addon` in 0.4.10 - __version__ = "0.13" + __version__ = "0.14" __status__ = "testing" __threaded__ = [] #@TODO: Remove in 0.4.10 @@ -53,12 +52,18 @@ class Addon(Plugin): #: Callback of periodical job task, used by HookManager self.cb = None - self.interval = self.PERIODICAL_INTERVAL + self.interval = None self.init() self.init_events() + #@TODO: Remove in 0.4.10 + def _log(self, level, plugintype, pluginname, messages): + plugintype = "addon" if plugintype is "hook" else plugintype + return super(Addon, self)._log(level, plugintype, pluginname, messages) + + def init_events(self): if self.event_map: for event, funcs in self.event_map.items(): @@ -126,14 +131,6 @@ class Addon(Plugin): raise NotImplementedError - def save_info(self): - self.store("info", self.info) - - - def restore_info(self): - self.retrieve("info", self.info) - - @property def activated(self): """ @@ -156,7 +153,7 @@ class Addon(Plugin): #: Deprecated method, use `deactivate` instead (Remove in 0.4.10) def unload(self, *args, **kwargs): - self.save_info() + self.store("info", self.info) return self.deactivate(*args, **kwargs) @@ -169,7 +166,11 @@ class Addon(Plugin): #: Deprecated method, use `activate` instead (Remove in 0.4.10) def coreReady(self, *args, **kwargs): - self.restore_info() + self.retrieve("info", self.info) + + if self.PERIODICAL_INTERVAL: + self.start_periodical(self.PERIODICAL_INTERVAL, delay=5) + return self.activate(*args, **kwargs) |