From f53d57b902b71708f05a3125872ec5d34ebe65b9 Mon Sep 17 00:00:00 2001 From: Armin Date: Thu, 9 Apr 2015 20:11:11 +0200 Subject: fix: OboomCom and SmoozedCom with beaker >= v1.7.x fix: run plugins this fix makes the plugin attribute "__name" obsolet --- pyload/manager/Plugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pyload/manager/Plugin.py') diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 72fabb33a..99778c3f3 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -60,7 +60,9 @@ class PluginManager(object): self.plugins[type] = self.parse(type) setattr(self, "%sPlugins" % type, self.plugins[type]) - self.plugins['addon'] = self.addonPlugins.update(self.hookPlugins) + # ???????? i don't understand this + # self.plugins['addon'] = self.addonPlugins.update(self.hookPlugins) + # ???????? self.core.log.debug("Created index of plugins") -- cgit v1.2.3 From 48a492bcffbf795577fed9f9b03b1e304c91409e Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 10 Apr 2015 01:07:51 +0200 Subject: more fixes. now running all plugins --- pyload/manager/Plugin.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pyload/manager/Plugin.py') diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 99778c3f3..f1899c0a0 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -60,10 +60,6 @@ class PluginManager(object): self.plugins[type] = self.parse(type) setattr(self, "%sPlugins" % type, self.plugins[type]) - # ???????? i don't understand this - # self.plugins['addon'] = self.addonPlugins.update(self.hookPlugins) - # ???????? - self.core.log.debug("Created index of plugins") @@ -145,7 +141,7 @@ class PluginManager(object): # internals have no config if folder == "internal": - self.core.config.deleteConfig(name) + self.core.config.deleteConfig("internal") continue config = self.CONFIG.findall(content) @@ -163,7 +159,7 @@ class PluginManager(object): if folder not in ("account", "internal") and not [True for item in config if item[0] == "activated"]: config.insert(0, ["activated", "bool", "Activated", False if folder in ("addon", "hook") else True]) - self.core.config.addPluginConfig(name, config, desc) + self.core.config.addPluginConfig("%s_%s" % (name, folder), config, desc) except Exception: self.core.log.error("Invalid config in %s: %s" % (name, config)) @@ -173,7 +169,7 @@ class PluginManager(object): config = (["activated", "bool", "Activated", False],) try: - self.core.config.addPluginConfig(name, config, desc) + self.core.config.addPluginConfig("%s_%s" % (name, folder), config, desc) except Exception: self.core.log.error("Invalid config in %s: %s" % (name, config)) -- cgit v1.2.3 From cc07ae19adcb97e9ab9748c7a317ef4b36f73935 Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 10 Apr 2015 14:44:36 +0200 Subject: added: configdata of deleted or outdated plugins are deletedfrom config file --- pyload/manager/Plugin.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pyload/manager/Plugin.py') diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index f1899c0a0..222ed9c93 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -55,10 +55,15 @@ class PluginManager(object): sys.path.append(abspath("")) self.loadTypes() + + configs = [] for type in self.TYPES: self.plugins[type] = self.parse(type) setattr(self, "%sPlugins" % type, self.plugins[type]) + configs.extend("%s_%s" % (p, type) for p in self.plugins[type]) + + self.core.config.removeDeletedPlugins(configs) self.core.log.debug("Created index of plugins") -- cgit v1.2.3