diff options
Diffstat (limited to 'module/plugins/hooks')
| -rw-r--r-- | module/plugins/hooks/LinkdecrypterComHook.py | 4 | ||||
| -rw-r--r-- | module/plugins/hooks/UpdateManager.py | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py index f9ab1f3ff..96c1b2b5e 100644 --- a/module/plugins/hooks/LinkdecrypterComHook.py +++ b/module/plugins/hooks/LinkdecrypterComHook.py @@ -6,10 +6,10 @@ from module.plugins.internal.Addon import Addon class LinkdecrypterComHook(Addon): - __name__ = "LinkdecrypterCom" + __name__ = "LinkdecrypterComHook" __type__ = "hook" __version__ = "1.09" - __status__ = "testing" + __status__ = "broken" __config__ = [("activated" , "bool" , "Activated" , False), ("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"), diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 41c11ed98..2fed5dab3 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -16,7 +16,7 @@ from module.plugins.internal.utils import encode, fs_join class UpdateManager(Addon): __name__ = "UpdateManager" __type__ = "hook" - __version__ = "1.01" + __version__ = "1.02" __status__ = "testing" __config__ = [("activated" , "bool", "Activated" , True ), @@ -250,6 +250,7 @@ class UpdateManager(Addon): updatelist, blacklist = self.parse_list(updates) url = updates[1] + req = self.pyload.requestFactory.getRequest(self.classname) if blacklist: #@NOTE: Protect UpdateManager from self-removing @@ -276,7 +277,6 @@ class UpdateManager(Addon): 'name': n, }) - req = self.pyload.requestFactory.getRequest(self.classname) for plugin in updatelist: name = plugin['name'] type = plugin['type'] @@ -301,9 +301,9 @@ class UpdateManager(Addon): try: content = self.load(url % plugin + ".py", decode=False, req=req) - if req.code == 404: - raise Exception(_("Plugin URL not found (404)")) - + if req.code is 404: + raise Exception(_("URL not found")) + m = self._VERSION.search(content) if m and m.group(2) == version: #@TODO: Remove in 0.4.10 @@ -317,7 +317,7 @@ class UpdateManager(Addon): updated.append((type, name)) else: - raise Exception(_("Plugin version mismatch")) + raise Exception(_("Version mismatch")) except Exception, e: self.log_error(_("Error updating plugin: %s %s") % (type.upper(), name), e) @@ -374,7 +374,7 @@ class UpdateManager(Addon): os.remove(filename) except OSError, e: - self.log_error(_("Error removing: %s") % filename, e) + self.log_warning(_("Error removing: %s") % filename, e) else: id = (type, name) |