fastled 1.2.74__tar.gz → 1.2.75__tar.gz

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

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

{fastled-1.2.74 → fastled-1.2.75}/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.74"
+__version__ = "1.2.75"
 
 DOCKER_FILE = (
     "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"

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

@@ -25,6 +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.spinner import Spinner
 
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
@@ -99,25 +100,10 @@ class Volume:
         return volumes
 
 
-class PrintFilter:
-    """Provides filtering for text output so that source files match up with local names."""
-
-    def __init__(self) -> None:
-        pass
-
-    def _remove_ino_cpp(self, text: str) -> str:
-        return text.replace(".ino.cpp", ".ino")
-
-    def _filter_all(self, text: str) -> str:
-        text = self._remove_ino_cpp(text)
-        return text
-
-    def print(self, text: str | bytes) -> None:
-        """Prints the text to the console."""
-        if isinstance(text, bytes):
-            text = text.decode("utf-8")
-        text = self._filter_all(text)
-        print(text, end="")
+# Override the default PrintFilter to use a custom one.
+def make_default_print_filter() -> PrintFilter:
+    """Create a default PrintFilter instance."""
+    return PrintFilter()
 
 
 class RunningContainer:
@@ -127,7 +113,7 @@ class RunningContainer:
         first_run: bool = False,
         filter: PrintFilter | None = None,
     ) -> None:
-        self.filter = filter or PrintFilter()
+        self.filter = filter or make_default_print_filter()
         self.container = container
         self.first_run = first_run
         self.running = True

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

@@ -66,7 +66,7 @@ def parse_args() -> Args:
     parser.add_argument(
         "--profile",
         action="store_true",
-        help="Enable profiling for web compilation",
+        help="Enable profiling of the C++ build system used for wasm compilation.",
     )
     parser.add_argument(
         "--force-compile",
@@ -79,6 +79,7 @@ def parse_args() -> Args:
         help="Disable automatic updates of the wasm compiler image when using docker.",
     )
     parser.add_argument(
+        "-u",
         "--update",
         "--upgrade",
         action="store_true",
@@ -89,7 +90,7 @@ def parse_args() -> Args:
         "--local",
         "-l",
         action="store_true",
-        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
+        help="(Default): Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
     )
     parser.add_argument(
         "--build",

fastled-1.2.75/src/fastled/print_filter.py

@@ -0,0 +1,47 @@
+import re
+
+
+def _handle_ino_cpp(line: str) -> str:
+    if ".ino.cpp" in line[0:30]:
+        # Extract the filename without path and extension
+        match = re.search(r"src/([^/]+)\.ino\.cpp", line)
+        if match:
+            filename = match.group(1)
+            # Replace with examples/Filename/Filename.ino format
+            line = line.replace(
+                f"src/{filename}.ino.cpp", f"examples/{filename}/{filename}.ino"
+            )
+        else:
+            # Fall back to simple extension replacement if regex doesn't match
+            line = line.replace(".ino.cpp", ".ino")
+    return line
+
+
+class PrintFilter:
+    """Provides filtering for text output so that source files match up with local names."""
+
+    def __init__(self, echo: bool = True) -> None:
+        self.echo = echo
+        self.build_started = False
+        pass
+
+    def _filter_all(self, text: str) -> str:
+        lines = text.splitlines()
+        out: list[str] = []
+        for line in lines:
+            if "# WASM is building" in line:
+                self.build_started = True
+            if self.build_started:
+                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.74 → fastled-1.2.75}/src/fastled/select_sketch_directory.py

@@ -20,7 +20,9 @@ def select_sketch_directory(
         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: ").strip()
+        which = input(
+            "\nPlease specify a sketch directory\nYou can enter a number or type a fuzzy search: "
+        ).strip()
         try:
             index = int(which) - 1
             return str(sketch_directories[index])

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

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

{fastled-1.2.74 → fastled-1.2.75}/src/fastled.egg-info/SOURCES.txt

@@ -77,6 +77,7 @@ src/fastled/live_client.py
 src/fastled/open_browser.py
 src/fastled/parse_args.py
 src/fastled/paths.py
+src/fastled/print_filter.py
 src/fastled/project_init.py
 src/fastled/select_sketch_directory.py
 src/fastled/server_fastapi.py
@@ -113,6 +114,7 @@ tests/unit/test_docker_linux_on_windows.py
 tests/unit/test_embedded_data.py
 tests/unit/test_filechanger.py
 tests/unit/test_http_server.py
+tests/unit/test_print_filter.py
 tests/unit/test_project_init.py
 tests/unit/test_server_and_client_seperatly.py
 tests/unit/test_string_diff.py

fastled-1.2.75/tests/unit/test_print_filter.py

@@ -0,0 +1,26 @@
+"""
+Unit test file.
+"""
+
+import unittest
+
+from fastled.print_filter import PrintFilter
+
+
+class PrintFitlerTester(unittest.TestCase):
+    """Main tester class."""
+
+    def test_live_client(self) -> None:
+        """Tests that a project can be filtered"""
+        # Test the PrintFilter class
+        pf = PrintFilter(echo=False)
+        pf.print("# WASM is building")  # This should trigger the filter.
+        result = pf.print("src/XYPath.ino.cpp")  # 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"
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()