Add better handling for unloading of plugins

2 files changed, 6 insertions, 2 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():