reload does log.info Reloaded/Unloaded/Loaded; see #106

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -495,7 +495,8 @@ def import_recurse(ctx_name, visited, ctx2imports):
         if global_ctx_name in ctx_all:
             global_ctx = ctx_all[global_ctx_name]
             global_ctx.stop()
-            _LOGGER.debug("reload: deleting global_ctx=%s", global_ctx_name)
+            if global_ctx_name not in ctx2files or not ctx2files[global_ctx_name].autoload:
+                _LOGGER.info("Unloaded %s", global_ctx.get_file_path())
             GlobalContextMgr.delete(global_ctx_name)
     await Function.reaper_sync()
 
@@ -514,4 +515,7 @@ def import_recurse(ctx_name, visited, ctx2imports):
             source=src_info.source,
             mtime=src_info.mtime,
         )
-        await GlobalContextMgr.load_file(global_ctx, src_info.file_path, source=src_info.source, force=True)
+        reload = src_info.global_ctx_name in ctx_delete
+        await GlobalContextMgr.load_file(
+            global_ctx, src_info.file_path, source=src_info.source, reload=reload
+        )

custom_components/pyscript/global_ctx.py

@@ -36,6 +36,7 @@ def __init__(
         self.module = None
         self.rel_import_path = rel_import_path
         self.source = source
+        self.file_path = None
         self.mtime = mtime
         self.app_config = app_config
         self.imports = set()
@@ -97,6 +98,10 @@ def get_mtime(self):
         """Return the mtime."""
         return self.mtime
 
+    def get_file_path(self):
+        """Return the file path."""
+        return self.file_path
+
     def get_imports(self):
         """Return the imports."""
         return self.imports
@@ -287,7 +292,7 @@ def new_name(cls, root):
                 return name
 
     @classmethod
-    async def load_file(cls, global_ctx, file_path, source=None, force=False):
+    async def load_file(cls, global_ctx, file_path, source=None, reload=False):
         """Load, parse and run the given script file; returns error ast_ctx on error, or None if ok."""
 
         mtime = None
@@ -331,10 +336,11 @@ def read_file(path):
             global_ctx.stop()
             return False, ast_ctx
         global_ctx.source = source
+        global_ctx.file_path = file_path
         if mtime is not None:
             global_ctx.mtime = mtime
         cls.set(global_ctx.get_name(), global_ctx)
 
-        _LOGGER.info("Loaded %s", file_path)
+        _LOGGER.info("%s %s", "Reloaded" if reload else "Loaded", file_path)
 
         return True, None