fastled 1.1.6__tar.gz → 1.1.7__tar.gz

{fastled-1.1.6 → fastled-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.6
+Version: 1.1.7
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -89,8 +89,10 @@ Pre-processing is done to your source files. A fake Arduino.h will be inserted i
 provide shims for most of the common api points.
 
 
+
 # Revisions
 
+  * 1.1.7 - Sketch cache re-enabled, but selectively invalidated on cpp/h updates. Cleaned up deprecated args. Fixed double thread running for containers that was causing slowdown.
   * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
   * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
   * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.

{fastled-1.1.6 → fastled-1.1.7}/README.md

@@ -70,8 +70,10 @@ Pre-processing is done to your source files. A fake Arduino.h will be inserted i
 provide shims for most of the common api points.
 
 
+
 # Revisions
 
+  * 1.1.7 - Sketch cache re-enabled, but selectively invalidated on cpp/h updates. Cleaned up deprecated args. Fixed double thread running for containers that was causing slowdown.
   * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
   * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
   * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.

{fastled-1.1.6 → fastled-1.1.7}/examples/wasm/wasm.ino

@@ -84,6 +84,8 @@ NumberField fxIndex("Animartrix - iex", 0, 0, NUM_ANIMATIONS);
 Animartrix animartrix(xyMap, POLAR_WAVES);
 FxEngine fxEngine(NUM_LEDS);
 
+
+
 void setup() {
     FastLED.addLeds<WS2811, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS)
         .setCorrection(TypicalLEDStrip)

{fastled-1.1.6 → fastled-1.1.7}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "filelock",
 ]
 # Change this with the version number bump.
-version = "1.1.6"
+version = "1.1.7"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{fastled-1.1.6 → fastled-1.1.7}/src/fastled/app.py

@@ -20,7 +20,7 @@ from fastled.compile_server import CompileServer, looks_like_fastled_repo
 from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileChangedNotifier
 from fastled.open_browser import open_browser_thread
-from fastled.sketch import get_sketch_files
+from fastled.sketch import looks_like_sketch_directory
 from fastled.web_compile import web_compile
 
 machine = platform.machine().lower()
@@ -49,7 +49,7 @@ def parse_args() -> argparse.Namespace:
         "directory",
         type=str,
         nargs="?",
-        default=os.getcwd(),
+        default=None,
         help="Directory containing the FastLED sketch to compile",
     )
     parser.add_argument(
@@ -57,11 +57,6 @@ def parse_args() -> argparse.Namespace:
         action="store_true",
         help="Just compile, skip opening the browser and watching for changes.",
     )
-    parser.add_argument(
-        "--no-auto-clean",
-        action="store_true",
-        help="Big performance gains for compilation, but it's flaky at this time",
-    )
     parser.add_argument(
         "--web",
         "-w",
@@ -71,17 +66,6 @@ def parse_args() -> argparse.Namespace:
         const=DEFAULT_URL,  # Default value when --web is specified without value
         help="Use web compiler. Optional URL can be provided (default: https://fastled.onrender.com)",
     )
-    parser.add_argument(
-        "--reuse",
-        action="store_true",
-        help="Reuse the existing container if it exists. (Not available with --web)",
-    )
-    parser.add_argument(
-        "--exclude",
-        type=str,
-        nargs="+",
-        help="Additional patterns to exclude from file watching (Not available with --web)",
-    )
     parser.add_argument(
         "-i",
         "--interactive",
@@ -117,14 +101,18 @@ def parse_args() -> argparse.Namespace:
     )
 
     args = parser.parse_args()
-
-    # Handle --web implications
-    if args.web:
-        if args.reuse:
-            parser.error("--reuse cannot be used with --web")
-        if args.exclude:
-            parser.error("--exclude cannot be used with --web")
-
+    if args.server and args.web:
+        parser.error("--server and --web are mutually exclusive")
+    if args.directory is None and not args.server:
+        # does current directory look like a sketch?
+        maybe_sketch_dir = Path(os.getcwd())
+        if looks_like_sketch_directory(maybe_sketch_dir):
+            args.directory = str(maybe_sketch_dir)
+        else:
+            print(
+                "\nYou either need to specify a sketch directory or run in --server mode."
+            )
+            sys.exit(1)
     return args
 
 
@@ -195,9 +183,8 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
             return DEFAULT_URL
         return args.web
     else:
-        disable_auto_clean = args.no_auto_clean
         try:
-            compile_server = CompileServer(disable_auto_clean=disable_auto_clean)
+            compile_server = CompileServer()
             print("Waiting for the local compiler to start...")
             if not compile_server.wait_for_startup():
                 print("Failed to start local compiler.")
@@ -210,42 +197,11 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
             return DEFAULT_URL
 
 
-def _lots_and_lots_of_files(directory: Path) -> bool:
-    return len(get_sketch_files(directory)) > 100
-
-
-def _looks_like_sketch_directory(directory: Path) -> bool:
-    if looks_like_fastled_repo(directory):
-        print("Directory looks like the FastLED repo")
-        return False
-
-    if _lots_and_lots_of_files(directory):
-        print("Too many files in the directory, bailing out")
-        return False
-
-    # walk the path and if there are over 30 files, return False
-    # at the root of the directory there should either be an ino file or a src directory
-    # or some cpp files
-    # if there is a platformio.ini file, return True
-    ino_file_at_root = list(directory.glob("*.ino"))
-    if ino_file_at_root:
-        return True
-    cpp_file_at_root = list(directory.glob("*.cpp"))
-    if cpp_file_at_root:
-        return True
-    platformini_file = list(directory.glob("platformio.ini"))
-    if platformini_file:
-        return True
-    return False
-
-
 def run_client(args: argparse.Namespace) -> int:
     compile_server: CompileServer | None = None
     open_web_browser = not args.just_compile
     profile = args.profile
-    if not args.force_compile and not _looks_like_sketch_directory(
-        Path(args.directory)
-    ):
+    if not args.force_compile and not looks_like_sketch_directory(Path(args.directory)):
         print(
             "Error: Not a valid FastLED sketch directory, if you are sure it is, use --force-compile"
         )
@@ -366,11 +322,9 @@ def run_client(args: argparse.Namespace) -> int:
 
 def run_server(args: argparse.Namespace) -> int:
     interactive = args.interactive
-    compile_server = CompileServer(
-        disable_auto_clean=args.no_auto_clean, interactive=interactive
-    )
-    print(f"Server started at {compile_server.url()}")
-    compile_server.start()
+    compile_server = CompileServer(interactive=interactive)
+    if not interactive:
+        print(f"Server started at {compile_server.url()}")
     compile_server.wait_for_startup()
     try:
         while True:
@@ -404,9 +358,13 @@ def main() -> int:
 
 if __name__ == "__main__":
     try:
+        project_root = Path(__file__).resolve().parent.parent.parent
+        print(f"Project root: {project_root}")
+        os.chdir(project_root)
+        os.chdir("../fastled")
         sys.argv.append("examples/wasm")
-        sys.argv.append("-w")
-        sys.argv.append("localhost")
+        sys.argv.append("--server")
+        sys.argv.append("--interactive")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

{fastled-1.1.6 → fastled-1.1.7}/src/fastled/compile_server.py

@@ -8,6 +8,7 @@ from typing import Optional
 import httpx
 
 from fastled.docker_manager import DockerManager
+from fastled.sketch import looks_like_fastled_repo
 
 _DEFAULT_CONTAINER_NAME = "fastled-wasm-compiler"
 
@@ -27,19 +28,10 @@ def find_available_port(start_port: int = SERVER_PORT) -> int:
                 raise RuntimeError("No available ports found")
 
 
-def looks_like_fastled_repo(directory: Path) -> bool:
-    libprops = directory / "library.properties"
-    if not libprops.exists():
-        return False
-    txt = libprops.read_text()
-    return "FastLED" in txt
-
-
 class CompileServer:
     def __init__(
         self,
         container_name=_DEFAULT_CONTAINER_NAME,
-        disable_auto_clean: bool = False,
         interactive: bool = False,
     ) -> None:
 
@@ -52,14 +44,13 @@ class CompileServer:
             fastled_src_dir = cwd / "src"
 
         self.container_name = container_name
-        self.disable_auto_clean = disable_auto_clean
         self.docker = DockerManager(container_name=container_name)
         self.running = False
         self.thread: Optional[threading.Thread] = None
         self.running_process: subprocess.Popen | None = None
         self.fastled_src_dir: Path | None = fastled_src_dir
         self.interactive = interactive
-        self._port = self.start()
+        self._port = self._start()
 
     def port(self) -> int:
         return self._port
@@ -91,7 +82,7 @@ class CompileServer:
                 return False
         return False
 
-    def start(self) -> int:
+    def _start(self) -> int:
         print("Compiling server starting")
         self.running = True
         # Ensure Docker is running
@@ -141,24 +132,20 @@ class CompileServer:
             server_command = ["/bin/bash"]
         else:
             server_command = ["python", "/js/run.py", "server"]
-        if self.disable_auto_clean:
-            server_command.append("--disable-auto-clean")
         print(f"Started Docker container with command: {server_command}")
         ports = {port: 80}
         volumes = None
         if self.fastled_src_dir:
             print(
-                f"Mounting FastLED source directory {self.fastled_src_dir} into container /js/fastled/src"
+                f"Mounting FastLED source directory {self.fastled_src_dir} into container /host/fastled/src"
             )
             volumes = {
                 str(self.fastled_src_dir): {"bind": "/host/fastled/src", "mode": "ro"}
             }
-            # no auto-update because the source directory is mapped in.
-            server_command.append("--no-auto-update")  # stop git repo updates.
             if not self.interactive:
-                server_command.append(
-                    "--no-sketch-cache"
-                )  # Remove sketch cache which assumes src is static.
+                # no auto-update because the source directory is mapped in.
+                # This should be automatic now.
+                server_command.append("--no-auto-update")  # stop git repo updates.
         self.running_process = self.docker.run_container(
             server_command, ports=ports, volumes=volumes
         )

fastled-1.1.7/src/fastled/sketch.py

@@ -0,0 +1,55 @@
+import os
+from pathlib import Path
+
+
+def get_sketch_files(directory: Path) -> list[Path]:
+    files: list[Path] = []
+    for root, dirs, filenames in os.walk(directory):
+        # ignore hidden directories
+        dirs[:] = [d for d in dirs if not d.startswith(".")]
+        # ignore fastled_js directory
+        dirs[:] = [d for d in dirs if "fastled_js" not in d]
+        # ignore hidden files
+        filenames = [f for f in filenames if not f.startswith(".")]
+        for filename in filenames:
+            if "platformio.ini" in filename:
+                continue
+            files.append(Path(root) / filename)
+    return files
+
+
+def looks_like_fastled_repo(directory: Path) -> bool:
+    libprops = directory / "library.properties"
+    if not libprops.exists():
+        return False
+    txt = libprops.read_text(encoding="utf-8", errors="ignore")
+    return "FastLED" in txt
+
+
+def _lots_and_lots_of_files(directory: Path) -> bool:
+    return len(get_sketch_files(directory)) > 100
+
+
+def looks_like_sketch_directory(directory: Path) -> bool:
+    if looks_like_fastled_repo(directory):
+        print("Directory looks like the FastLED repo")
+        return False
+
+    if _lots_and_lots_of_files(directory):
+        print("Too many files in the directory, bailing out")
+        return False
+
+    # walk the path and if there are over 30 files, return False
+    # at the root of the directory there should either be an ino file or a src directory
+    # or some cpp files
+    # if there is a platformio.ini file, return True
+    ino_file_at_root = list(directory.glob("*.ino"))
+    if ino_file_at_root:
+        return True
+    cpp_file_at_root = list(directory.glob("*.cpp"))
+    if cpp_file_at_root:
+        return True
+    platformini_file = list(directory.glob("platformio.ini"))
+    if platformini_file:
+        return True
+    return False

{fastled-1.1.6 → fastled-1.1.7}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.6
+Version: 1.1.7
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -89,8 +89,10 @@ Pre-processing is done to your source files. A fake Arduino.h will be inserted i
 provide shims for most of the common api points.
 
 
+
 # Revisions
 
+  * 1.1.7 - Sketch cache re-enabled, but selectively invalidated on cpp/h updates. Cleaned up deprecated args. Fixed double thread running for containers that was causing slowdown.
   * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
   * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
   * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.

fastled-1.1.6/src/fastled/sketch.py

@@ -1,18 +0,0 @@
-import os
-from pathlib import Path
-
-
-def get_sketch_files(directory: Path) -> list[Path]:
-    files: list[Path] = []
-    for root, dirs, filenames in os.walk(directory):
-        # ignore hidden directories
-        dirs[:] = [d for d in dirs if not d.startswith(".")]
-        # ignore fastled_js directory
-        dirs[:] = [d for d in dirs if "fastled_js" not in d]
-        # ignore hidden files
-        filenames = [f for f in filenames if not f.startswith(".")]
-        for filename in filenames:
-            if "platformio.ini" in filename:
-                continue
-            files.append(Path(root) / filename)
-    return files