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

fastled/keyboard.py

@@ -2,8 +2,8 @@ import os
 import select
 import sys
 import time
-from multiprocessing import Process, Queue
-from queue import Empty
+from queue import Empty, Queue
+from threading import Thread
 
 _WHITE_SPACE = [" ", "\r", "\n"]
 
@@ -27,7 +27,7 @@ class SpaceBarWatcher:
     def __init__(self) -> None:
         self.queue: Queue = Queue()
         self.queue_cancel: Queue = Queue()
-        self.process = Process(target=self._watch_for_space)
+        self.process = Thread(target=self._watch_for_space, daemon=True)
         self.process.start()
 
     def _watch_for_space(self) -> None:
@@ -81,16 +81,14 @@ class SpaceBarWatcher:
                 key = self.queue.get(block=False, timeout=0.1)
                 if key == ord(" "):
                     found = True
+                self.queue.task_done()
             except Empty:
                 break
         return found
 
     def stop(self) -> None:
         self.queue_cancel.put(True)
-        self.process.terminate()
         self.process.join()
-        self.queue.close()
-        self.queue.join_thread()
 
 
 def main() -> None:
@@ -98,10 +96,14 @@ def main() -> None:
     try:
         while True:
             if watcher.space_bar_pressed():
+                print("Space bar hit!")
                 break
             time.sleep(1)
     finally:
+        print("Stopping watcher.")
         watcher.stop()
+        print("Watcher stopped.")
+    return
 
 
 if __name__ == "__main__":

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: ").strip()
+        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.23.dist-info}/METADATA

@@ -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.dist-info → fastled-1.1.23.dist-info}/RECORD

@@ -1,23 +1,25 @@
-fastled/__init__.py,sha256=pOw5nbbJX94KgZRkQws_Mailvb2JN7Uvr39bN4PjGqk,64
-fastled/app.py,sha256=ymCiVQjBGfqg7B_zFQmBIHFMD2SkDj1m_DzUNTbpOEw,6583
+fastled/__init__.py,sha256=IEm_Rn25u4jkMLkK9nn2bAU9Aq8ya6w4CcUXAy889IQ,64
+fastled/app.py,sha256=VZP65zT1qLQLcOXA8oElPdZiladIAMvW9MVnqy5QTRM,6806
 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
+fastled/client_server.py,sha256=CBgicRyunn96tVeAHQOuo4q2gkDFAtLEPxhTf2EnQ_0,11113
 fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=5IXaLt8k4WSSiWmvqMvwMYKngAgZ-t2p2deJ6cmJNwk,20434
+fastled/docker_manager.py,sha256=Ur29DXoMpD5QFVmJJ0jYXWpbXaysoDv8a6-BRWKUJjA,20078
 fastled/env.py,sha256=8wctQwl5qE4CI8NBugHtgMmUfEfHZ869JX5lGdSOJxc,304
 fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
-fastled/keyboard.py,sha256=TkFjDxGtGdDbjQF_LRqp54hmdcKaXjf1olTT8l6dEJk,3170
+fastled/keyboard.py,sha256=Zz_ggxOUTX2XQEy6K6kAoorVlUev4wEk9Awpvv9aStA,3241
 fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
+fastled/select_sketch_directory.py,sha256=ih8Voua8ecMIZ9m0ZEBp_EuuBzz8xGfMxC_UhAKuoA0,1312
 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.23.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.23.dist-info/METADATA,sha256=owb8VnZ08wElA9muFhZM3FTqj1v3SDQxXcAHAvGxx08,14052
+fastled-1.1.23.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.23.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.23.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.23.dist-info/RECORD,,