AppManager: try .mpy before .py

ThomasFarstrike · ThomasFarstrike · commit 75bbbc70fdda · 2026-05-20T14:10:57.000+02:00
diff --git a/internal_filesystem/lib/mpos/content/app_manager.py b/internal_filesystem/lib/mpos/content/app_manager.py
@@ -315,32 +315,64 @@ def is_installed_by_name(app_fullname):
     def execute_script(script_source, is_file, classname, cwd=None, app_fullname=None):
         """Run the script in the current thread. Returns True if successful."""
         import utime # for timing read and compile
-        import lvgl as lv
         import mpos.ui
         import _thread
+        import sys
         thread_id = _thread.get_ident()
         compile_name = 'script' if not is_file else script_source
+        executed_name = compile_name
         print(f"Thread {thread_id}: executing script with cwd: {cwd}")
         try:
-            if is_file:
-                print(f"Thread {thread_id}: reading script from file {script_source}")
-                with open(script_source, 'r') as f: # No need to check if it exists as exceptions are caught
-                    start_time = utime.ticks_ms()
-                    script_source = f.read()
-                    read_time = utime.ticks_diff(utime.ticks_ms(), start_time)
-                    print(f"execute_script: reading script_source took {read_time}ms")
             script_globals = {
-                'lv': lv,
-                'mpos': mpos,
                 '__name__': "__main__", # in case the script wants this
-                '__file__': compile_name
+                '__file__': compile_name # useful for logger
             }
             print(f"Thread {thread_id}: starting script")
-            import sys
             path_before = sys.path[:]  # Make a copy, not a reference
             if cwd:
                 sys.path.append(cwd)
             try:
+                if is_file and script_source.endswith(".py"):
+                    mpy_source = script_source[:-3] + ".mpy"
+                    try:
+                        if os.stat(mpy_source)[0] & 0x8000:
+                            print(f"Thread {thread_id}: found precompiled script {mpy_source}")
+                            executed_name = mpy_source
+                            module_name = mpy_source.rsplit("/", 1)[-1][:-4]
+                            import builtins
+                            if module_name in sys.modules:
+                                del sys.modules[module_name]
+                            try:
+                                print(f"app_manager.py trying to __import__({module_name})")
+                                module = __import__(module_name)
+                            except Exception as e:
+                                print(f"app_manager.py failed to __import__({module_name}")
+                            module.__file__ = mpy_source
+                            module.__name__ = "__main__"
+                            main_activity = getattr(module, classname, None)
+                            if main_activity:
+                                from mpos.activity_navigator import ActivityNavigator
+                                from .intent import Intent
+                                start_time = utime.ticks_ms()
+                                ActivityNavigator.startActivity(Intent(activity_class=main_activity, app_fullname=app_fullname))
+                                end_time = utime.ticks_diff(utime.ticks_ms(), start_time)
+                                print(f"execute_script: ActivityNavigator.startActivity took {end_time}ms")
+                                return True
+                            raise Exception("could not find app's main_activity {} in {}".format(classname, mpy_source))
+                    except OSError:
+                        pass
+                    except Exception as e:
+                        print(f"WARNING: failed running precompiled script {mpy_source}: {e}")
+                        sys.print_exception(e)
+
+                if is_file:
+                    print(f"Thread {thread_id}: reading script from file {script_source}")
+                    with open(script_source, 'r') as f: # No need to check if it exists as exceptions are caught
+                        start_time = utime.ticks_ms()
+                        script_source = f.read()
+                        read_time = utime.ticks_diff(utime.ticks_ms(), start_time)
+                        print(f"execute_script: reading script_source took {read_time}ms")
+
                 start_time = utime.ticks_ms()
                 compiled_script = compile(script_source, compile_name, 'exec')
                 compile_time = utime.ticks_diff(utime.ticks_ms(), start_time)
@@ -375,7 +407,7 @@ def execute_script(script_source, is_file, classname, cwd=None, app_fullname=Non
                 return False
             finally:
                 # Always restore sys.path, even if we return early or raise an exception
-                print(f"Thread {thread_id}: script {compile_name} finished, restoring sys.path from {sys.path} to {path_before}")
+                print(f"Thread {thread_id}: script {executed_name} finished, restoring sys.path from {sys.path} to {path_before}")
                 sys.path = path_before
             return True
         except Exception as e:
