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

fastled/__init__.py

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

fastled/client_server.py

@@ -269,13 +269,19 @@ def run_client_server(args: argparse.Namespace) -> int:
                             timeout=1.0
                         )
                         file_changes = source_code_watcher.get_all_changes()
+                        sketch_files_changed = sketch_filewatcher.get_all_changes()
 
-                        if space_bar_pressed or file_changes:
+                        if file_changes:
+                            print(
+                                f"Changes detected in {file_changes}\nHit the space bar to trigger compile."
+                            )
+
+                        if space_bar_pressed or sketch_files_changed:
                             if space_bar_pressed:
                                 print("Space bar pressed, triggering recompile...")
-                            elif file_changes:
+                            elif sketch_files_changed:
                                 print(
-                                    f"Changes detected in {','.join(file_changes)}, triggering recompile..."
+                                    f"Changes detected in {','.join(sketch_files_changed)}, triggering recompile..."
                                 )
                             last_compiled_result = compile_function(
                                 last_hash_value=None

fastled/docker_manager.py

@@ -20,6 +20,8 @@ from docker.models.containers import Container
 from docker.models.images import Image
 from filelock import FileLock
 
+from fastled.spinner import Spinner
+
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
 CONFIG_DIR.mkdir(parents=True, exist_ok=True)
 DB_FILE = CONFIG_DIR / "db.db"
@@ -225,17 +227,17 @@ class DockerManager:
                         return
 
                     # Quick check for latest version
-
-                    print(f"Pulling newer version of {image_name}:{tag}...")
-                    _ = self.client.images.pull(image_name, tag=tag)
+                    with Spinner(f"Pulling newer version of {image_name}:{tag}..."):
+                        _ = self.client.images.pull(image_name, tag=tag)
                     print(f"Updated to newer version of {image_name}:{tag}")
                     local_image_hash = self.client.images.get(f"{image_name}:{tag}").id
                     if remote_image_hash is not None:
                         DISK_CACHE.put(local_image_hash, remote_image_hash)
 
             except docker.errors.ImageNotFound:
-                print(f"Image {image_name}:{tag} not found. Downloading...")
-                self.client.images.pull(image_name, tag=tag)
+                print(f"Image {image_name}:{tag} not found.")
+                with Spinner("Loading "):
+                    self.client.images.pull(image_name, tag=tag)
                 try:
                     local_image = self.client.images.get(f"{image_name}:{tag}")
                     local_image_hash = local_image.id

fastled/select_sketch_directory.py

@@ -26,7 +26,7 @@ def select_sketch_directory(
             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)
+            top_hits: list[tuple[float, Path]] = string_diff_paths(which, inputs)
             if len(top_hits) == 1:
                 example = top_hits[0][1]
                 return str(example)

fastled/spinner.py

@@ -0,0 +1,34 @@
+import _thread
+import threading
+import time
+import warnings
+
+from progress.spinner import Spinner as SpinnerImpl
+
+
+class Spinner:
+    def __init__(self, message: str = ""):
+        self.spinner = SpinnerImpl(message)
+        self.event = threading.Event()
+        self.thread = threading.Thread(target=self._spin, daemon=True)
+        self.thread.start()
+
+    def _spin(self) -> None:
+        try:
+            while not self.event.is_set():
+                self.spinner.next()
+                time.sleep(0.1)
+        except KeyboardInterrupt:
+            _thread.interrupt_main()
+        except Exception as e:
+            warnings.warn(f"Spinner thread failed: {e}")
+
+    def stop(self) -> None:
+        self.event.set()
+        self.thread.join()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.stop()

fastled/string_diff.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from rapidfuzz.distance import Levenshtein
+from rapidfuzz import fuzz
 
 
 # Returns the min distance strings. If there is a tie, it returns
@@ -8,29 +8,35 @@ from rapidfuzz.distance import Levenshtein
 # Returns a tuple of index and string.
 def string_diff(
     input_string: str, string_list: list[str], ignore_case=True
-) -> list[tuple[int, str]]:
+) -> list[tuple[float, 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
-    ]
+    # distances = [
+    #     #Levenshtein.distance(normalize(input_string), normalize(s)) for s in string_list
+    #     fuzz.partial_ratio(normalize(input_string), normalize(s)) for s in string_list
+    # ]
+    distances: list[float] = []
+    for s in string_list:
+        dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
+        print("partial_ratio", dist)
+        distances.append(1.0 / (dist + 1.0))
     min_distance = min(distances)
-    out: list[tuple[int, str]] = []
+    out: list[tuple[float, 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]]:
+) -> list[tuple[float, 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]] = []
+    out: list[tuple[float, Path]] = []
     for i, j in tmp:
         p = Path(j)
         out.append((i, p))

{fastled-1.1.23.dist-info → fastled-1.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.23
+Version: 1.1.25
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -19,6 +19,7 @@ Requires-Dist: filelock
 Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs
 Requires-Dist: rapidfuzz
+Requires-Dist: progress
 
 # FastLED Wasm compiler
 
@@ -161,8 +162,11 @@ Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` is  bundling. This can be tweeked by the wasm_compiler_settings.py file in the FastLED repo.
 
 
-# Revisions
 
+# Revisions
+  
+  * 1.1.25 - Improved detecting which sketch directory the user means by fuzzy matching.
+  * 1.1.24 - Adds progress spinning bar for pulling images, which take a long time.
   * 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.

{fastled-1.1.23.dist-info → fastled-1.1.25.dist-info}/RECORD

@@ -1,25 +1,26 @@
-fastled/__init__.py,sha256=IEm_Rn25u4jkMLkK9nn2bAU9Aq8ya6w4CcUXAy889IQ,64
+fastled/__init__.py,sha256=e5n65cupSlM41aRjoBsTReaO1NiY5it6yu3XFaYSbBQ,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=CBgicRyunn96tVeAHQOuo4q2gkDFAtLEPxhTf2EnQ_0,11113
+fastled/client_server.py,sha256=KdjgAiYJ2mKXIfYVFcVZtVDtbZhzkjqrzatAwNa_QWw,11437
 fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=Ur29DXoMpD5QFVmJJ0jYXWpbXaysoDv8a6-BRWKUJjA,20078
+fastled/docker_manager.py,sha256=awQCAB0XfHMy6y1jfdEZx1qyzXTtYBmAwVyuQjxwuf0,20157
 fastled/env.py,sha256=8wctQwl5qE4CI8NBugHtgMmUfEfHZ869JX5lGdSOJxc,304
 fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
 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/select_sketch_directory.py,sha256=TZdCjl1D7YMKjodMTvDRurPcpAmN3x0TcJxffER2NfM,1314
 fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
-fastled/string_diff.py,sha256=svtaQFGp4a6r2Qjx-Gxhna94wK-d8LKV4OCpKMXiHso,1164
+fastled/spinner.py,sha256=ZGFXona3SJxmuHIzMGa6tqB0IVDSRr8W_dju09Z1Hwg,901
+fastled/string_diff.py,sha256=1AbgAxPFl7F_K4HunwQr0em8WZSvwxJ1MOOLA-ylFbM,1391
 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.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,,
+fastled-1.1.25.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.25.dist-info/METADATA,sha256=ZC9sOPn37oR4i96ddFOlgtiy_wfI2OOK7FXGruZif_I,14256
+fastled-1.1.25.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.25.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.25.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.25.dist-info/RECORD,,