From 0f36e87ccea0d9bf2a3db8ee858f27d9d1b2d796 Mon Sep 17 00:00:00 2001 From: Travis Lane <63308171+Tormak9970@users.noreply.github.com> Date: Mon, 3 Apr 2023 17:21:31 -0400 Subject: Add plugin reordering (#378) * feat: started work on saving plugin order * feat: implemented local ReorderableList * feat: reoder complete except for usage of DFL * switched to using dfl reorderableList * fix: added missing file and removed frag * updated to newest dfl * Update defsettings.json * fix: plugin order was missing on init * fix: now await pluginOrder * fix: moved the plugin-order load to plugin-loader * chore: v6 and dfl bump --- backend/browser.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'backend/browser.py') diff --git a/backend/browser.py b/backend/browser.py index 97fa3f11..12ca6644 100644 --- a/backend/browser.py +++ b/backend/browser.py @@ -30,10 +30,11 @@ class PluginInstallContext: self.hash = hash class PluginBrowser: - def __init__(self, plugin_path, plugins, loader) -> None: + def __init__(self, plugin_path, plugins, loader, settings) -> None: self.plugin_path = plugin_path self.plugins = plugins self.loader = loader + self.settings = settings self.install_requests = {} def _unzip_to_plugin_dir(self, zip, name, hash): @@ -123,6 +124,10 @@ class PluginBrowser: logger.debug("Plugin %s was stopped", name) del self.plugins[name] logger.debug("Plugin %s was removed from the dictionary", name) + current_plugin_order = self.settings.getSetting("pluginOrder") + current_plugin_order.remove(name) + self.settings.setSetting("pluginOrder", current_plugin_order) + logger.debug("Plugin %s was removed from the pluginOrder setting", name) logger.debug("removing files %s" % str(name)) rmtree(plugin_dir) except FileNotFoundError: @@ -170,6 +175,11 @@ class PluginBrowser: self.loader.plugins[name].stop() self.loader.plugins.pop(name, None) await sleep(1) + + current_plugin_order = self.settings.getSetting("pluginOrder") + current_plugin_order.append(name) + self.settings.setSetting("pluginOrder", current_plugin_order) + logger.debug("Plugin %s was added to the pluginOrder setting", name) self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder) else: logger.fatal(f"Failed Downloading Remote Binaries") -- cgit v1.2.3