fastled 1.1.20__tar.gz → 1.1.21__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.20
+Version: 1.1.21
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -161,6 +161,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 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.
   * 1.1.18 - Fixes for when the image has never been downloaded.

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

@@ -140,6 +140,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 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.
   * 1.1.18 - Fixes for when the image has never been downloaded.

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

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

fastled-1.1.21/src/fastled/app.py

@@ -0,0 +1,197 @@
+"""
+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)

fastled-1.1.20/src/fastled/app.py → fastled-1.1.21/src/fastled/client_server.py

@@ -1,30 +1,21 @@
-"""
-Uses the latest wasm compiler image to compile the FastLED sketch.
-"""
-
 import argparse
-import os
-import platform
 import shutil
 import subprocess
-import sys
 import tempfile
 import time
-from dataclasses import dataclass
 from pathlib import Path
 
-from fastled import __version__
 from fastled.build_mode import BuildMode, get_build_mode
 from fastled.compile_server import CompileServer
 from fastled.docker_manager import DockerManager
+from fastled.env import DEFAULT_URL
 from fastled.filewatcher import FileWatcherProcess
 from fastled.keyboard import SpaceBarWatcher
 from fastled.open_browser import open_browser_thread
-from fastled.sketch import (
-    find_sketch_directories,
-    looks_like_fastled_repo,
-    looks_like_sketch_directory,
-)
+from fastled.sketch import looks_like_sketch_directory
+
+# CompiledResult
+from fastled.types import CompiledResult
 from fastled.web_compile import (
     SERVER_PORT,
     ConnectionResult,
@@ -32,157 +23,8 @@ from fastled.web_compile import (
     web_compile,
 )
 
-machine = platform.machine().lower()
-IS_ARM: bool = "arm" in machine or "aarch64" in machine
-PLATFORM_TAG: str = "-arm64" if IS_ARM else ""
-CONTAINER_NAME = f"fastled-wasm-compiler{PLATFORM_TAG}"
-DEFAULT_URL = "https://fastled.onrender.com"
-
-
-@dataclass
-class CompiledResult:
-    """Dataclass to hold the result of the compilation."""
-
-    success: bool
-    fastled_js: str
-    hash_value: str | None
-
-
-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_web_compiler(
+def _run_web_compiler(
     directory: Path,
     host: str,
     build_mode: BuildMode,
@@ -281,7 +123,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
             return DEFAULT_URL
 
 
-def run_client(args: argparse.Namespace) -> int:
+def run_client_server(args: argparse.Namespace) -> int:
     compile_server: CompileServer | None = None
     open_web_browser = not args.just_compile and not args.interactive
     profile = args.profile
@@ -325,7 +167,7 @@ def run_client(args: argparse.Namespace) -> int:
             profile: bool = profile,
             last_hash_value: str | None = None,
         ) -> CompiledResult:
-            return run_web_compiler(
+            return _run_web_compiler(
                 args.directory,
                 host=url,
                 build_mode=build_mode,
@@ -361,7 +203,6 @@ def run_client(args: argparse.Namespace) -> int:
             compile_server.stop()
         return 1
 
-    print("\nWatching for changes. Press Ctrl+C to stop...")
     sketch_filewatcher = FileWatcherProcess(
         args.directory, excluded_patterns=["fastled_js"]
     )
@@ -375,7 +216,7 @@ def run_client(args: argparse.Namespace) -> int:
 
     def trigger_rebuild_if_sketch_changed(
         last_compiled_result: CompiledResult,
-    ) -> CompiledResult:
+    ) -> tuple[bool, CompiledResult]:
         changed_files = sketch_filewatcher.get_all_changes()
         if changed_files:
             print(f"\nChanges detected in {changed_files}")
@@ -385,14 +226,34 @@ def run_client(args: argparse.Namespace) -> int:
                 print("\nRecompilation failed.")
             else:
                 print("\nRecompilation successful.")
-            return out
-        return last_compiled_result
+            return True, out
+        return False, last_compiled_result
+
+    def print_status() -> None:
+        print("Will compile on sketch changes or if you hit the space bar.")
+
+    print_status()
+    print("Press Ctrl+C to stop...")
 
     try:
         while True:
-            last_compiled_result = trigger_rebuild_if_sketch_changed(
+            if SpaceBarWatcher.watch_space_bar_pressed(timeout=1.0):
+                print("Compiling...")
+                last_compiled_result = compile_function(last_hash_value=None)
+                if not last_compiled_result.success:
+                    print("\nRecompilation failed.")
+                else:
+                    print("\nRecompilation successful.")
+                # drain the space bar queue
+                SpaceBarWatcher.watch_space_bar_pressed()
+                print_status()
+                continue
+            changed, last_compiled_result = trigger_rebuild_if_sketch_changed(
                 last_compiled_result
             )
+            if changed:
+                print_status()
+                continue
             if compile_server and not compile_server.proceess_running():
                 print("Server process is not running. Exiting...")
                 return 1
@@ -403,25 +264,26 @@ def run_client(args: argparse.Namespace) -> int:
                 if changed_files:
                     print(f"\nChanges detected in FastLED source code: {changed_files}")
                     print("Press space bar to trigger compile.")
-
-                    space_key_watcher = SpaceBarWatcher()
-                    try:
-                        while True:
-                            if space_key_watcher.space_bar_pressed():
+                    while True:
+                        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:
+                            if space_bar_pressed:
                                 print("Space bar pressed, triggering recompile...")
-                                last_compiled_result = compile_function(
-                                    last_hash_value=None
-                                )
-                                print("Finished recompile.")
-                                break
-                            elif len(sketch_filewatcher.get_all_changes()) > 0:
-                                last_compiled_result = compile_function(
-                                    last_hash_value=None
-                                )
-                                break
-                            time.sleep(0.1)
-                    finally:
-                        space_key_watcher.stop()
+                            elif file_had_changes:
+                                print("Changes detected, triggering recompile...")
+                            last_compiled_result = compile_function(
+                                last_hash_value=None
+                            )
+                            print("Finished recompile.")
+                            # Drain the space bar queue
+                            SpaceBarWatcher.watch_space_bar_pressed()
+                            print_status()
+                            continue
 
     except KeyboardInterrupt:
         print("\nStopping watch mode...")
@@ -435,47 +297,3 @@ def run_client(args: argparse.Namespace) -> int:
             compile_server.stop()
         if browser_proc:
             browser_proc.kill()
-
-
-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(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)

fastled-1.1.21/src/fastled/env.py

@@ -0,0 +1,8 @@
+import os
+import platform
+
+MACHINE = platform.machine().lower()
+IS_ARM: bool = "arm" in MACHINE or "aarch64" in MACHINE
+PLATFORM_TAG: str = "-arm64" if IS_ARM else ""
+CONTAINER_NAME = f"fastled-wasm-compiler{PLATFORM_TAG}"
+DEFAULT_URL = str(os.environ.get("FASTLED_URL", "https://fastled.onrender.com"))

{fastled-1.1.20 → fastled-1.1.21}/src/fastled/keyboard.py

@@ -5,8 +5,25 @@ import time
 from multiprocessing import Process, Queue
 from queue import Empty
 
+_WHITE_SPACE = [" ", "\r", "\n"]
 
+
+# Original space bar, but now also enter key.
 class SpaceBarWatcher:
+
+    @classmethod
+    def watch_space_bar_pressed(cls, timeout: float = 0) -> bool:
+        watcher = cls()
+        try:
+            start_time = time.time()
+            while True:
+                if watcher.space_bar_pressed():
+                    return True
+                if time.time() - start_time > timeout:
+                    return False
+        finally:
+            watcher.stop()
+
     def __init__(self) -> None:
         self.queue: Queue = Queue()
         self.queue_cancel: Queue = Queue()
@@ -31,7 +48,7 @@ class SpaceBarWatcher:
                 # Check if there's input ready
                 if msvcrt.kbhit():  # type: ignore
                     char = msvcrt.getch().decode()  # type: ignore
-                    if char == " ":
+                    if char in _WHITE_SPACE:
                         self.queue.put(ord(" "))
 
         else:  # Unix-like systems
@@ -52,7 +69,7 @@ class SpaceBarWatcher:
                     # Check if there's input ready
                     if select.select([sys.stdin], [], [], 0.1)[0]:
                         char = sys.stdin.read(1)
-                        if char == " ":
+                        if char in _WHITE_SPACE:
                             self.queue.put(ord(" "))
             finally:
                 termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)  # type: ignore
@@ -60,9 +77,12 @@ class SpaceBarWatcher:
     def space_bar_pressed(self) -> bool:
         found = False
         while not self.queue.empty():
-            key = self.queue.get()
-            if key == ord(" "):
-                found = True
+            try:
+                key = self.queue.get(block=False, timeout=0.1)
+                if key == ord(" "):
+                    found = True
+            except Empty:
+                break
         return found
 
     def stop(self) -> None:

fastled-1.1.21/src/fastled/types.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class CompiledResult:
+    """Dataclass to hold the result of the compilation."""
+
+    success: bool
+    fastled_js: str
+    hash_value: str | None

{fastled-1.1.20 → fastled-1.1.21}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.20
+Version: 1.1.21
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -161,6 +161,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 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.
   * 1.1.18 - Fixes for when the image has never been downloaded.

{fastled-1.1.20 → fastled-1.1.21}/src/fastled.egg-info/SOURCES.txt

@@ -65,13 +65,16 @@ src/fastled/__init__.py
 src/fastled/app.py
 src/fastled/build_mode.py
 src/fastled/cli.py
+src/fastled/client_server.py
 src/fastled/compile_server.py
 src/fastled/docker_manager.py
+src/fastled/env.py
 src/fastled/filewatcher.py
 src/fastled/keyboard.py
 src/fastled/open_browser.py
 src/fastled/paths.py
 src/fastled/sketch.py
+src/fastled/types.py
 src/fastled/util.py
 src/fastled/web_compile.py
 src/fastled.egg-info/PKG-INFO