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

fastled/__init__.py

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

fastled/app.py

@@ -20,7 +20,11 @@ from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileWatcherProcess
 from fastled.keyboard import SpaceBarWatcher
 from fastled.open_browser import open_browser_thread
-from fastled.sketch import looks_like_fastled_repo, looks_like_sketch_directory
+from fastled.sketch import (
+    find_sketch_directories,
+    looks_like_fastled_repo,
+    looks_like_sketch_directory,
+)
 from fastled.web_compile import (
     SERVER_PORT,
     ConnectionResult,
@@ -135,7 +139,7 @@ def parse_args() -> argparse.Namespace:
     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:
+    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:
@@ -149,10 +153,31 @@ def parse_args() -> argparse.Namespace:
         if looks_like_sketch_directory(maybe_sketch_dir):
             args.directory = str(maybe_sketch_dir)
         else:
-            print(
-                "\nYou either need to specify a sketch directory or run in --server mode."
-            )
-            sys.exit(1)
+            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
 
@@ -313,7 +338,6 @@ def run_client(args: argparse.Namespace) -> int:
 
         if not result.success:
             print("\nCompilation failed.")
-            return 1
 
         browser_proc: subprocess.Popen | None = None
         if open_web_browser:

fastled/docker_manager.py

@@ -89,8 +89,19 @@ class RunningContainer:
 
 class DockerManager:
     def __init__(self) -> None:
-        self.client: DockerClient = docker.from_env()
-        self.first_run = False
+        try:
+            self._client: DockerClient | None = None
+            self.first_run = False
+        except docker.errors.DockerException as e:
+            stack = traceback.format_exc()
+            warnings.warn(f"Error initializing Docker client: {e}\n{stack}")
+            raise
+
+    @property
+    def client(self) -> DockerClient:
+        if self._client is None:
+            self._client = docker.from_env()
+        return self._client
 
     @staticmethod
     def is_docker_installed() -> bool:
@@ -120,6 +131,9 @@ class DockerManager:
         except docker.errors.DockerException as e:
             print(f"Docker is not running: {str(e)}")
             return False
+        except Exception as e:
+            print(f"Error pinging Docker daemon: {str(e)}")
+            return False
 
     def start(self) -> bool:
         """Attempt to start Docker Desktop (or the Docker daemon) automatically."""

fastled/sketch.py

@@ -2,6 +2,27 @@ import os
 from pathlib import Path
 
 
+def find_sketch_directories(directory: Path) -> list[Path]:
+    sketch_directories: list[Path] = []
+    # search all the paths one level deep
+    for path in directory.iterdir():
+        if path.is_dir():
+            dir_name = path.name
+            if str(dir_name).startswith("."):
+                continue
+
+            if looks_like_sketch_directory(path, quick=True):
+                sketch_directories.append(path)
+            if dir_name.lower() == "examples":
+                for example in path.iterdir():
+                    if example.is_dir():
+                        if looks_like_sketch_directory(example, quick=True):
+                            sketch_directories.append(example)
+    # make relative to cwd
+    sketch_directories = [p.relative_to(directory) for p in sketch_directories]
+    return sketch_directories
+
+
 def get_sketch_files(directory: Path) -> list[Path]:
     files: list[Path] = []
     for root, dirs, filenames in os.walk(directory):
@@ -30,14 +51,14 @@ def _lots_and_lots_of_files(directory: Path) -> bool:
     return len(get_sketch_files(directory)) > 100
 
 
-def looks_like_sketch_directory(directory: Path) -> bool:
+def looks_like_sketch_directory(directory: Path, quick=False) -> bool:
     if looks_like_fastled_repo(directory):
         print("Directory looks like the FastLED repo")
         return False
 
-    if _lots_and_lots_of_files(directory):
-        print("Too many files in the directory, bailing out")
-        return False
+    if not quick:
+        if _lots_and_lots_of_files(directory):
+            return False
 
     # walk the path and if there are over 30 files, return False
     # at the root of the directory there should either be an ino file or a src directory

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

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

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

@@ -1,20 +1,20 @@
-fastled/__init__.py,sha256=IHbpe-aq0aVLbSOXEoXCoEu9sNWQTsV5OEghbd4DLsE,64
-fastled/app.py,sha256=dUCHM-1yQGrpTtfUCn1NYlG7hIJm_Tg445zhyxsMBhY,15715
+fastled/__init__.py,sha256=p51kZEN1JznXCt_KUL-m7ZWLsSop3-7JuCT0ywmQs3A,64
+fastled/app.py,sha256=gLmma0cWlXgkCGPLt3DQIUAZuU3EdxfzNZfAi0ghEOI,16882
 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=AzQBXqWB1Uq_Qb1mp1NS4hIbkC8aYp-pzpYhFRpI5ww,19940
+fastled/docker_manager.py,sha256=5IXaLt8k4WSSiWmvqMvwMYKngAgZ-t2p2deJ6cmJNwk,20434
 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
-fastled/sketch.py,sha256=KhhPFqlFVlBk8YrzFy7-ioe7zEzecgrVLhyFbLpBp7k,1845
+fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
 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.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,,
+fastled-1.1.20.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.20.dist-info/METADATA,sha256=XyDrNrK_WIiy21Xj_xlIWUgfdMiZ0KGDnasYL-or2Xg,13814
+fastled-1.1.20.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.20.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.20.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.20.dist-info/RECORD,,