fastled 1.2.28__tar.gz → 1.2.30__tar.gz

{fastled-1.2.28 → fastled-1.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.28
+Version: 1.2.30
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.28 → fastled-1.2.30}/src/fastled/__init__.py

@@ -15,7 +15,7 @@ from .types import BuildMode, CompileResult, CompileServerError
 # IMPORTANT! There's a bug in github which will REJECT any version update
 # that has any other change in the repo. Please bump the version as the
 # ONLY change in a commit, or else the pypi update and the release will fail.
-__version__ = "1.2.28"
+__version__ = "1.2.30"
 
 
 class Api:
@@ -81,6 +81,7 @@ class Api:
         interactive=False,
         auto_updates=None,
         auto_start=True,
+        mapped_dir: Path | None = None,
         container_name: str | None = None,
     ) -> CompileServer:
         from fastled.compile_server import CompileServer
@@ -89,7 +90,7 @@ class Api:
             container_name=container_name,
             interactive=interactive,
             auto_updates=auto_updates,
-            mapped_dir=None,
+            mapped_dir=mapped_dir,
             auto_start=auto_start,
         )
         return out
@@ -100,12 +101,14 @@ class Api:
         interactive=False,
         auto_updates=None,
         auto_start=True,
+        mapped_dir: Path | None = None,
         container_name: str | None = None,
     ) -> Generator[CompileServer, None, None]:
         server = Api.spawn_server(
             interactive=interactive,
             auto_updates=auto_updates,
             auto_start=auto_start,
+            mapped_dir=mapped_dir,
             container_name=container_name,
         )
         try:

{fastled-1.2.28 → fastled-1.2.30}/src/fastled/app.py

@@ -44,14 +44,27 @@ def run_server(args: argparse.Namespace) -> int:
 
 def main() -> int:
     args = parse_args()
-    if args.update:
+    interactive: bool = args.interactive
+    server: str | CompileServer | None = args.server
+    update: bool = args.update
+    build: bool = args.build
+    just_compile: bool = args.just_compile
+    directory: Path | None = Path(args.directory).absolute() if args.directory else None
+
+    if directory is None and interactive:
+        # if examples/wasm exists
+        if Path("examples/wasm").exists():
+            print(f"Using {Path('examples/wasm')} as the sketch directory")
+            directory = Path("examples/wasm").absolute()
+
+    if update:
         # Force auto_update to ensure update check happens
         compile_server = CompileServer(interactive=False, auto_updates=True)
         compile_server.stop()
         print("Finished updating.")
         return 0
 
-    if args.build:
+    if build:
         try:
             project_root = Path(".").absolute()
             print(f"Building Docker image at {project_root}")
@@ -61,15 +74,18 @@ def main() -> int:
                 project_root=project_root
             )
             print(f"Built Docker image: {docker_image_name}")
-            if not args.directory:
+            if not directory:
                 print("No sketch directory specified. So exiting...")
                 return 0
             print("Running server")
             with Api.server(
-                auto_updates=False, container_name=docker_image_name
+                auto_updates=False,
+                container_name=docker_image_name,
+                interactive=interactive,
+                mapped_dir=directory,
             ) as server:
                 sketch_dir = Path("examples/wasm")
-                if args.just_compile:
+                if just_compile:
                     rtn = run_client(
                         directory=sketch_dir,
                         host=server,
@@ -90,7 +106,7 @@ def main() -> int:
             print("\nExiting from client...")
             return 1
 
-    if args.server:
+    if server:
         print("Running in server only mode.")
         return run_server(args)
     else:
@@ -101,6 +117,11 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
+        sys.argv.append("-b")
+        sys.argv.append("-i")
+        import os
+
+        os.chdir("../fastled")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

{fastled-1.2.28 → fastled-1.2.30}/src/fastled/compile_server_impl.py

@@ -1,4 +1,5 @@
 import subprocess
+import sys
 import time
 import warnings
 from datetime import datetime, timezone
@@ -69,6 +70,10 @@ class CompileServerImpl:
         if wait_for_startup:
             ok = self.wait_for_startup()
             if not ok:
+                if self.interactive:
+                    print("Exited from container.")
+                    sys.exit(0)
+                    return
                 raise CompileServerError("Server did not start")
         if not self.interactive:
             msg = f"# FastLED Compile Server started at {self.url()} #"

{fastled-1.2.28 → fastled-1.2.30}/src/fastled/docker_manager.py

@@ -544,7 +544,7 @@ class DockerManager:
                 docker_command.append(command)
             cmd_str: str = subprocess.list2cmdline(docker_command)
             print(f"Running command: {cmd_str}")
-            subprocess.run(docker_command, check=True)
+            subprocess.run(docker_command, check=False)
         except subprocess.CalledProcessError as e:
             print(f"Error running Docker command: {e}")
             diff = time.time() - start_time

{fastled-1.2.28 → fastled-1.2.30}/src/fastled/filewatcher.py

@@ -1,5 +1,4 @@
-"""File system watcher implementation using watchdog
-"""
+"""File system watcher implementation using watchdog"""
 
 import hashlib
 import os

{fastled-1.2.28 → fastled-1.2.30}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.28
+Version: 1.2.30
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies