fastled 1.2.38__tar.gz → 1.2.40__tar.gz

{fastled-1.2.38 → fastled-1.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.38
+Version: 1.2.40
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -37,6 +37,7 @@ Dynamic: maintainer
 [![Build Webpage](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml)
 
 
+
 ## Compile your FastLED sketch and run it on the Browser!
 
 ![image](https://github.com/user-attachments/assets/243aeb4d-e42f-4cc3-9c31-0af51271f3e0)

{fastled-1.2.38 → fastled-1.2.40}/README.md

@@ -11,6 +11,7 @@
 [![Build Webpage](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml)
 
 
+
 ## Compile your FastLED sketch and run it on the Browser!
 
 ![image](https://github.com/user-attachments/assets/243aeb4d-e42f-4cc3-9c31-0af51271f3e0)

{fastled-1.2.38 → fastled-1.2.40}/src/fastled/__init__.py

@@ -16,7 +16,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.38"
+__version__ = "1.2.40"
 
 
 class Api:
@@ -298,11 +298,7 @@ class Docker:
         if interactive:
             if sketch_folder is None:
                 sketch_folder = project_root / "examples" / "wasm"
-        else:
-            if sketch_folder is not None:
-                raise ValueError(
-                    "Cannot specify sketch_folder when not in interactive mode."
-                )
+
         if isinstance(project_root, str):
             project_root = Path(project_root)
 

{fastled-1.2.38 → fastled-1.2.40}/src/fastled/app.py

@@ -60,17 +60,19 @@ def main() -> int:
         return 0
 
     if build:
-        try:
-            file_watcher_set(False)
-            project_root = Path(".").absolute()
-            print(f"Building Docker image at {project_root}")
-            from fastled import Api, Docker
-
-            server = Docker.spawn_server_from_fastled_repo(
-                project_root=project_root, interactive=interactive
-            )
-            assert isinstance(server, CompileServer)
+        file_watcher_set(False)
+        project_root = Path(".").absolute()
+        print(f"Building Docker image at {project_root}")
+        from fastled import Api, Docker
+
+        server = Docker.spawn_server_from_fastled_repo(
+            project_root=project_root,
+            interactive=interactive,
+            sketch_folder=directory,
+        )
+        assert isinstance(server, CompileServer)
 
+        try:
             if interactive:
                 server.stop()
                 return 0
@@ -82,17 +84,19 @@ def main() -> int:
                 return 0
 
             print("Running server")
+
             with Api.live_client(
                 auto_updates=False,
                 sketch_directory=directory,
                 host=server,
                 auto_start=True,
                 keep_running=not just_compile,
-            ) as client:
-                print(f"Exited client {client.url()}")
-                print(f"Exiting {server.name}")
+            ) as _:
+                while True:
+                    time.sleep(0.2)  # wait for user to exit
         except KeyboardInterrupt:
             print("\nExiting from client...")
+            server.stop()
             return 1
 
     if has_server:
@@ -106,12 +110,13 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
-        sys.argv.append("-i")
+        sys.argv.append("-b")
         # sys.argv.append("examples/wasm")
         # sys.argv.append()
         import os
 
         os.chdir("../fastled")
+        sys.argv.append("examples/wasm")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

{fastled-1.2.38 → fastled-1.2.40}/src/fastled/compile_server_impl.py

@@ -13,6 +13,7 @@ from fastled.docker_manager import (
     DockerManager,
     RunningContainer,
 )
+from fastled.interactive_srcs import INTERACTIVE_SOURCES
 from fastled.settings import DEFAULT_CONTAINER_NAME, IMAGE_NAME, SERVER_PORT
 from fastled.sketch import looks_like_fastled_repo
 from fastled.types import BuildMode, CompileResult, CompileServerError
@@ -221,10 +222,7 @@ class CompileServerImpl:
             if self.fastled_src_dir is not None:
                 # add volume for src/platforms/wasm/compiler/CMakelists.txt
                 # to allow for interactive compilation
-                interactive_sources = [
-                    "src/platforms/wasm/compiler/CMakeLists.txt",
-                    "src/platforms/wasm/compiler/build_archive.sh",
-                ]
+                interactive_sources = list(INTERACTIVE_SOURCES)
                 for src in interactive_sources:
                     src_path = Path(src).absolute()
                     if src_path.exists():

fastled-1.2.40/src/fastled/interactive_srcs.py

@@ -0,0 +1,5 @@
+INTERACTIVE_SOURCES: list[str] = [
+    "src/platforms/wasm/compiler/CMakeLists.txt",
+    "src/platforms/wasm/compiler/build_archive.sh",
+    "src/platforms/wasm/compiler/build.sh",
+]

{fastled-1.2.38 → fastled-1.2.40}/src/fastled/open_browser.py

@@ -45,9 +45,8 @@ def open_http_server_subprocess(
             stderr=subprocess.DEVNULL,
         )  # type ignore
     except KeyboardInterrupt:
-        import _thread
-
-        _thread.interrupt_main()
+        print("Exiting from server...")
+        sys.exit(0)
 
 
 def is_port_free(port: int) -> bool:

{fastled-1.2.38 → fastled-1.2.40}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.38
+Version: 1.2.40
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -37,6 +37,7 @@ Dynamic: maintainer
 [![Build Webpage](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml)
 
 
+
 ## Compile your FastLED sketch and run it on the Browser!
 
 ![image](https://github.com/user-attachments/assets/243aeb4d-e42f-4cc3-9c31-0af51271f3e0)

{fastled-1.2.38 → fastled-1.2.40}/src/fastled.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ src/fastled/compile_server.py
 src/fastled/compile_server_impl.py
 src/fastled/docker_manager.py
 src/fastled/filewatcher.py
+src/fastled/interactive_srcs.py
 src/fastled/keyboard.py
 src/fastled/live_client.py
 src/fastled/open_browser.py