fastled 1.3.16__tar.gz → 1.3.18__tar.gz

{fastled-1.3.16 → fastled-1.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.16
+Version: 1.3.18
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -403,6 +403,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 ## Performance
 
+
 ```
 ###############################
 # Build started with command: #

{fastled-1.3.16 → fastled-1.3.18}/README.md

@@ -376,6 +376,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 ## Performance
 
+
 ```
 ###############################
 # Build started with command: #

{fastled-1.3.16 → fastled-1.3.18}/RELEASE.md

@@ -5,4 +5,6 @@ Go to src/fastled/__init__.py and increase the version number.
 Make sure this is the ONLY change in your repo (or the release will fail
 for unknown reasons) and commit and then push. Github builders will do all the rest.
 
+
+
 Make sure and watch the jobs to verify that it worked.

{fastled-1.3.16 → fastled-1.3.18}/requirements.testing.txt

@@ -6,4 +6,4 @@ ruff
 pytest-xdist
 pyinstaller
 pyright
-fastled-wasm-server>=1.0.64
+fastled-wasm-server>=1.0.70

{fastled-1.3.16 → fastled-1.3.18}/src/fastled/__version__.py

@@ -1,6 +1,6 @@
 # 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.3.16"
+__version__ = "1.3.18"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

{fastled-1.3.16 → fastled-1.3.18}/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, PrintFilterFastled
+from fastled.print_filter import PrintFilter, PrintFilterDefault
 from fastled.spinner import Spinner
 
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
@@ -138,7 +138,7 @@ class Volume:
 # Override the default PrintFilter to use a custom one.
 def make_default_print_filter() -> PrintFilter:
     """Create a default PrintFilter instance."""
-    return PrintFilterFastled()
+    return PrintFilterDefault()
 
 
 class RunningContainer:

fastled-1.3.18/src/fastled/print_filter.py

@@ -0,0 +1,52 @@
+import re
+from abc import ABC, abstractmethod
+from enum import Enum
+
+
+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:
+    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 PrintFilterDefault(PrintFilter):
+    """Provides default filtering for FastLED output."""
+
+    def filter(self, text: str) -> str:
+        return text
+
+
+class CompileOrLink(Enum):
+    COMPILE = "compile"
+    LINK = "link"

{fastled-1.3.16 → fastled-1.3.18}/src/fastled/server_flask.py

@@ -28,11 +28,15 @@ else:
 
 def _is_dwarf_source(path: str) -> bool:
     """Check if the path is a dwarf source file."""
+    if "dwarfsource" in path:
+        logger.debug(f"Path '{path}' contains 'dwarfsource'")
+        return True
     # Check if the path starts with "fastledsource/" or "sketchsource/"
     return (
         path.startswith("fastledsource/")
         or path.startswith("sketchsource/")
-        or path.startswith("dwarfsource")
+        or path.startswith("/dwarfsource/")
+        or path.startswith("dwarfsource/")
     )
 
 
@@ -335,6 +339,7 @@ def _run_flask_server(
 
             try:
                 is_debug_src_code_request = _is_dwarf_source(path)
+                logger.info(f"is debug_src_code_request: {is_debug_src_code_request}")
                 if is_debug_src_code_request:
                     logger.info(f"Handling as drawfsource: {path}")
                     return handle_fastledsource(path)

{fastled-1.3.16 → fastled-1.3.18}/src/fastled/types.py

@@ -3,7 +3,7 @@ from enum import Enum
 from typing import Any
 
 from fastled.args import Args
-from fastled.print_filter import PrintFilterFastled
+from fastled.print_filter import PrintFilterDefault
 
 
 @dataclass
@@ -21,7 +21,7 @@ class CompileResult:
 
     def __post_init__(self):
         # Filter the stdout.
-        pf = PrintFilterFastled(echo=False)
+        pf = PrintFilterDefault(echo=False)
         self.stdout = pf.print(self.stdout)
 
 

{fastled-1.3.16 → fastled-1.3.18}/src/fastled/util.py

@@ -14,9 +14,12 @@ def banner_string(msg: str) -> str:
     lines = msg.splitlines()
     max_length = max(len(line) for line in lines)
     border = "#" * (max_length + 4)
-    bordered_lines = [f"# {line} " + "#" * (max_length - len(line)) for line in lines]
-    bordered_msg = "\n".join(bordered_lines)
-    return f"\n{border}\n{bordered_msg}\n{border}\n"
+    out: list[str] = []
+    out.append(border)
+    for line in lines:
+        out.append(f"# {line} " + " " * (max_length - len(line)) + "#")
+    out.append(border)
+    return "\n".join(out)
 
 
 def print_banner(msg: str) -> None:

{fastled-1.3.16 → fastled-1.3.18}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.16
+Version: 1.3.18
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -403,6 +403,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 ## Performance
 
+
 ```
 ###############################
 # Build started with command: #

{fastled-1.3.16 → fastled-1.3.18}/src/fastled.egg-info/SOURCES.txt

@@ -91,15 +91,14 @@ tests/integration/test_build_examples.py
 tests/integration/test_examples.py
 tests/unit/test_api.py
 tests/unit/test_bad_ino.py
+tests/unit/test_banner_string.py
 tests/unit/test_cli.py
 tests/unit/test_compile_server.py
 tests/unit/test_debug_fetch_source_files.py
 tests/unit/test_docker_linux_on_windows.py
 tests/unit/test_embedded_data.py
-tests/unit/test_experimental_cpp_filter.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.3.16 → fastled-1.3.18}/tests/unit/test_bad_ino.py

@@ -35,15 +35,15 @@ class WebCompileTester(unittest.TestCase):
             print("stdout:")
             print(result.stdout)
             self.fail("Expected error not found in 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"
-            )
+        # 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.3.18/tests/unit/test_banner_string.py

@@ -0,0 +1,24 @@
+import unittest
+
+from fastled.util import banner_string
+
+_MSG = "Hello, World!\nsecond line"
+
+_EXPECTED: str = (
+    "#################\n"
+    "# Hello, World! #\n"
+    "# second line   #\n"
+    "#################"
+)
+
+
+class TestBannerString(unittest.TestCase):
+    def test_banner_string(self):
+        actual = banner_string(_MSG)
+        print(actual)
+        print(_EXPECTED)
+        self.assertEqual(actual, _EXPECTED)
+
+
+if __name__ == "__main__":
+    unittest.main()

{fastled-1.3.16 → fastled-1.3.18}/tests/unit/test_debug_fetch_source_files.py

@@ -17,14 +17,11 @@ TEST_INO_WASM = HERE / "test_ino" / "wasm"
 # New refactor has broken this test. Good news, we got the sketch to output debug symbols!!!!!!
 _ENABLED = True
 
-_DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/fastledsource/js/src/fastledsource/git/fastled/src/FastLED.h"
-_DWARF_SRC_EXAMPLE2 = (
-    "http://localhost:{http_port}/sketchsource/js/sketchsource/headers/FastLED.h"
-)
+_DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/dwarfsource/fastledsource/js/src/fastledsource/git/fastled/src/FastLED.h"
+
 
 _DWARF_SRC_EXAMPLES = [
     _DWARF_SRC_EXAMPLE1,
-    _DWARF_SRC_EXAMPLE2,
 ]
 
 

{fastled-1.3.16 → fastled-1.3.18}/tests/unit/test_ino/bad/bad.ino

@@ -4,7 +4,6 @@
 /// @example NoisePlusPalette.ino
 
 
-lsfjsdklfjdskfjkasdfjdsfds /// the garbage heare should trigger a build failure.
 
 // printf
 #include <stdio.h>
@@ -21,6 +20,9 @@ lsfjsdklfjdskfjkasdfjdsfds /// the garbage heare should trigger a build failure.
 
 #include "fl/ui.h"
 
+
+lsfjsdklfjdskfjkasdfjdsfds; /// the garbage hear should trigger a build failure.
+
 using namespace fl;
 
 #define LED_PIN 3

fastled-1.3.16/src/fastled/print_filter.py

@@ -1,247 +0,0 @@
-import re
-import zlib
-from abc import ABC, abstractmethod
-from dataclasses import dataclass
-from enum import Enum
-
-
-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:
-    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
-
-
-def _handle_fastled_src(line: str) -> str:
-    return line.replace("fastled/src", "src")
-
-
-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:
-        super().__init__(echo)
-        self.build_started = False
-        # self.compile_link_active = False
-        # self.compile_link_filter:
-
-    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
-            line = _handle_fastled_src(
-                line
-            )  # Always convert fastled/src to src for file matchups.
-            if self.build_started or " error: " in line:
-                line = _handle_ino_cpp(line)
-            out.append(line)
-        text = "\n".join(out)
-        return text
-
-
-class CompileOrLink(Enum):
-    COMPILE = "compile"
-    LINK = "link"
-
-
-@dataclass
-class BuildArtifact:
-    timestamp: float
-    input_artifact: str | None
-    output_artifact: str | None
-    build_flags: str
-    compile_or_link: CompileOrLink
-    hash: int
-
-    def flags_pretty(self) -> str:
-        """
-        Returns the flags in a pretty format.
-        This is used for printing the flags to the console.
-        """
-        flags = self.build_flags
-        flags = flags.replace(" -I", "\n-I")
-        flags = flags.replace(" -D", "\n-D")
-        flags = flags.replace(" -l", "\n-l")
-        flags = flags.replace(" -L", "\n-L")
-        flags = flags.replace(" -o", "\n-o")
-        flags = flags.replace(" -W", "\n-W")
-        flags = flags.replace(" -f", "\n-f")
-        flags = flags.replace(" -g", "\n-g")
-
-        # break into lines and sort
-        lines = flags.splitlines()
-        first_line = lines[0]
-        lines.pop(0)  # remove first line
-        lines = sorted(lines)
-        # remove duplicates
-        lines = list(dict.fromkeys(lines))
-        # remove empty lines
-        lines = [line for line in lines if line.strip() != ""]
-        # remove leading and trailing whitespace
-        lines = [line.strip() for line in lines]
-        lines = sorted(lines)
-        lines = [first_line] + lines  # add first line back to the beginning
-        # stringify
-        flags = "\n".join(lines)
-        return flags
-
-    def __str__(self) -> str:
-        return f"{self.brief()} {self.build_flags} {self.compile_or_link} {self.hash}"
-
-    def brief(self) -> str:
-        return f"{self.timestamp:.2f} {self.output_artifact}"
-
-    def begin_flags(self) -> str:
-        """
-        Returns the flags that are used to begin a build.
-        This is the flags that are used for the first compile or link.
-        """
-
-        out: str = (
-            "\n################ NEW COMPILE/LINK FLAG GROUP #####################\n\n"
-        )
-        out += f"{self.flags_pretty()}\n"
-        return out
-
-    def end_flags(self) -> str:
-        """
-        Returns the flags that are used to end a build.
-        This is the flags that are used for the last compile or link.
-        """
-        out: str = (
-            "\n################ END COMPILE/LINK FLAG GROUP #####################\n"
-        )
-        return out
-
-    @staticmethod
-    def parse(input_str: str) -> "BuildArtifact | None":
-        """
-        Parse a single build-log line of the form:
-          "<timestamp> ... <some .cpp or .h file> ... <flags>"
-
-        Returns a BuildArtifact, or None if parsing failed.
-        """
-        return _parse(input_str)
-
-
-class TokenFilter(ABC):
-    @abstractmethod
-    def extract(self, tokens: list[str]) -> str | None:
-        """
-        Scan `tokens`, remove any tokens this filter is responsible for,
-        and return the extracted string (or None if not found/invalid).
-        """
-        ...
-
-
-class TimestampFilter(TokenFilter):
-    def extract(self, tokens: list[str]) -> str | None:
-        if not tokens:
-            return None
-        candidate = tokens[0]
-        try:
-            _ = float(candidate)
-            return tokens.pop(0)
-        except ValueError:
-            return None
-
-
-class InputArtifactFilter(TokenFilter):
-    def extract(self, tokens: list[str]) -> str | None:
-        for i, tok in enumerate(tokens):
-            if tok.endswith(".cpp") or tok.endswith(".h"):
-                return tokens.pop(i)
-        return None
-
-
-class OutputArtifactFilter(TokenFilter):
-    def extract(self, tokens: list[str]) -> str | None:
-        for i, tok in enumerate(tokens):
-            if tok == "-o" and i + 1 < len(tokens):
-                tokens.pop(i)  # drop '-o'
-                return tokens.pop(i)  # drop & return artifact
-        return None
-
-
-class ActionFilter(TokenFilter):
-    def extract(self, tokens: list[str]) -> str | None:
-        if "-c" in tokens:
-            return CompileOrLink.COMPILE.value
-        return CompileOrLink.LINK.value
-
-
-def _parse(line: str) -> BuildArtifact | None:
-    tokens = line.strip().split()
-    if not tokens:
-        return None
-
-    # instantiate in the order we need them
-    filters: list[TokenFilter] = [
-        TimestampFilter(),
-        InputArtifactFilter(),
-        OutputArtifactFilter(),
-        ActionFilter(),
-    ]
-
-    # apply each filter
-    raw_ts = filters[0].extract(tokens)
-    raw_in = filters[1].extract(tokens)
-    raw_out = filters[2].extract(tokens)
-    raw_act = filters[3].extract(tokens)
-
-    if raw_ts is None or raw_in is None or raw_act is None:
-        return None
-
-    # the rest of `tokens` are the flags
-    flags_str = " ".join(tokens)
-    h = zlib.adler32(flags_str.encode("utf-8"))
-
-    return BuildArtifact(
-        timestamp=float(raw_ts),
-        input_artifact=raw_in,
-        output_artifact=raw_out,
-        build_flags=flags_str,
-        compile_or_link=CompileOrLink(raw_act),
-        hash=h,
-    )