fastled 1.2.34__tar.gz → 1.2.36__tar.gz

{fastled-1.2.34 → fastled-1.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.34
+Version: 1.2.36
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.34 → fastled-1.2.36}/src/fastled/__init__.py

@@ -16,7 +16,7 @@ from .types import BuildMode, CompileResult, CompileServerError
 # IMPORTANT! There's a bug in github which will REJECT any version update
 # that has any other change in the repo. Please bump the version as the
 # ONLY change in a commit, or else the pypi update and the release will fail.
-__version__ = "1.2.34"
+__version__ = "1.2.36"
 
 
 class Api:

{fastled-1.2.34 → fastled-1.2.36}/src/fastled/app.py

@@ -2,7 +2,6 @@
 Uses the latest wasm compiler image to compile the FastLED sketch.
 """
 
-import argparse
 import sys
 import time
 from pathlib import Path
@@ -10,10 +9,10 @@ from pathlib import Path
 from fastled.client_server import run_client_server
 from fastled.compile_server import CompileServer
 from fastled.filewatcher import file_watcher_set
-from fastled.parse_args import parse_args
+from fastled.parse_args import Args, parse_args
 
 
-def run_server(args: argparse.Namespace) -> int:
+def run_server(args: Args) -> int:
     interactive = args.interactive
     auto_update = args.auto_update
     mapped_dir = Path(args.directory).absolute() if args.directory else None
@@ -46,20 +45,13 @@ def run_server(args: argparse.Namespace) -> int:
 def main() -> int:
     args = parse_args()
     interactive: bool = args.interactive
-    server: str | CompileServer | None = args.server
+    has_server = args.server
     update: bool = args.update
     build: bool = args.build
     just_compile: bool = args.just_compile
     # directory: Path | None = Path(args.directory).absolute() if args.directory else None
     directory: Path | None = Path(args.directory) if args.directory else None
 
-    # broken for now
-    if directory is None and interactive:
-        # if examples/wasm exists
-        if Path("examples/wasm").exists():
-            print(f"Using {Path('examples/wasm')} as the sketch directory")
-            directory = Path("examples/wasm").absolute()
-
     if update:
         # Force auto_update to ensure update check happens
         compile_server = CompileServer(interactive=False, auto_updates=True)
@@ -103,7 +95,7 @@ def main() -> int:
             print("\nExiting from client...")
             return 1
 
-    if server:
+    if has_server:
         print("Running in server only mode.")
         return run_server(args)
     else:
@@ -114,8 +106,8 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
-        sys.argv.append("-b")
-        sys.argv.append("examples/wasm")
+        sys.argv.append("-i")
+        # sys.argv.append("examples/wasm")
         # sys.argv.append()
         import os
 

{fastled-1.2.34 → fastled-1.2.36}/src/fastled/client_server.py

@@ -1,4 +1,3 @@
-import argparse
 import shutil
 import tempfile
 import threading
@@ -11,6 +10,7 @@ from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileWatcherProcess
 from fastled.keyboard import SpaceBarWatcher
 from fastled.open_browser import open_browser_process
+from fastled.parse_args import Args
 from fastled.settings import DEFAULT_URL
 from fastled.sketch import looks_like_sketch_directory
 from fastled.types import BuildMode, CompileResult, CompileServerError
@@ -334,12 +334,12 @@ def run_client(
             browser_proc.kill()
 
 
-def run_client_server(args: argparse.Namespace) -> int:
+def run_client_server(args: Args) -> int:
     profile = bool(args.profile)
     web: str | bool = args.web if isinstance(args.web, str) else bool(args.web)
     auto_update = bool(args.auto_update)
     localhost = bool(args.localhost)
-    directory = Path(args.directory)
+    directory = args.directory if args.directory else Path(".")
     just_compile = bool(args.just_compile)
     interactive = bool(args.interactive)
     force_compile = bool(args.force_compile)

{fastled-1.2.34 → fastled-1.2.36}/src/fastled/parse_args.py

@@ -12,9 +12,20 @@ from fastled.sketch import (
     looks_like_fastled_repo,
     looks_like_sketch_directory,
 )
+from fastled.types import Args
 
 
-def parse_args() -> argparse.Namespace:
+def _find_fastled_repo(start: Path) -> Path | None:
+    """Find the FastLED repo directory by searching upwards from the current directory."""
+    current = start
+    while current != current.parent:
+        if looks_like_fastled_repo(current):
+            return current
+        current = current.parent
+    return None
+
+
+def parse_args() -> Args:
     """Parse command-line arguments."""
     parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
     parser.add_argument("--version", action="version", version=f"{__version__}")
@@ -131,8 +142,20 @@ def parse_args() -> argparse.Namespace:
         print(f"Use 'fastled {args.directory}' to compile the project.")
         sys.exit(0)
 
-    if args.build:
-        return args
+    if args.build or args.interactive:
+        cwd: Path = Path(os.getcwd())
+        fastled_dir: Path | None = _find_fastled_repo(cwd)
+        if args.directory is not None:
+            args.directory = str(Path(args.directory).absolute())
+        if fastled_dir is None:
+            print("This command must be run from within the FastLED repo. Exiting...")
+            sys.exit(1)
+        if cwd != fastled_dir:
+            print(f"Switching to FastLED repo at {fastled_dir}")
+            os.chdir(fastled_dir)
+        if args.directory is None:
+            args.directory = str(Path("examples/wasm").absolute())
+        return Args.from_namespace(args)
 
     if not args.update:
         if args.no_auto_updates:
@@ -195,4 +218,4 @@ def parse_args() -> argparse.Namespace:
                 print(f"Using sketch directory: {dir_path}")
                 args.directory = str(dir_path)
 
-    return args
+    return Args.from_namespace(args)

{fastled-1.2.34 → fastled-1.2.36}/src/fastled/sketch.py

@@ -72,7 +72,10 @@ def _lots_and_lots_of_files(directory: Path) -> bool:
     return len(get_sketch_files(directory)) > 100
 
 
-def looks_like_sketch_directory(directory: Path, quick=False) -> bool:
+def looks_like_sketch_directory(directory: Path | str | None, quick=False) -> bool:
+    if directory is None:
+        return False
+    directory = Path(directory)
     if looks_like_fastled_repo(directory):
         print("Directory looks like the FastLED repo")
         return False

fastled-1.2.36/src/fastled/types.py

@@ -0,0 +1,146 @@
+import argparse
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+from typing import Any
+
+
+@dataclass
+class Args:
+    directory: Path | None
+    init: bool | str
+    just_compile: bool
+    web: str | None
+    interactive: bool
+    profile: bool
+    force_compile: bool
+    auto_update: bool | None
+    update: bool
+    localhost: bool
+    build: bool
+    server: bool
+    purge: bool
+    debug: bool
+    quick: bool
+    release: bool
+
+    @staticmethod
+    def from_namespace(args: argparse.Namespace) -> "Args":
+        assert isinstance(
+            args.directory, str | None
+        ), f"expected str | None, got {type(args.directory)}"
+        assert isinstance(
+            args.init, bool | str | None
+        ), f"expected bool, got {type(args.init)}"
+        assert isinstance(
+            args.just_compile, bool
+        ), f"expected bool, got {type(args.just_compile)}"
+        assert isinstance(
+            args.web, str | None
+        ), f"expected str | None, got {type(args.web)}"
+        assert isinstance(
+            args.interactive, bool
+        ), f"expected bool, got {type(args.interactive)}"
+        assert isinstance(
+            args.profile, bool
+        ), f"expected bool, got {type(args.profile)}"
+        assert isinstance(
+            args.force_compile, bool
+        ), f"expected bool, got {type(args.force_compile)}"
+        assert isinstance(
+            args.no_auto_updates, bool | None
+        ), f"expected bool | None, got {type(args.no_auto_updates)}"
+        assert isinstance(args.update, bool), f"expected bool, got {type(args.update)}"
+        assert isinstance(
+            args.localhost, bool
+        ), f"expected bool, got {type(args.localhost)}"
+        assert isinstance(args.build, bool), f"expected bool, got {type(args.build)}"
+        assert isinstance(args.server, bool), f"expected bool, got {type(args.server)}"
+        assert isinstance(args.purge, bool), f"expected bool, got {type(args.purge)}"
+        assert isinstance(args.debug, bool), f"expected bool, got {type(args.debug)}"
+        assert isinstance(args.quick, bool), f"expected bool, got {type(args.quick)}"
+        assert isinstance(
+            args.release, bool
+        ), f"expected bool, got {type(args.release)}"
+        init: bool | str = False
+        if args.init is None:
+            init = False
+        elif isinstance(args.init, bool):
+            init = args.init
+        elif isinstance(args.init, str):
+            init = args.init
+        return Args(
+            directory=Path(args.directory) if args.directory else None,
+            init=init,
+            just_compile=args.just_compile,
+            web=args.web,
+            interactive=args.interactive,
+            profile=args.profile,
+            force_compile=args.force_compile,
+            auto_update=not args.no_auto_updates,
+            update=args.update,
+            localhost=args.localhost,
+            build=args.build,
+            server=args.server,
+            purge=args.purge,
+            debug=args.debug,
+            quick=args.quick,
+            release=args.release,
+        )
+
+
+@dataclass
+class CompileResult:
+    success: bool
+    stdout: str
+    hash_value: str | None
+    zip_bytes: bytes
+
+    def __bool__(self) -> bool:
+        return self.success
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.__dict__.copy()
+
+
+class CompileServerError(Exception):
+    """Error class for failing to instantiate CompileServer."""
+
+    pass
+
+
+class BuildMode(Enum):
+    DEBUG = "DEBUG"
+    QUICK = "QUICK"
+    RELEASE = "RELEASE"
+
+    @classmethod
+    def from_string(cls, mode_str: str) -> "BuildMode":
+        try:
+            return cls[mode_str.upper()]
+        except KeyError:
+            valid_modes = [mode.name for mode in cls]
+            raise ValueError(f"BUILD_MODE must be one of {valid_modes}, got {mode_str}")
+
+    @staticmethod
+    def from_args(args: Args) -> "BuildMode":
+        if args.debug:
+            return BuildMode.DEBUG
+        elif args.release:
+            return BuildMode.RELEASE
+        else:
+            return BuildMode.QUICK
+
+
+class Platform(Enum):
+    WASM = "WASM"
+
+    @classmethod
+    def from_string(cls, platform_str: str) -> "Platform":
+        try:
+            return cls[platform_str.upper()]
+        except KeyError:
+            valid_modes = [mode.name for mode in cls]
+            raise ValueError(
+                f"Platform must be one of {valid_modes}, got {platform_str}"
+            )

{fastled-1.2.34 → fastled-1.2.36}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.34
+Version: 1.2.36
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

fastled-1.2.34/src/fastled/types.py

@@ -1,61 +0,0 @@
-import argparse
-from dataclasses import dataclass
-from enum import Enum
-from typing import Any
-
-
-@dataclass
-class CompileResult:
-    success: bool
-    stdout: str
-    hash_value: str | None
-    zip_bytes: bytes
-
-    def __bool__(self) -> bool:
-        return self.success
-
-    def to_dict(self) -> dict[str, Any]:
-        return self.__dict__.copy()
-
-
-class CompileServerError(Exception):
-    """Error class for failing to instantiate CompileServer."""
-
-    pass
-
-
-class BuildMode(Enum):
-    DEBUG = "DEBUG"
-    QUICK = "QUICK"
-    RELEASE = "RELEASE"
-
-    @classmethod
-    def from_string(cls, mode_str: str) -> "BuildMode":
-        try:
-            return cls[mode_str.upper()]
-        except KeyError:
-            valid_modes = [mode.name for mode in cls]
-            raise ValueError(f"BUILD_MODE must be one of {valid_modes}, got {mode_str}")
-
-    @staticmethod
-    def from_args(args: argparse.Namespace) -> "BuildMode":
-        if args.debug:
-            return BuildMode.DEBUG
-        elif args.release:
-            return BuildMode.RELEASE
-        else:
-            return BuildMode.QUICK
-
-
-class Platform(Enum):
-    WASM = "WASM"
-
-    @classmethod
-    def from_string(cls, platform_str: str) -> "Platform":
-        try:
-            return cls[platform_str.upper()]
-        except KeyError:
-            valid_modes = [mode.name for mode in cls]
-            raise ValueError(
-                f"Platform must be one of {valid_modes}, got {platform_str}"
-            )