fastled 1.1.17__py2.py3-none-any.whl → 1.1.18__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.17"
+__version__ = "1.1.18"

fastled/app.py

@@ -82,28 +82,6 @@ def parse_args() -> argparse.Namespace:
         action="store_true",
         help="Enable profiling for web compilation",
     )
-    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"
-    )
-    build_mode.add_argument(
-        "--localhost",
-        "--local",
-        action="store_true",
-        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
-    )
-    build_mode.add_argument(
-        "--server",
-        action="store_true",
-        help="Run the server in the current directory, volume mapping fastled if we are in the repo",
-    )
     parser.add_argument(
         "--force-compile",
         action="store_true",
@@ -119,6 +97,30 @@ def parse_args() -> argparse.Namespace:
         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()))
 

fastled/docker_manager.py

@@ -176,6 +176,8 @@ class DockerManager:
         If upgrade is True, will pull the latest version even if image exists locally.
         """
         print(f"Validating image {image_name}:{tag}...")
+        remote_image_hash_from_local_image: str | None = None
+        remote_image_hash: str | None = None
 
         with get_lock(f"{image_name}-{tag}"):
             try:
@@ -187,7 +189,7 @@ class DockerManager:
                         f"{image_name}:{tag}"
                     )
                     remote_image_hash = remote_image.id
-                    remote_image_hash_from_local_image: str | None = None
+
                     try:
                         remote_image_hash_from_local_image = DISK_CACHE.get(
                             local_image.id
@@ -196,9 +198,6 @@ class DockerManager:
                         raise
                     except Exception:
                         remote_image_hash_from_local_image = None
-                        import traceback
-                        import warnings
-
                         stack = traceback.format_exc()
                         warnings.warn(
                             f"Error getting remote image hash from local image: {stack}"
@@ -213,7 +212,8 @@ class DockerManager:
                     _ = 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
-                    DISK_CACHE.put(local_image_hash, remote_image_hash)
+                    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...")
@@ -221,11 +221,8 @@ class DockerManager:
                 try:
                     local_image = self.client.images.get(f"{image_name}:{tag}")
                     local_image_hash = local_image.id
-                    DISK_CACHE.put(local_image_hash, remote_image_hash)
                     print(f"Image {image_name}:{tag} downloaded successfully.")
                 except docker.errors.ImageNotFound:
-                    import warnings
-
                     warnings.warn(f"Image {image_name}:{tag} not found after download.")
 
     def tag_image(self, image_name: str, old_tag: str, new_tag: str) -> None:

fastled/filewatcher.py

@@ -1,196 +1,202 @@
-"""File system watcher implementation using watchdog
-"""
-
-import hashlib
-import os
-import queue
-import threading
-import time
-from contextlib import redirect_stdout
-from multiprocessing import Process, Queue
-from pathlib import Path
-from queue import Empty
-from typing import Dict, Set
-
-from watchdog.events import FileSystemEvent, FileSystemEventHandler
-from watchdog.observers import Observer
-from watchdog.observers.api import BaseObserver
-
-
-class MyEventHandler(FileSystemEventHandler):
-    def __init__(
-        self,
-        change_queue: queue.Queue,
-        excluded_patterns: Set[str],
-        file_hashes: Dict[str, str],
-    ) -> None:
-        super().__init__()
-        self.change_queue = change_queue
-        self.excluded_patterns = excluded_patterns
-        self.file_hashes = file_hashes
-
-    def _get_file_hash(self, filepath: str) -> str:
-        try:
-            with open(filepath, "rb") as f:
-                return hashlib.md5(f.read()).hexdigest()
-        except Exception:  # pylint: disable=broad-except
-            return ""
-
-    def on_modified(self, event: FileSystemEvent) -> None:
-        if not event.is_directory:
-            path = Path(event.src_path)
-            # Check if any part of the path matches excluded patterns
-            if not any(part in self.excluded_patterns for part in path.parts):
-                new_hash = self._get_file_hash(event.src_path)
-                if new_hash and new_hash != self.file_hashes.get(event.src_path):
-                    self.file_hashes[event.src_path] = new_hash
-                    self.change_queue.put(event.src_path)
-
-
-class FileChangedNotifier(threading.Thread):
-    """Watches a directory for file changes and queues notifications"""
-
-    def __init__(
-        self,
-        path: str,
-        debounce_seconds: float = 1.0,
-        excluded_patterns: list[str] | None = None,
-    ) -> None:
-        """Initialize the notifier with a path to watch
-
-        Args:
-            path: Directory path to watch for changes
-            debounce_seconds: Minimum time between notifications for the same file
-            excluded_patterns: List of directory/file patterns to exclude from watching
-        """
-        super().__init__(daemon=True)
-        self.path = path
-        self.observer: BaseObserver | None = None
-        self.event_handler: MyEventHandler | None = None
-
-        # Combine default and user-provided patterns
-        self.excluded_patterns = (
-            set(excluded_patterns) if excluded_patterns is not None else set()
-        )
-        self.stopped = False
-        self.change_queue: queue.Queue = queue.Queue()
-        self.last_notification: Dict[str, float] = {}
-        self.file_hashes: Dict[str, str] = {}
-        self.debounce_seconds = debounce_seconds
-
-    def stop(self) -> None:
-        """Stop watching for changes"""
-        print("watcher stop")
-        self.stopped = True
-        if self.observer:
-            self.observer.stop()
-            self.observer.join()
-            self.observer = None
-            self.event_handler = None
-
-    def run(self) -> None:
-        """Thread main loop - starts watching for changes"""
-        self.event_handler = MyEventHandler(
-            self.change_queue, self.excluded_patterns, self.file_hashes
-        )
-        self.observer = Observer()
-        self.observer.schedule(self.event_handler, self.path, recursive=True)
-        self.observer.start()
-
-        try:
-            while not self.stopped:
-                time.sleep(0.1)
-        except KeyboardInterrupt:
-            print("File watcher stopped by user.")
-        finally:
-            self.stop()
-
-    def get_next_change(self, timeout: float = 0.001) -> str | None:
-        """Get the next file change event from the queue
-
-        Args:
-            timeout: How long to wait for next change in seconds
-
-        Returns:
-            Changed filepath or None if no change within timeout
-        """
-        try:
-            filepath = self.change_queue.get(timeout=timeout)
-            current_time = time.time()
-
-            # Check if we've seen this file recently
-            last_time = self.last_notification.get(filepath, 0)
-            if current_time - last_time < self.debounce_seconds:
-                return None
-
-            self.last_notification[filepath] = current_time
-            return filepath
-        except KeyboardInterrupt:
-            raise
-        except queue.Empty:
-            return None
-
-    def get_all_changes(self, timeout: float = 0.001) -> list[str]:
-        """Get all file change events from the queue
-
-        Args:
-            timeout: How long to wait for next change in seconds
-
-        Returns:
-            List of changed filepaths
-        """
-        changed_files = []
-        while True:
-            changed_file = self.get_next_change(timeout=timeout)
-            if changed_file is None:
-                break
-            changed_files.append(changed_file)
-        # clear all the changes from the queue
-        self.change_queue.queue.clear()
-        return changed_files
-
-
-def _process_wrapper(root: Path, excluded_patterns: list[str], queue: Queue):
-    with open(os.devnull, "w") as fnull:  # Redirect to /dev/null
-        with redirect_stdout(fnull):
-            watcher = FileChangedNotifier(
-                str(root), excluded_patterns=excluded_patterns
-            )
-            watcher.start()
-            while True:
-                try:
-                    changed_files = watcher.get_all_changes()
-                    for file in changed_files:
-                        queue.put(file)
-                except KeyboardInterrupt:
-                    break
-            watcher.stop()
-
-
-class FileWatcherProcess:
-    def __init__(self, root: Path, excluded_patterns: list[str]) -> None:
-        self.queue: Queue = Queue()
-        self.process = Process(
-            target=_process_wrapper,
-            args=(root, excluded_patterns, self.queue),
-            daemon=True,
-        )
-        self.process.start()
-
-    def stop(self):
-        self.process.terminate()
-        self.process.join()
-        self.queue.close()
-        self.queue.join_thread()
-
-    def get_all_changes(self, timeout: float | None = None) -> list[str]:
-        changed_files = []
-        block = timeout is not None
-
-        while True:
-            try:
-                changed_file = self.queue.get(block=block, timeout=timeout)
-                changed_files.append(changed_file)
-            except Empty:
-                break
-        return changed_files
+"""File system watcher implementation using watchdog
+"""
+
+import hashlib
+import os
+import queue
+import threading
+import time
+from contextlib import redirect_stdout
+from multiprocessing import Process, Queue
+from pathlib import Path
+from queue import Empty
+from typing import Dict, Set
+
+from watchdog.events import FileSystemEvent, FileSystemEventHandler
+from watchdog.observers import Observer
+from watchdog.observers.api import BaseObserver
+
+
+class MyEventHandler(FileSystemEventHandler):
+    def __init__(
+        self,
+        change_queue: queue.Queue,
+        excluded_patterns: Set[str],
+        file_hashes: Dict[str, str],
+    ) -> None:
+        super().__init__()
+        self.change_queue = change_queue
+        self.excluded_patterns = excluded_patterns
+        self.file_hashes = file_hashes
+
+    def _get_file_hash(self, filepath: str) -> str:
+        try:
+            with open(filepath, "rb") as f:
+                return hashlib.md5(f.read()).hexdigest()
+        except Exception:  # pylint: disable=broad-except
+            return ""
+
+    def on_modified(self, event: FileSystemEvent) -> None:
+        if not event.is_directory:
+            # Convert src_path to str if it's bytes
+            src_path = (
+                event.src_path.decode()
+                if isinstance(event.src_path, bytes)
+                else event.src_path
+            )
+            path = Path(src_path)
+            # Check if any part of the path matches excluded patterns
+            if not any(part in self.excluded_patterns for part in path.parts):
+                new_hash = self._get_file_hash(src_path)
+                if new_hash and new_hash != self.file_hashes.get(src_path):
+                    self.file_hashes[src_path] = new_hash
+                    self.change_queue.put(src_path)
+
+
+class FileChangedNotifier(threading.Thread):
+    """Watches a directory for file changes and queues notifications"""
+
+    def __init__(
+        self,
+        path: str,
+        debounce_seconds: float = 1.0,
+        excluded_patterns: list[str] | None = None,
+    ) -> None:
+        """Initialize the notifier with a path to watch
+
+        Args:
+            path: Directory path to watch for changes
+            debounce_seconds: Minimum time between notifications for the same file
+            excluded_patterns: List of directory/file patterns to exclude from watching
+        """
+        super().__init__(daemon=True)
+        self.path = path
+        self.observer: BaseObserver | None = None
+        self.event_handler: MyEventHandler | None = None
+
+        # Combine default and user-provided patterns
+        self.excluded_patterns = (
+            set(excluded_patterns) if excluded_patterns is not None else set()
+        )
+        self.stopped = False
+        self.change_queue: queue.Queue = queue.Queue()
+        self.last_notification: Dict[str, float] = {}
+        self.file_hashes: Dict[str, str] = {}
+        self.debounce_seconds = debounce_seconds
+
+    def stop(self) -> None:
+        """Stop watching for changes"""
+        print("watcher stop")
+        self.stopped = True
+        if self.observer:
+            self.observer.stop()
+            self.observer.join()
+            self.observer = None
+            self.event_handler = None
+
+    def run(self) -> None:
+        """Thread main loop - starts watching for changes"""
+        self.event_handler = MyEventHandler(
+            self.change_queue, self.excluded_patterns, self.file_hashes
+        )
+        self.observer = Observer()
+        self.observer.schedule(self.event_handler, self.path, recursive=True)
+        self.observer.start()
+
+        try:
+            while not self.stopped:
+                time.sleep(0.1)
+        except KeyboardInterrupt:
+            print("File watcher stopped by user.")
+        finally:
+            self.stop()
+
+    def get_next_change(self, timeout: float = 0.001) -> str | None:
+        """Get the next file change event from the queue
+
+        Args:
+            timeout: How long to wait for next change in seconds
+
+        Returns:
+            Changed filepath or None if no change within timeout
+        """
+        try:
+            filepath = self.change_queue.get(timeout=timeout)
+            current_time = time.time()
+
+            # Check if we've seen this file recently
+            last_time = self.last_notification.get(filepath, 0)
+            if current_time - last_time < self.debounce_seconds:
+                return None
+
+            self.last_notification[filepath] = current_time
+            return filepath
+        except KeyboardInterrupt:
+            raise
+        except queue.Empty:
+            return None
+
+    def get_all_changes(self, timeout: float = 0.001) -> list[str]:
+        """Get all file change events from the queue
+
+        Args:
+            timeout: How long to wait for next change in seconds
+
+        Returns:
+            List of changed filepaths
+        """
+        changed_files = []
+        while True:
+            changed_file = self.get_next_change(timeout=timeout)
+            if changed_file is None:
+                break
+            changed_files.append(changed_file)
+        # clear all the changes from the queue
+        self.change_queue.queue.clear()
+        return changed_files
+
+
+def _process_wrapper(root: Path, excluded_patterns: list[str], queue: Queue):
+    with open(os.devnull, "w") as fnull:  # Redirect to /dev/null
+        with redirect_stdout(fnull):
+            watcher = FileChangedNotifier(
+                str(root), excluded_patterns=excluded_patterns
+            )
+            watcher.start()
+            while True:
+                try:
+                    changed_files = watcher.get_all_changes()
+                    for file in changed_files:
+                        queue.put(file)
+                except KeyboardInterrupt:
+                    break
+            watcher.stop()
+
+
+class FileWatcherProcess:
+    def __init__(self, root: Path, excluded_patterns: list[str]) -> None:
+        self.queue: Queue = Queue()
+        self.process = Process(
+            target=_process_wrapper,
+            args=(root, excluded_patterns, self.queue),
+            daemon=True,
+        )
+        self.process.start()
+
+    def stop(self):
+        self.process.terminate()
+        self.process.join()
+        self.queue.close()
+        self.queue.join_thread()
+
+    def get_all_changes(self, timeout: float | None = None) -> list[str]:
+        changed_files = []
+        block = timeout is not None
+
+        while True:
+            try:
+                changed_file = self.queue.get(block=block, timeout=timeout)
+                changed_files.append(changed_file)
+            except Empty:
+                break
+        return changed_files

{fastled-1.1.17.dist-info → fastled-1.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.17
+Version: 1.1.18
 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.18 - Fixes for when the image has never been downloaded.
   * 1.1.17 - Added `--update` and `--no-auto-update` to control whether the compiler in docker mode will try to update.
   * 1.1.16 - Rewrote docker logic to use container suspension and resumption. Much much faster.
   * 1.1.15 - Fixed logic for considering ipv6 addresses. Auto selection of ipv6 is now restored.

{fastled-1.1.17.dist-info → fastled-1.1.18.dist-info}/RECORD

@@ -1,10 +1,10 @@
-fastled/__init__.py,sha256=eYxLUpPhHXARLnRFwdJgoCDIx4kVkzNiZ_--PzqMApE,64
-fastled/app.py,sha256=xgMl-9s3dy2TurnSusVdIAr3ZbSi5oyEAofHsa7hZho,15695
+fastled/__init__.py,sha256=IHbpe-aq0aVLbSOXEoXCoEu9sNWQTsV5OEghbd4DLsE,64
+fastled/app.py,sha256=dUCHM-1yQGrpTtfUCn1NYlG7hIJm_Tg445zhyxsMBhY,15715
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
 fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=dj6s1mT-ecURqYJH-JpZZWuFHr-dGkQIOuFm845Nz40,20042
-fastled/filewatcher.py,sha256=fJNMQRDCpihSL4nQeYPqbD4m1Jzjcz_-YRAo-wlPW6k,6518
+fastled/docker_manager.py,sha256=AzQBXqWB1Uq_Qb1mp1NS4hIbkC8aYp-pzpYhFRpI5ww,19940
+fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
 fastled/keyboard.py,sha256=rqndglWYzRy6oiqHgsmx1peLd0Yrpci01zGENlCzh_s,2576
 fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
@@ -12,9 +12,9 @@ fastled/sketch.py,sha256=KhhPFqlFVlBk8YrzFy7-ioe7zEzecgrVLhyFbLpBp7k,1845
 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.17.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.17.dist-info/METADATA,sha256=IX_gRsLWHvl9Fk7sbMWTmVoLqRGuDcAW_88tbfLAKuA,13496
-fastled-1.1.17.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.17.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.17.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.17.dist-info/RECORD,,
+fastled-1.1.18.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.18.dist-info/METADATA,sha256=5crAxI6_10i2pfPFIX8KxFCmX_3yyvGWZKjBR6JIRMU,13562
+fastled-1.1.18.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.18.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.18.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.18.dist-info/RECORD,,