diff options
| author | TrainDoctor <traindoctor@protonmail.com> | 2023-01-29 13:32:58 -0800 |
|---|---|---|
| committer | TrainDoctor <traindoctor@protonmail.com> | 2023-01-29 13:59:02 -0800 |
| commit | 2e53fb217a0e870359b48a1f2324f3f5cf30d7ec (patch) | |
| tree | 5f1335e1bad920eec72b2dab24777e1f65d66ae0 | |
| parent | c2b76d9099ac551f829f9cec821c23a9aff6b018 (diff) | |
| download | decky-loader-2e53fb217a0e870359b48a1f2324f3f5cf30d7ec.tar.gz decky-loader-2e53fb217a0e870359b48a1f2324f3f5cf30d7ec.zip | |
Add better handling for unloading of plugins
| -rw-r--r-- | backend/browser.py | 2 | ||||
| -rw-r--r-- | backend/plugin.py | 6 | ||||
| -rw-r--r-- | frontend/src/plugin-loader.tsx | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/backend/browser.py b/backend/browser.py index f6cae5d3..40994b01 100644 --- a/backend/browser.py +++ b/backend/browser.py @@ -108,7 +108,7 @@ class PluginBrowser: try: logger.info("uninstalling " + name) logger.info(" at dir " + self.find_plugin_folder(name)) - logger.debug("unloading %s" % str(name)) + logger.debug("calling frontend unload for %s" % str(name)) await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')") if self.plugins[name]: self.plugins[name].stop() diff --git a/backend/plugin.py b/backend/plugin.py index df0efe16..883f86f4 100644 --- a/backend/plugin.py +++ b/backend/plugin.py @@ -92,9 +92,12 @@ class PluginWrapper: async def _unload(self): try: - self.log.info("Attempting to unload " + self.name + "\n") + self.log.info("Attempting to unload with plugin " + self.name + "'s \"_unload function/\"" + "\n") if hasattr(self.Plugin, "_unload"): await self.Plugin._unload(self.Plugin) + self.log.info("Unloaded " + self.name + "\n") + else: + self.log.info("Could not find \"_unload\" in " + self.name + "'s main.py" + "\n") except: self.log.error("Failed to unload " + self.name + "!\n" + format_exc()) exit(0) @@ -118,6 +121,7 @@ class PluginWrapper: break data = loads(line.decode("utf-8")) if "stop" in data: + self.log.info("Calling Loader unload function.") await self._unload() get_event_loop().stop() while get_event_loop().is_running(): diff --git a/frontend/src/plugin-loader.tsx b/frontend/src/plugin-loader.tsx index 7215b49a..1a788a5b 100644 --- a/frontend/src/plugin-loader.tsx +++ b/frontend/src/plugin-loader.tsx @@ -335,7 +335,7 @@ class PluginLoader extends Logger { fetchNoCors(url: string, request: any = {}) { let args = { method: 'POST', headers: {} }; const req = { ...args, ...request, url, data: request.body }; - req?.body && delete req.body + req?.body && delete req.body; return this.callServerMethod('http_request', req); }, executeInTab(tab: string, runAsync: boolean, code: string) { |