fastled 1.3.16__py3-none-any.whl → 1.3.18__py3-none-any.whl

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/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/print_filter.py

@@ -1,7 +1,5 @@
 import re
-import zlib
 from abc import ABC, abstractmethod
-from dataclasses import dataclass
 from enum import Enum
 
 
@@ -42,10 +40,6 @@ def _handle_ino_cpp(line: str) -> str:
     return line
 
 
-def _handle_fastled_src(line: str) -> str:
-    return line.replace("fastled/src", "src")
-
-
 class PrintFilterDefault(PrintFilter):
     """Provides default filtering for FastLED output."""
 
@@ -53,195 +47,6 @@ class PrintFilterDefault(PrintFilter):
         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,
-    )

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/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/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.dist-info → fastled-1.3.18.dist-info}/METADATA

@@ -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.dist-info → fastled-1.3.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastled/__init__.py,sha256=YLikXGRWKlKAqj7bpvGmJLejGTFF-FC1lv2z1jwRinA,6852
-fastled/__version__.py,sha256=57KHjlWJTyjTsWrLmefW5XpIFq4bPK0OC7iMoruzD68,373
+fastled/__version__.py,sha256=xOnLQ6nJRZl-sf5g9Q1GzHGIQKsW6TRkHt8l0wnChY0,373
 fastled/app.py,sha256=zfSipnCZ6w9_aXCynGrqf7OE--mKzbhT0mEfCNW5XjA,5736
 fastled/args.py,sha256=d9CaarQ1yw7w0REwgrNQ78zOUQSk94fTXwXHtFZPTSY,3281
 fastled/cli.py,sha256=drgR2AOxVrj3QEz58iiKscYAumbbin2vIV-k91VCOAA,561
@@ -8,7 +8,7 @@ fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6
 fastled/client_server.py,sha256=uK-reqTN4umtVm8K3fcLo2Op_P_jFKVFtKFJRpBF1Xs,18598
 fastled/compile_server.py,sha256=rkXvrvdav5vDG8lv_OlBX3YSCHtnHMt25nXbfeg_r78,2960
 fastled/compile_server_impl.py,sha256=S9jaAMgaprrjW9oF0J4_H-QJc6OeNRmoFCt07RsXTkI,11644
-fastled/docker_manager.py,sha256=1TCU_iMWnAeKrMjhB4qxdhq44tPRhpmImzmh_bCNRaM,40232
+fastled/docker_manager.py,sha256=RzXeTyGTtzeAclUkk_RPk_eksUSjOOgPND3Mehu5zRs,40232
 fastled/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
 fastled/keyz.py,sha256=LO-8m_7CpNDiZLM-FXhQ30f9gN1bUYz5lOsUPTIbI-c,4020
@@ -16,17 +16,17 @@ fastled/live_client.py,sha256=yoAul8tVgbbPf1oEC79SUZSHkLECxlrXxgWR9XaBIp4,2957
 fastled/open_browser.py,sha256=DFyMrc1qic4Go7eLNPqMaLuMvTaE73NixdfSKV0yyp8,3709
 fastled/parse_args.py,sha256=Xj3jbNaTdEemqT1GcuhADvwT1mFX0InSC-Gzicqml1c,10791
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/print_filter.py,sha256=oomBjrouWNPCgJY2guCpljTijFvNKRBVbipDrxIsszA,7426
+fastled/print_filter.py,sha256=nc_rqYYdCUPinFycaK7fiQF5PG1up51pmJptR__QyAs,1499
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
-fastled/server_flask.py,sha256=HR7WNQWcxsOoKVvEc0Gs8YQQhEcwHZNwZ0gALuryioI,18271
+fastled/server_flask.py,sha256=TYb4N169sl5IwSgdvaCQvHyn3ZiX9DNDe6VE9lnlgp0,18515
 fastled/server_start.py,sha256=W9yKStkRlRNuXeV6j_6O7HjjFPyVLBHMcF9Uy2QjDWQ,479
 fastled/settings.py,sha256=dUVyJ8Mtprg0RwaS6oMWP8jBhr4C3R8fu4Hdx_Z1lCM,577
 fastled/sketch.py,sha256=Ftbh55Nt-p4hmPuPpj8Q9HrMzvnUazhoG_q9FHcxkns,3473
 fastled/spinner.py,sha256=VHxmvB92P0Z_zYxRajb5HiNmkHHvZ5dG7hKtZltzpcs,867
 fastled/string_diff.py,sha256=NbtYxvBFxTUdmTpMLizlgZj2ULJ-7etj72GBdWDTGws,2496
-fastled/types.py,sha256=m7df4YxPPxl9GcfTAr_Lc9wSCE3fVzpcQf9-X0cMYuQ,1803
-fastled/util.py,sha256=IhQhN8_RiWhN3BFWhETK1LTlwod8B_2hzOQidcLSdf8,1405
+fastled/types.py,sha256=ZDf1TbTT4XgA_pKIwr4JbkDB38_29ogSdDORjoT-zuY,1803
+fastled/util.py,sha256=TcqK_6ycq46dN9pxvnZEcjSG6qvNJnH9IvSQOqO0z_c,1411
 fastled/version.py,sha256=TpBMiEVdO3_sUZEu6wmwN8Q4AgX2BiCxStCsnPKh6E0,1209
 fastled/web_compile.py,sha256=R159Od1VqeXTW6y3rQY0_P9f0CJYbPuBiMLqb-zBCUQ,11526
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
@@ -36,9 +36,9 @@ fastled/site/build.py,sha256=2YKU_UWKlJdGnjdbAbaL0co6kceFMSTVYwH1KCmgPZA,13987
 fastled/site/examples.py,sha256=s6vj2zJc6BfKlnbwXr1QWY1mzuDBMt6j5MEBOWjO_U8,155
 fastled/test/can_run_local_docker_tests.py,sha256=LEuUbHctRhNNFWcvnz2kEGmjDJeXO4c3kNpizm3yVJs,400
 fastled/test/examples.py,sha256=GfaHeY1E8izBl6ZqDVjz--RHLyVR4NRnQ5pBesCFJFY,1673
-fastled-1.3.16.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.3.16.dist-info/METADATA,sha256=vgXoyBAVHmlDYdKz_OUYqBd8Ly14-WYmfRd-XtQizes,30044
-fastled-1.3.16.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-fastled-1.3.16.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.3.16.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.3.16.dist-info/RECORD,,
+fastled-1.3.18.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.3.18.dist-info/METADATA,sha256=HX7ofZYqP4xfEC8xAgUwJmJwTtCo4icgE7shmpAdvTc,30045
+fastled-1.3.18.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+fastled-1.3.18.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.3.18.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.3.18.dist-info/RECORD,,