fastled 1.1.21__tar.gz → 1.1.23__tar.gz

{fastled-1.1.21 → fastled-1.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.21
+Version: 1.1.23
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -18,6 +18,7 @@ Requires-Dist: download
 Requires-Dist: filelock
 Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs
+Requires-Dist: rapidfuzz
 
 # FastLED Wasm compiler
 
@@ -31,6 +32,7 @@ Compiles an Arduino/Platformio sketch into a wasm binary that can be run directl
 [![Win_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml)
 
 
+
 # About
 
 This python app will compile your FastLED style sketches into html/js/wasm output that runs directly in the browser.
@@ -161,6 +163,8 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 1.1.23 - Various fixes for MacOS
+  * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity
   * 1.1.21 - Now always watches for space/enter key events to trigger a recompile.
   * 1.1.20 - Fixed a regression for 1.1.16 involving docker throwing an exception before DockerManager.is_running() could be called so it can be launched.
   * 1.1.19 - Automatically does a limit searches for sketch directories if you leave it blank.

{fastled-1.1.21 → fastled-1.1.23}/README.md

@@ -10,6 +10,7 @@ Compiles an Arduino/Platformio sketch into a wasm binary that can be run directl
 [![Win_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml)
 
 
+
 # About
 
 This python app will compile your FastLED style sketches into html/js/wasm output that runs directly in the browser.
@@ -140,6 +141,8 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 1.1.23 - Various fixes for MacOS
+  * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity
   * 1.1.21 - Now always watches for space/enter key events to trigger a recompile.
   * 1.1.20 - Fixed a regression for 1.1.16 involving docker throwing an exception before DockerManager.is_running() could be called so it can be launched.
   * 1.1.19 - Automatically does a limit searches for sketch directories if you leave it blank.

{fastled-1.1.21 → fastled-1.1.23}/pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "filelock",
     "disklru>=2.0.1",
     "appdirs",
+    "rapidfuzz",
 ]
 
 dynamic = ["version"]

{fastled-1.1.21 → fastled-1.1.23}/src/fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.21"
+__version__ = "1.1.23"

{fastled-1.1.21 → fastled-1.1.23}/src/fastled/app.py

@@ -1,197 +1,202 @@
-"""
-Uses the latest wasm compiler image to compile the FastLED sketch.
-"""
-
-import argparse
-import os
-import sys
-import time
-from pathlib import Path
-
-from fastled import __version__
-from fastled.client_server import run_client_server
-from fastled.compile_server import CompileServer
-from fastled.env import DEFAULT_URL
-from fastled.sketch import (
-    find_sketch_directories,
-    looks_like_fastled_repo,
-    looks_like_sketch_directory,
-)
-
-
-def parse_args() -> argparse.Namespace:
-    """Parse command-line arguments."""
-    parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
-    parser.add_argument(
-        "--version", action="version", version=f"%(prog)s {__version__}"
-    )
-    parser.add_argument(
-        "directory",
-        type=str,
-        nargs="?",
-        default=None,
-        help="Directory containing the FastLED sketch to compile",
-    )
-    parser.add_argument(
-        "--just-compile",
-        action="store_true",
-        help="Just compile, skip opening the browser and watching for changes.",
-    )
-    parser.add_argument(
-        "--web",
-        "-w",
-        type=str,
-        nargs="?",
-        # const does not seem to be working as expected
-        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(
-        "-i",
-        "--interactive",
-        action="store_true",
-        help="Run in interactive mode (Not available with --web)",
-    )
-    parser.add_argument(
-        "--profile",
-        action="store_true",
-        help="Enable profiling for web compilation",
-    )
-    parser.add_argument(
-        "--force-compile",
-        action="store_true",
-        help="Skips the test to see if the current directory is a valid FastLED sketch directory",
-    )
-    parser.add_argument(
-        "--no-auto-updates",
-        action="store_true",
-        help="Disable automatic updates of the wasm compiler image when using docker.",
-    )
-    parser.add_argument(
-        "--update",
-        action="store_true",
-        help="Update the wasm compiler (if necessary) before running",
-    )
-    parser.add_argument(
-        "--localhost",
-        "--local",
-        "-l",
-        action="store_true",
-        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
-    )
-    parser.add_argument(
-        "--server",
-        "-s",
-        action="store_true",
-        help="Run the server in the current directory, volume mapping fastled if we are in the repo",
-    )
-    build_mode = parser.add_mutually_exclusive_group()
-    build_mode.add_argument("--debug", action="store_true", help="Build in debug mode")
-    build_mode.add_argument(
-        "--quick",
-        action="store_true",
-        default=True,
-        help="Build in quick mode (default)",
-    )
-    build_mode.add_argument(
-        "--release", action="store_true", help="Build in release mode"
-    )
-
-    cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
-
-    args = parser.parse_args()
-    if args.update:
-        args.auto_update = True
-    elif args.no_auto_updates:
-        args.auto_update = False
-    else:
-        args.auto_update = None
-
-    if not cwd_is_fastled and not args.localhost and not args.web and not args.server:
-        print(f"Using web compiler at {DEFAULT_URL}")
-        args.web = DEFAULT_URL
-    if cwd_is_fastled and not args.web and not args.server:
-        print("Forcing --local mode because we are in the FastLED repo")
-        args.localhost = True
-    if args.localhost:
-        args.web = "localhost"
-    if args.interactive and not args.server:
-        print("--interactive forces --server mode")
-        args.server = True
-    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:
-            sketch_directories = find_sketch_directories(maybe_sketch_dir)
-            if len(sketch_directories) == 1:
-                print(f"\nUsing sketch directory: {sketch_directories[0]}")
-                args.directory = str(sketch_directories[0])
-            elif len(sketch_directories) > 1:
-                print("\nMultiple Directories found, choose one:")
-                for i, sketch_dir in enumerate(sketch_directories):
-                    print(f"  [{i+1}]: {sketch_dir}")
-                which = input("\nPlease specify a sketch directory: ")
-                try:
-                    index = int(which) - 1
-                    args.directory = str(sketch_directories[index])
-                except (ValueError, IndexError):
-                    print("Invalid selection.")
-                    sys.exit(1)
-            else:
-                print(
-                    "\nYou either need to specify a sketch directory or run in --server mode."
-                )
-                sys.exit(1)
-    elif args.directory is not None and os.path.isfile(args.directory):
-        dir_path = Path(args.directory).parent
-        if looks_like_sketch_directory(dir_path):
-            print(f"Using sketch directory: {dir_path}")
-            args.directory = str(dir_path)
-
-    return args
-
-
-def run_server(args: argparse.Namespace) -> int:
-    interactive = args.interactive
-    auto_update = args.auto_update
-    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
-    if not interactive:
-        print(f"Server started at {compile_server.url()}")
-    compile_server.wait_for_startup()
-    try:
-        while True:
-            if not compile_server.proceess_running():
-                print("Server process is not running. Exiting...")
-                return 1
-            time.sleep(1)
-    except KeyboardInterrupt:
-        print("\nExiting from server...")
-        return 1
-    finally:
-        compile_server.stop()
-    return 0
-
-
-def main() -> int:
-    args = parse_args()
-    if args.server:
-        print("Running in server only mode.")
-        return run_server(args)
-    else:
-        print("Running in client/server mode.")
-        return run_client_server(args)
-
-
-if __name__ == "__main__":
-    try:
-        os.chdir("../fastled")
-        sys.argv.append("--server")
-        sys.exit(main())
-    except KeyboardInterrupt:
-        print("\nExiting from main...")
-        sys.exit(1)
-    except Exception as e:
-        print(f"Error: {e}")
-        sys.exit(1)
+"""
+Uses the latest wasm compiler image to compile the FastLED sketch.
+"""
+
+import argparse
+import os
+import sys
+import time
+from pathlib import Path
+
+from fastled import __version__
+from fastled.client_server import run_client_server
+from fastled.compile_server import CompileServer
+from fastled.env import DEFAULT_URL
+from fastled.select_sketch_directory import select_sketch_directory
+from fastled.sketch import (
+    find_sketch_directories,
+    looks_like_fastled_repo,
+    looks_like_sketch_directory,
+)
+
+
+def parse_args() -> argparse.Namespace:
+    """Parse command-line arguments."""
+    parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
+    parser.add_argument(
+        "--version", action="version", version=f"%(prog)s {__version__}"
+    )
+    parser.add_argument(
+        "directory",
+        type=str,
+        nargs="?",
+        default=None,
+        help="Directory containing the FastLED sketch to compile",
+    )
+    parser.add_argument(
+        "--just-compile",
+        action="store_true",
+        help="Just compile, skip opening the browser and watching for changes.",
+    )
+    parser.add_argument(
+        "--web",
+        "-w",
+        type=str,
+        nargs="?",
+        # const does not seem to be working as expected
+        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(
+        "-i",
+        "--interactive",
+        action="store_true",
+        help="Run in interactive mode (Not available with --web)",
+    )
+    parser.add_argument(
+        "--profile",
+        action="store_true",
+        help="Enable profiling for web compilation",
+    )
+    parser.add_argument(
+        "--force-compile",
+        action="store_true",
+        help="Skips the test to see if the current directory is a valid FastLED sketch directory",
+    )
+    parser.add_argument(
+        "--no-auto-updates",
+        action="store_true",
+        help="Disable automatic updates of the wasm compiler image when using docker.",
+    )
+    parser.add_argument(
+        "--update",
+        "--upgrade",
+        action="store_true",
+        help="Update the wasm compiler (if necessary) before running",
+    )
+    parser.add_argument(
+        "--localhost",
+        "--local",
+        "-l",
+        action="store_true",
+        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
+    )
+    parser.add_argument(
+        "--server",
+        "-s",
+        action="store_true",
+        help="Run the server in the current directory, volume mapping fastled if we are in the repo",
+    )
+    build_mode = parser.add_mutually_exclusive_group()
+    build_mode.add_argument("--debug", action="store_true", help="Build in debug mode")
+    build_mode.add_argument(
+        "--quick",
+        action="store_true",
+        default=True,
+        help="Build in quick mode (default)",
+    )
+    build_mode.add_argument(
+        "--release", action="store_true", help="Build in release mode"
+    )
+
+    cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
+
+    args = parser.parse_args()
+    if not args.update:
+        if args.no_auto_updates:
+            args.auto_update = False
+        else:
+            args.auto_update = None
+
+        if (
+            not cwd_is_fastled
+            and not args.localhost
+            and not args.web
+            and not args.server
+        ):
+            print(f"Using web compiler at {DEFAULT_URL}")
+            args.web = DEFAULT_URL
+        if cwd_is_fastled and not args.web and not args.server:
+            print("Forcing --local mode because we are in the FastLED repo")
+            args.localhost = True
+        if args.localhost:
+            args.web = "localhost"
+        if args.interactive and not args.server:
+            print("--interactive forces --server mode")
+            args.server = True
+        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:
+                sketch_directories = find_sketch_directories(maybe_sketch_dir)
+                selected_dir = select_sketch_directory(
+                    sketch_directories, cwd_is_fastled
+                )
+                if selected_dir:
+                    print(f"Using sketch directory: {selected_dir}")
+                    args.directory = selected_dir
+                else:
+                    print(
+                        "\nYou either need to specify a sketch directory or run in --server mode."
+                    )
+                    sys.exit(1)
+        elif args.directory is not None and os.path.isfile(args.directory):
+            dir_path = Path(args.directory).parent
+            if looks_like_sketch_directory(dir_path):
+                print(f"Using sketch directory: {dir_path}")
+                args.directory = str(dir_path)
+
+    return args
+
+
+def run_server(args: argparse.Namespace) -> int:
+    interactive = args.interactive
+    auto_update = args.auto_update
+    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
+    if not interactive:
+        print(f"Server started at {compile_server.url()}")
+    compile_server.wait_for_startup()
+    try:
+        while True:
+            if not compile_server.proceess_running():
+                print("Server process is not running. Exiting...")
+                return 1
+            time.sleep(1)
+    except KeyboardInterrupt:
+        print("\nExiting from server...")
+        return 1
+    finally:
+        compile_server.stop()
+    return 0
+
+
+def main() -> int:
+    args = parse_args()
+    if args.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.server:
+        print("Running in server only mode.")
+        return run_server(args)
+    else:
+        print("Running in client/server mode.")
+        return run_client_server(args)
+
+
+if __name__ == "__main__":
+    try:
+        os.chdir("../fastled")
+        sys.argv.append("--upgrade")
+        sys.exit(main())
+    except KeyboardInterrupt:
+        print("\nExiting from main...")
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

{fastled-1.1.21 → fastled-1.1.23}/src/fastled/client_server.py

@@ -268,14 +268,15 @@ def run_client_server(args: argparse.Namespace) -> int:
                         space_bar_pressed = SpaceBarWatcher.watch_space_bar_pressed(
                             timeout=1.0
                         )
-                        file_had_changes = (
-                            len(source_code_watcher.get_all_changes()) > 0
-                        )
-                        if space_bar_pressed or file_had_changes:
+                        file_changes = source_code_watcher.get_all_changes()
+
+                        if space_bar_pressed or file_changes:
                             if space_bar_pressed:
                                 print("Space bar pressed, triggering recompile...")
-                            elif file_had_changes:
-                                print("Changes detected, triggering recompile...")
+                            elif file_changes:
+                                print(
+                                    f"Changes detected in {','.join(file_changes)}, triggering recompile..."
+                                )
                             last_compiled_result = compile_function(
                                 last_hash_value=None
                             )