fastled 1.2.75__tar.gz → 1.2.76__tar.gz

{fastled-1.2.75 → fastled-1.2.76}/PKG-INFO

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

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/__init__.py

@@ -13,7 +13,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.75"
+__version__ = "1.2.76"
 
 DOCKER_FILE = (
     "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/docker_manager.py

@@ -25,7 +25,7 @@ from docker.models.containers import Container
 from docker.models.images import Image
 from filelock import FileLock
 
-from fastled.print_filter import PrintFilter
+from fastled.print_filter import PrintFilter, PrintFilterFastled
 from fastled.spinner import Spinner
 
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
@@ -103,7 +103,7 @@ class Volume:
 # Override the default PrintFilter to use a custom one.
 def make_default_print_filter() -> PrintFilter:
     """Create a default PrintFilter instance."""
-    return PrintFilter()
+    return PrintFilterFastled()
 
 
 class RunningContainer:

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/parse_args.py

@@ -24,10 +24,37 @@ def _find_fastled_repo(start: Path) -> Path | None:
     return None
 
 
+_DEFAULT_HELP_TEXT = """
+FastLED WASM Compiler - Useful options:
+  <directory>           Directory containing the FastLED sketch to compile
+  --init [example]      Initialize one of the top tier WASM examples
+  --web [url]           Use web compiler
+  --server              Run the compiler server
+  --debug               Build with debug symbols for dev-tools debugging
+  --quick               Build in quick mode (default)
+  --release             Build in optimized release mode
+  --profile             Enable profiling the C++ build system
+  --update              Update the docker image for the wasm compiler
+  --purge               Remove all FastLED containers and images
+  --version             Show version information
+  --help                Show detailed help
+Examples:
+  fastled (will auto detect the sketch directory and prompt you)
+  fastled my_sketch
+  fastled my_sketch --web (compiles using the web compiler only)
+  fastled --init Blink (initializes a new sketch directory with the Blink example)
+  fastled --server (runs the compiler server in the current directory)
+"""
+
+
 def parse_args() -> Args:
     """Parse command-line arguments."""
     from fastled import __version__
 
+    # Check if no arguments were provided
+    if len(sys.argv) == 1:
+        print(_DEFAULT_HELP_TEXT)
+
     parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
     parser.add_argument("--version", action="version", version=f"{__version__}")
     parser.add_argument(

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/print_filter.py

@@ -1,4 +1,26 @@
 import re
+from abc import ABC, abstractmethod
+
+
+class PrintFilter(ABC):
+    """Abstract base class for filtering text output."""
+
+    def __init__(self, echo: bool = True) -> None:
+        self.echo = echo
+
+    @abstractmethod
+    def filter(self, text: str) -> str:
+        """Filter the text according to implementation-specific rules."""
+        pass
+
+    def print(self, text: str | bytes) -> str:
+        """Prints the text to the console after filtering."""
+        if isinstance(text, bytes):
+            text = text.decode("utf-8")
+        text = self.filter(text)
+        if self.echo:
+            print(text, end="")
+        return text
 
 
 def _handle_ino_cpp(line: str) -> str:
@@ -17,31 +39,30 @@ def _handle_ino_cpp(line: str) -> str:
     return line
 
 
-class PrintFilter:
-    """Provides filtering for text output so that source files match up with local names."""
+class PrintFilterDefault(PrintFilter):
+    """Provides default filtering for FastLED output."""
+
+    def filter(self, text: str) -> str:
+        return text
+
+
+class PrintFilterFastled(PrintFilter):
+    """Provides filtering for FastLED output so that source files match up with local names."""
 
     def __init__(self, echo: bool = True) -> None:
-        self.echo = echo
+        super().__init__(echo)
         self.build_started = False
-        pass
 
-    def _filter_all(self, text: str) -> str:
+    def filter(self, text: str) -> str:
         lines = text.splitlines()
         out: list[str] = []
         for line in lines:
+            ## DEBUG DO NOT SUBMIT
+            # print(line)
             if "# WASM is building" in line:
                 self.build_started = True
-            if self.build_started:
+            if self.build_started or " error: " in line:
                 line = _handle_ino_cpp(line)
             out.append(line)
         text = "\n".join(out)
         return text
-
-    def print(self, text: str | bytes) -> str:
-        """Prints the text to the console."""
-        if isinstance(text, bytes):
-            text = text.decode("utf-8")
-        text = self._filter_all(text)
-        if self.echo:
-            print(text, end="")
-        return text

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/types.py

@@ -4,6 +4,8 @@ from enum import Enum
 from pathlib import Path
 from typing import Any
 
+from fastled.print_filter import PrintFilterFastled
+
 
 @dataclass
 class Args:
@@ -102,6 +104,11 @@ class CompileResult:
     def to_dict(self) -> dict[str, Any]:
         return self.__dict__.copy()
 
+    def __post_init__(self):
+        # Filter the stdout.
+        pf = PrintFilterFastled(echo=False)
+        self.stdout = pf.print(self.stdout)
+
 
 class CompileServerError(Exception):
     """Error class for failing to instantiate CompileServer."""

{fastled-1.2.75 → fastled-1.2.76}/src/fastled/web_compile.py

@@ -4,6 +4,7 @@ import json
 import os
 import shutil
 import tempfile
+import time
 import zipfile
 from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
@@ -154,6 +155,37 @@ def find_good_connection(
     return None
 
 
+def _banner(msg: str) -> str:
+    """
+    Create a banner for the given message.
+    Example:
+    msg = "Hello, World!"
+    print -> "#################"
+             "# Hello, World! #"
+             "#################"
+    """
+    lines = msg.split("\n")
+    # Find the width of the widest line
+    max_width = max(len(line) for line in lines)
+    width = max_width + 4  # Add 4 for "# " and " #"
+
+    # Create the top border
+    banner = "\n" + "#" * width + "\n"
+
+    # Add each line with proper padding
+    for line in lines:
+        padding = max_width - len(line)
+        banner += f"# {line}{' ' * padding} #\n"
+
+    # Add the bottom border
+    banner += "#" * width + "\n"
+    return banner
+
+
+def _print_banner(msg: str) -> None:
+    print(_banner(msg))
+
+
 def web_compile(
     directory: Path | str,
     host: str | None = None,
@@ -161,11 +193,12 @@ def web_compile(
     build_mode: BuildMode | None = None,
     profile: bool = False,
 ) -> CompileResult:
+    start_time = time.time()
     if isinstance(directory, str):
         directory = Path(directory)
     host = _sanitize_host(host or DEFAULT_HOST)
     build_mode = build_mode or BuildMode.QUICK
-    print("Compiling on", host)
+    _print_banner(f"Compiling on {host}")
     auth_token = auth_token or _AUTH_TOKEN
     if not directory.exists():
         raise FileNotFoundError(f"Directory not found: {directory}")
@@ -186,7 +219,7 @@ def web_compile(
 
         connection_result = find_good_connection(urls)
         if connection_result is None:
-            print("Connection failed to all endpoints")
+            _print_banner("Connection failed to all endpoints")
             return CompileResult(
                 success=False,
                 stdout="Connection failed",
@@ -270,6 +303,9 @@ def web_compile(
                             relative_path = file_path.relative_to(extract_path)
                             out_zip.write(file_path, relative_path)
 
+                diff_time = time.time() - start_time
+                msg = f"Compilation success, took {diff_time:.2f} seconds"
+                _print_banner(msg)
                 return CompileResult(
                     success=True,
                     stdout=stdout,

{fastled-1.2.75 → fastled-1.2.76}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.75 → fastled-1.2.76}/tests/unit/test_bad_ino.py

@@ -35,7 +35,15 @@ class WebCompileTester(unittest.TestCase):
             print("stdout:")
             print(result.stdout)
             self.fail("Expected error not found in stdout")
-        # self.assertIn("lsfjsdklfjdskfjkasdfjdsfds", result.stdout)
+        if "bad/bad.ino:" not in result.stdout:  # No .cpp extension.
+            print(
+                "bad.ino.cpp was not transformed to bad.ino without the cpp extension"
+            )
+            print("stdout:")
+            print(result.stdout)
+            self.fail(
+                "bad.ino.cpp was not transformed to bad.ino without the cpp extension"
+            )
 
         print(f"Zip size: {len(result.zip_bytes)} bytes")
 

{fastled-1.2.75 → fastled-1.2.76}/tests/unit/test_print_filter.py

@@ -4,18 +4,20 @@ Unit test file.
 
 import unittest
 
-from fastled.print_filter import PrintFilter
+from fastled.print_filter import PrintFilterFastled
 
 
 class PrintFitlerTester(unittest.TestCase):
     """Main tester class."""
 
-    def test_live_client(self) -> None:
+    def test_print_filter(self) -> None:
         """Tests that a project can be filtered"""
         # Test the PrintFilter class
-        pf = PrintFilter(echo=False)
+        pf = PrintFilterFastled(echo=False)
         pf.print("# WASM is building")  # This should trigger the filter.
-        result = pf.print("src/XYPath.ino.cpp")  # This should now be transformed.
+        result = pf.print(
+            "5.36 src/XYPath.ino.cpp:4:1: error: unknown type name 'kdsjfsdkfjsd'"
+        )  # This should now be transformed.
         self.assertNotIn(".ino.cpp", result, "Expected .ino.cpp to be filtered out")
         self.assertIn(
             "examples/XYPath/XYPath.ino", result, "Expected path to be transformed"