fastled 1.1.21__py2.py3-none-any.whl → 1.1.22__py2.py3-none-any.whl

fastled/__init__.py

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

fastled/app.py

@@ -1,197 +1,187 @@
-"""
-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",
+        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)
+            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.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.exit(main())
+    except KeyboardInterrupt:
+        print("\nExiting from main...")
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

fastled/select_sketch_directory.py

@@ -0,0 +1,35 @@
+from pathlib import Path
+
+from fastled.string_diff import string_diff_paths
+
+
+def select_sketch_directory(
+    sketch_directories: list[Path], cwd_is_fastled: bool
+) -> str | None:
+    if cwd_is_fastled:
+        exclude = ["src", "dev", "tests"]
+        for ex in exclude:
+            p = Path(ex)
+            if p in sketch_directories:
+                sketch_directories.remove(p)
+
+    if len(sketch_directories) == 1:
+        print(f"\nUsing sketch directory: {sketch_directories[0]}")
+        return 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
+            return str(sketch_directories[index])
+        except (ValueError, IndexError):
+            inputs = [p for p in sketch_directories]
+            top_hits: list[tuple[int, Path]] = string_diff_paths(which, inputs)
+            if len(top_hits) == 1:
+                example = top_hits[0][1]
+                return str(example)
+            else:
+                return select_sketch_directory([p for _, p in top_hits], cwd_is_fastled)
+    return None

fastled/string_diff.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+
+from rapidfuzz.distance import Levenshtein
+
+
+# Returns the min distance strings. If there is a tie, it returns
+# all the strings that have the same min distance.
+# Returns a tuple of index and string.
+def string_diff(
+    input_string: str, string_list: list[str], ignore_case=True
+) -> list[tuple[int, str]]:
+
+    def normalize(s: str) -> str:
+        return s.lower() if ignore_case else s
+
+    distances = [
+        Levenshtein.distance(normalize(input_string), normalize(s)) for s in string_list
+    ]
+    min_distance = min(distances)
+    out: list[tuple[int, str]] = []
+    for i, d in enumerate(distances):
+        if d == min_distance:
+            out.append((i, string_list[i]))
+    return out
+
+
+def string_diff_paths(
+    input_string: str | Path, path_list: list[Path], ignore_case=True
+) -> list[tuple[int, Path]]:
+    string_list = [str(p) for p in path_list]
+    tmp = string_diff(str(input_string), string_list, ignore_case)
+    # out: list[tuple[int, Path]] = [(i, Path(path_list[j])) for i, j in tmp]
+    out: list[tuple[int, Path]] = []
+    for i, j in tmp:
+        p = Path(j)
+        out.append((i, p))
+    return out

{fastled-1.1.21.dist-info → fastled-1.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.21
+Version: 1.1.22
 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
 
@@ -161,6 +162,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 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.dist-info → fastled-1.1.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fastled/__init__.py,sha256=pOw5nbbJX94KgZRkQws_Mailvb2JN7Uvr39bN4PjGqk,64
-fastled/app.py,sha256=ymCiVQjBGfqg7B_zFQmBIHFMD2SkDj1m_DzUNTbpOEw,6583
+fastled/__init__.py,sha256=Vwrw9C5ep3js4u63kaxEdkec1V40HfactjPKA7tUZv4,64
+fastled/app.py,sha256=UXHR4nFJzdU-3WGk9J7BB0RxkQVwKZ7XKCgfLp2yqW0,6281
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
 fastled/client_server.py,sha256=TLEmCxafrcBzo9FAz3OlIIgsSbNpVGsSuvZnIXpHXBA,11090
@@ -10,14 +10,16 @@ fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
 fastled/keyboard.py,sha256=TkFjDxGtGdDbjQF_LRqp54hmdcKaXjf1olTT8l6dEJk,3170
 fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
+fastled/select_sketch_directory.py,sha256=S9h8pHCDshaUGHdXaaFoh8g189ewA-GbKVEHKyaO2iQ,1304
 fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
+fastled/string_diff.py,sha256=svtaQFGp4a6r2Qjx-Gxhna94wK-d8LKV4OCpKMXiHso,1164
 fastled/types.py,sha256=dDIsGHJkHNJ7B61wNp6X0JSLs_nrHiq7RlNqNWbwFec,194
 fastled/util.py,sha256=t4M3NFMhnCzfYbLvIyJi0RdFssZqbTN_vVIaej1WV-U,265
 fastled/web_compile.py,sha256=KuvKGdX6SSUUqC7YgX4T9SMSP5wdcPUhpg9-K9zPoTI,10378
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-fastled-1.1.21.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.21.dist-info/METADATA,sha256=jsn8MyWpGA55L60pDAQ_Z1oHGVVJ51LGku8IzCG6f1g,13898
-fastled-1.1.21.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.21.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.21.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.21.dist-info/RECORD,,
+fastled-1.1.22.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.22.dist-info/METADATA,sha256=Xr6-uF2ohZ8Jjg3FSxLojs5nK6w7nbJ_cZ_e_1eGVeY,14012
+fastled-1.1.22.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.22.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.22.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.22.dist-info/RECORD,,