fastled 1.2.73__tar.gz → 1.2.75__tar.gz

{fastled-1.2.73 → fastled-1.2.75}/Dockerfile

@@ -41,8 +41,8 @@
 
 # This will be set to arm64 to support MacOS M1+ devices (and Linux-based arm64 devices)
 ARG PLATFORM_TAG=""
-# ARG EMSDK_VERSION_TAG="4.0.4"
-ARG EMSDK_VERSION_TAG="3.1.70"
+ARG EMSDK_VERSION_TAG="4.0.8"
+# ARG EMSDK_VERSION_TAG="3.1.70"
 
 # Use only Emscripten base image
 FROM emscripten/emsdk:${EMSDK_VERSION_TAG}${PLATFORM_TAG}

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

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

{fastled-1.2.73 → fastled-1.2.75}/compiler/compile.py

@@ -89,6 +89,33 @@ def copy_files(src_dir: Path, js_src: Path) -> None:
             shutil.copy2(item, js_src / item.name)
 
 
+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 compile(
     compiler_root: Path, build_mode: BuildMode, auto_clean: bool, no_platformio: bool
 ) -> int:
@@ -96,7 +123,7 @@ def compile(
     max_attempts = 1
     env = os.environ.copy()
     env["BUILD_MODE"] = build_mode.name
-    print(f"Build mode: {build_mode.name}")
+    print(_banner(f"WASM is building in mode: {build_mode.name}"))
     cmd_list: list[str] = []
     if no_platformio:
         # execute build_archive.syh
@@ -113,6 +140,7 @@ def compile(
             cmd_list.append("-v")
 
     def _open_process(cmd_list: list[str] = cmd_list) -> subprocess.Popen:
+        print(_banner("Running command:\n  " + subprocess.list2cmdline(cmd_list)))
         out = subprocess.Popen(
             cmd_list,
             cwd=compiler_root,
@@ -138,7 +166,7 @@ def compile(
             relative_output = _make_timestamps_relative("\n".join(output_lines))
             print(relative_output)
             if process.returncode == 0:
-                print(f"Compilation successful on attempt {attempt}")
+                print(_banner(f"Compilation successful on attempt {attempt}"))
                 return 0
             else:
                 raise subprocess.CalledProcessError(process.returncode, ["pio", "run"])
@@ -199,7 +227,7 @@ def transform_to_cpp(src_dir: Path) -> None:
 def insert_headers(
     src_dir: Path, exclusion_folders: List[Path], file_extensions: List[str]
 ) -> None:
-    print("Inserting headers in source files...")
+    print(_banner("Inserting headers in source files..."))
     for file in src_dir.rglob("*"):
         if (
             file.suffix in file_extensions
@@ -213,7 +241,7 @@ def process_ino_files(src_dir: Path) -> None:
     transform_to_cpp(src_dir)
     exclusion_folders: List[Path] = []
     insert_headers(src_dir, exclusion_folders, _FILE_EXTENSIONS)
-    print("Transform to cpp and insert header operations completed.")
+    print(_banner("Transform to cpp and insert header operations completed."))
 
 
 def _make_timestamps_relative(stdout: str) -> str:
@@ -381,7 +409,7 @@ def process_compile(
     if rtn != 0:
         print("Compilation failed.")
         raise RuntimeError("Compilation failed.")
-    print("Compilation successful.")
+    print(_banner("Compilation successful."))
 
 
 def cleanup(args: Args, js_src: Path) -> None:
@@ -422,9 +450,15 @@ def run(args: Args) -> int:
     print(f"Using mapped directory: {args.mapped_dir}")
 
     if args.profile:
-        print("Enabling profiling for compilation.")
+        print(_banner("Enabling profiling for compilation."))
         # Profile linking
         os.environ["EMPROFILE"] = "2"
+    else:
+        print(
+            _banner(
+                "Build process profiling is disabled\nuse --profile to get metrics on how long the build process took."
+            )
+        )
 
     try:
 
@@ -477,6 +511,8 @@ def run(args: Args) -> int:
                 return 1
 
             def _get_build_dir_platformio() -> Path:
+                # First assert there is only one build artifact directory.
+                # The name is dynamic: it's your sketch folder name.
                 build_dirs = [d for d in PIO_BUILD_DIR.iterdir() if d.is_dir()]
                 if len(build_dirs) != 1:
                     raise RuntimeError(
@@ -493,16 +529,17 @@ def run(args: Args) -> int:
             else:
                 build_dir = _get_build_dir_platformio()
 
-            print("Copying output files...")
+            print(_banner("Copying output files..."))
             out_dir: Path = src_dir / _FASTLED_OUTPUT_DIR_NAME
             out_dir.mkdir(parents=True, exist_ok=True)
 
-            for file in ["fastled.js", "fastled.wasm"]:
-                _src = build_dir / file
-                _dst = out_dir / file
-                print(f"Copying {_src} to {_dst}")
-                shutil.copy2(_src, _dst)
+            # Copy all fastled.* build artifacts
+            for file_path in build_dir.glob("fastled.*"):
+                _dst = out_dir / file_path.name
+                print(f"Copying {file_path} to {_dst}")
+                shutil.copy2(file_path, _dst)
 
+            # Copy static files.
             print(f"Copying {_INDEX_HTML_SRC} to output directory")
             shutil.copy2(_INDEX_HTML_SRC, out_dir / "index.html")
             print(f"Copying {_INDEX_CSS_SRC} to output directory")
@@ -510,23 +547,30 @@ def run(args: Args) -> int:
 
             # copy all js files in _FASTLED_COMPILER_DIR to output directory
             Path(out_dir / "modules").mkdir(parents=True, exist_ok=True)
-            for _file in _FASTLED_MODULES_DIR.iterdir():
-                if _file.suffix == ".js":
-                    print(f"Copying {_file} to output directory")
-                    shutil.copy2(_file, out_dir / "modules" / _file.name)
-
-            fastled_js_mem = build_dir / "fastled.js.mem"
-            fastled_wasm_map = build_dir / "fastled.wasm.map"
-            fastled_js_symbols = build_dir / "fastled.js.symbols"
-            if fastled_js_mem.exists():
-                print(f"Copying {fastled_js_mem} to output directory")
-                shutil.copy2(fastled_js_mem, out_dir / fastled_js_mem.name)
-            if fastled_wasm_map.exists():
-                print(f"Copying {fastled_wasm_map} to output directory")
-                shutil.copy2(fastled_wasm_map, out_dir / fastled_wasm_map.name)
-            if fastled_js_symbols.exists():
-                print(f"Copying {fastled_js_symbols} to output directory")
-                shutil.copy2(fastled_js_symbols, out_dir / fastled_js_symbols.name)
+
+            # Recursively copy all non-hidden files and directories
+            print(f"Copying files from {_FASTLED_MODULES_DIR} to {out_dir / 'modules'}")
+            shutil.copytree(
+                src=_FASTLED_MODULES_DIR,
+                dst=out_dir / "modules",
+                dirs_exist_ok=True,
+                ignore=shutil.ignore_patterns(".*"),
+            )  # Ignore hidden files
+
+            # Now long needed since now we do glob copy.
+            # fastled_js_mem = build_dir / "fastled.js.mem"
+            # fastled_wasm_map = build_dir / "fastled.wasm.map"
+            # fastled_js_symbols = build_dir / "fastled.js.symbols"
+            # if fastled_js_mem.exists():
+            #     print(f"Copying {fastled_js_mem} to output directory")
+            #     shutil.copy2(fastled_js_mem, out_dir / fastled_js_mem.name)
+            # if fastled_wasm_map.exists():
+            #     print(f"Copying {fastled_wasm_map} to output directory")
+            #     shutil.copy2(fastled_wasm_map, out_dir / fastled_wasm_map.name)
+            # if fastled_js_symbols.exists():
+            #     print(f"Copying {fastled_js_symbols} to output directory")
+            # shutil.copy2(fastled_js_symbols, out_dir / fastled_js_symbols.name)
+
             print("Copying index.js to output directory")
             shutil.copy2(_INDEX_JS_SRC, out_dir / "index.js")
             optional_input_data_dir = src_dir / "data"
@@ -546,7 +590,7 @@ def run(args: Args) -> int:
                     if _file.is_file():  # Only copy files, not directories
                         filename: str = _file.name
                         if filename.endswith(".embedded.json"):
-                            print("Embedding data file")
+                            print(_banner("Embedding data file"))
                             filename_no_embedded = filename.replace(
                                 ".embedded.json", ""
                             )
@@ -577,13 +621,13 @@ def run(args: Args) -> int:
                             )
 
             # Write manifest file even if empty
-            print("Writing manifest files.json")
+            print(_banner("Writing manifest files.json"))
             manifest_json_str = json.dumps(manifest, indent=2, sort_keys=True)
             with open(out_dir / "files.json", "w") as f:
                 f.write(manifest_json_str)
         cleanup(args, SKETCH_SRC)
 
-        print("Compilation process completed successfully")
+        print(_banner("Compilation process completed successfully"))
         return 0
 
     except Exception as e:

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

{fastled-1.2.73 → 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,8 +100,20 @@ class Volume:
         return volumes
 
 
+# Override the default PrintFilter to use a custom one.
+def make_default_print_filter() -> PrintFilter:
+    """Create a default PrintFilter instance."""
+    return PrintFilter()
+
+
 class RunningContainer:
-    def __init__(self, container, first_run=False):
+    def __init__(
+        self,
+        container: Container,
+        first_run: bool = False,
+        filter: PrintFilter | None = None,
+    ) -> None:
+        self.filter = filter or make_default_print_filter()
         self.container = container
         self.first_run = first_run
         self.running = True
@@ -117,7 +130,8 @@ class RunningContainer:
                 for log in self.container.logs(
                     follow=False, since=from_date, until=to_date, stream=True
                 ):
-                    print(log.decode("utf-8"), end="")
+                    # print(log.decode("utf-8"), end="")
+                    self.filter.print(log)
                 time.sleep(0.1)
                 from_date = to_date
                 to_date = _utc_now_no_tz()

{fastled-1.2.73 → 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.73 → 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.73 → fastled-1.2.75}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.73 → 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()