fastled 1.3.17__py3-none-any.whl → 1.3.19__py3-none-any.whl

fastled/print_filter.py

@@ -1,52 +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"
+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/project_init.py

@@ -1,129 +1,129 @@
-import _thread
-import threading
-import time
-import zipfile
-from pathlib import Path
-
-import httpx
-
-from fastled.settings import DEFAULT_URL
-from fastled.spinner import Spinner
-
-DEFAULT_EXAMPLE = "wasm"
-
-
-def get_examples(host: str | None = None) -> list[str]:
-    host = host or DEFAULT_URL
-    url_info = f"{host}/info"
-    response = httpx.get(url_info, timeout=4)
-    response.raise_for_status()
-    examples: list[str] = response.json()["examples"]
-    return sorted(examples)
-
-
-def _prompt_for_example() -> str:
-    examples = get_examples()
-    while True:
-        print("Available examples:")
-        for i, example in enumerate(examples):
-            print(f"  [{i+1}]: {example}")
-        answer = input("Enter the example number or name: ").strip()
-        if answer.isdigit():
-            example_num = int(answer) - 1
-            if example_num < 0 or example_num >= len(examples):
-                print("Invalid example number")
-                continue
-            return examples[example_num]
-        elif answer in examples:
-            return answer
-
-
-class DownloadThread(threading.Thread):
-    def __init__(self, url: str, json: str):
-        super().__init__(daemon=True)
-        self.url = url
-        self.json = json
-        self.bytes_downloaded = 0
-        self.content: bytes | None = None
-        self.error: Exception | None = None
-        self.success = False
-
-    def run(self) -> None:
-        timeout = httpx.Timeout(5.0, connect=5.0, read=120.0, write=30.0)
-        try:
-            with httpx.Client(timeout=timeout) as client:
-                with client.stream("POST", self.url, json=self.json) as response:
-                    response.raise_for_status()
-                    content = b""
-                    for chunk in response.iter_bytes():
-                        content += chunk
-                        self.bytes_downloaded += len(chunk)
-                    self.content = content
-                    self.success = True
-        except KeyboardInterrupt:
-            self.error = RuntimeError("Download cancelled")
-            _thread.interrupt_main()
-        except Exception as e:
-            self.error = e
-
-
-def project_init(
-    example: str | None = "PROMPT",  # prompt for example
-    outputdir: Path | None = None,
-    host: str | None = None,
-) -> Path:
-    """
-    Initialize a new FastLED project.
-    """
-    host = host or DEFAULT_URL
-    outputdir = Path(outputdir) if outputdir is not None else Path("fastled")
-    outputdir.mkdir(exist_ok=True, parents=True)
-    if example == "PROMPT" or example is None:
-        try:
-            example = _prompt_for_example()
-        except httpx.HTTPStatusError:
-            print(
-                f"Failed to fetch examples, using default example '{DEFAULT_EXAMPLE}'"
-            )
-            example = DEFAULT_EXAMPLE
-    assert example is not None
-    endpoint_url = f"{host}/project/init"
-    json = example
-    print(f"Initializing project with example '{example}', url={endpoint_url}")
-
-    # Start download thread
-    download_thread = DownloadThread(endpoint_url, json)
-    # spinner = Spinner("Downloading project...")
-    with Spinner(f"Downloading project {example}..."):
-        download_thread.start()
-        while download_thread.is_alive():
-            time.sleep(0.1)
-
-    print()  # New line after progress
-    download_thread.join()
-
-    # Check for errors
-    if not download_thread.success:
-        assert download_thread.error is not None
-        raise download_thread.error
-
-    content = download_thread.content
-    assert content is not None
-    tmpzip = outputdir / "fastled.zip"
-    outputdir.mkdir(exist_ok=True)
-    tmpzip.write_bytes(content)
-    with zipfile.ZipFile(tmpzip, "r") as zip_ref:
-        zip_ref.extractall(outputdir)
-    tmpzip.unlink()
-    out = outputdir / example
-    print(f"Project initialized at {out}")
-    assert out.exists()
-    return out
-
-
-def unit_test() -> None:
-    project_init()
-
-
-if __name__ == "__main__":
-    unit_test()
+import _thread
+import threading
+import time
+import zipfile
+from pathlib import Path
+
+import httpx
+
+from fastled.settings import DEFAULT_URL
+from fastled.spinner import Spinner
+
+DEFAULT_EXAMPLE = "wasm"
+
+
+def get_examples(host: str | None = None) -> list[str]:
+    host = host or DEFAULT_URL
+    url_info = f"{host}/info"
+    response = httpx.get(url_info, timeout=4)
+    response.raise_for_status()
+    examples: list[str] = response.json()["examples"]
+    return sorted(examples)
+
+
+def _prompt_for_example() -> str:
+    examples = get_examples()
+    while True:
+        print("Available examples:")
+        for i, example in enumerate(examples):
+            print(f"  [{i+1}]: {example}")
+        answer = input("Enter the example number or name: ").strip()
+        if answer.isdigit():
+            example_num = int(answer) - 1
+            if example_num < 0 or example_num >= len(examples):
+                print("Invalid example number")
+                continue
+            return examples[example_num]
+        elif answer in examples:
+            return answer
+
+
+class DownloadThread(threading.Thread):
+    def __init__(self, url: str, json: str):
+        super().__init__(daemon=True)
+        self.url = url
+        self.json = json
+        self.bytes_downloaded = 0
+        self.content: bytes | None = None
+        self.error: Exception | None = None
+        self.success = False
+
+    def run(self) -> None:
+        timeout = httpx.Timeout(5.0, connect=5.0, read=120.0, write=30.0)
+        try:
+            with httpx.Client(timeout=timeout) as client:
+                with client.stream("POST", self.url, json=self.json) as response:
+                    response.raise_for_status()
+                    content = b""
+                    for chunk in response.iter_bytes():
+                        content += chunk
+                        self.bytes_downloaded += len(chunk)
+                    self.content = content
+                    self.success = True
+        except KeyboardInterrupt:
+            self.error = RuntimeError("Download cancelled")
+            _thread.interrupt_main()
+        except Exception as e:
+            self.error = e
+
+
+def project_init(
+    example: str | None = "PROMPT",  # prompt for example
+    outputdir: Path | None = None,
+    host: str | None = None,
+) -> Path:
+    """
+    Initialize a new FastLED project.
+    """
+    host = host or DEFAULT_URL
+    outputdir = Path(outputdir) if outputdir is not None else Path("fastled")
+    outputdir.mkdir(exist_ok=True, parents=True)
+    if example == "PROMPT" or example is None:
+        try:
+            example = _prompt_for_example()
+        except httpx.HTTPStatusError:
+            print(
+                f"Failed to fetch examples, using default example '{DEFAULT_EXAMPLE}'"
+            )
+            example = DEFAULT_EXAMPLE
+    assert example is not None
+    endpoint_url = f"{host}/project/init"
+    json = example
+    print(f"Initializing project with example '{example}', url={endpoint_url}")
+
+    # Start download thread
+    download_thread = DownloadThread(endpoint_url, json)
+    # spinner = Spinner("Downloading project...")
+    with Spinner(f"Downloading project {example}..."):
+        download_thread.start()
+        while download_thread.is_alive():
+            time.sleep(0.1)
+
+    print()  # New line after progress
+    download_thread.join()
+
+    # Check for errors
+    if not download_thread.success:
+        assert download_thread.error is not None
+        raise download_thread.error
+
+    content = download_thread.content
+    assert content is not None
+    tmpzip = outputdir / "fastled.zip"
+    outputdir.mkdir(exist_ok=True)
+    tmpzip.write_bytes(content)
+    with zipfile.ZipFile(tmpzip, "r") as zip_ref:
+        zip_ref.extractall(outputdir)
+    tmpzip.unlink()
+    out = outputdir / example
+    print(f"Project initialized at {out}")
+    assert out.exists()
+    return out
+
+
+def unit_test() -> None:
+    project_init()
+
+
+if __name__ == "__main__":
+    unit_test()

fastled/server_flask.py

@@ -28,13 +28,19 @@ else:
 
 def _is_dwarf_source(path: str) -> bool:
     """Check if the path is a dwarf source file."""
-    # 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/")
-    )
+    logger.debug(f"_is_dwarf_source called with path: {path}")
+    if "dwarfsource" in path:
+        logger.debug(f"Path '{path}' contains 'dwarfsource'")
+        return True
+    _is_dwarf_source = False
+    for p in ["fastledsource", "sketchsource", "dwarfsource", "drawfsource"]:
+        if p in path:
+            _is_dwarf_source = True
+            logger.debug(f"Path '{p}' contains '{path}'")
+            break
+    if not _is_dwarf_source:
+        logger.debug(f"Path '{path}' is not a dwarf source file")
+    return _is_dwarf_source
 
 
 def _run_flask_server(
@@ -136,70 +142,15 @@ def _run_flask_server(
                 logger.error(f"Error forwarding request: {e}", exc_info=True)
                 return Response(f"Error: {str(e)}", status=500)
 
-        def handle_fastledsource(path: str) -> Response:
-            """Handle requests to
-            /fastledsource/js/fastledsource/git/fastled/src/
-            or
-            /sketchsource/js/src/Blink.ino
-
-            The names are a bit mangled due to the way C++ prefixing works near the root directory.
-            """
-            from flask import request
-
-            start_time = time.time()
-            logger.info(f"Processing request: {request.method} {request.url}")
-            # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/dwarfsource/{path}"
-            logger.info(f"Requesting: {target_url}")
-            logger.info(f"Processing dwarfsource request for {path}")
-
-            # Log request headers
-            request_headers = {
-                key: value for key, value in request.headers if key != "Host"
-            }
-            logger.debug(f"Request headers: {request_headers}")
-
-            try:
-                # Forward the request with the same method, headers, and body
-                with httpx.Client() as client:
-                    resp = client.request(
-                        method=request.method,
-                        url=target_url,
-                        headers=request_headers,
-                        content=request.get_data(),
-                        cookies=request.cookies,
-                        follow_redirects=True,
-                    )
-
-                logger.info(f"Response status: {resp.status_code}")
-                logger.debug(f"Response headers: {dict(resp.headers)}")
-
-                # Create a Flask Response object from the httpx response
-                payload = resp.content
-                assert isinstance(payload, bytes)
-
-                # Check if the payload is empty
-                if len(payload) == 0:
-                    logger.error("Empty payload received from compile server")
-                    return Response("Empty payload", status=400)
-
-                response = Response(
-                    payload, status=resp.status_code, headers=dict(resp.headers)
-                )
-
-                elapsed_time = time.time() - start_time
-                logger.info(f"Request completed in {elapsed_time:.3f} seconds")
-
-                return response
-
-            except Exception as e:
-                logger.error(f"Error handling dwarfsource request: {e}", exc_info=True)
-                return Response(f"Error: {str(e)}", status=500)
-
-        def handle_sourcefile(path: str) -> Response:
+        def handle_dwarfsource(path: str) -> Response:
             """Handle requests to /sourcefiles/*"""
             from flask import Response, request
 
+            # Request body should be
+            # {
+            #     "path": "string"
+            # }
+
             start_time = time.time()
             logger.info("\n##################################")
             logger.info(f"# Serving source file /sourcefiles/ {path}")
@@ -208,7 +159,7 @@ def _run_flask_server(
             logger.info(f"Processing sourcefile request for {path}")
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/{path}"
+            target_url = f"http://localhost:{compile_server_port}/dwarfsource"
             logger.info(f"Forwarding to: {target_url}")
 
             # Log request headers
@@ -217,14 +168,18 @@ def _run_flask_server(
             }
             logger.debug(f"Request headers: {request_headers}")
 
+            body: dict[str, str] = {
+                "path": path,
+            }
+
             try:
                 # Forward the request with the same method, headers, and body
                 with httpx.Client() as client:
                     resp = client.request(
-                        method=request.method,
+                        method="POST",
                         url=target_url,
                         headers=request_headers,
-                        content=request.get_data(),
+                        json=body,
                         cookies=request.cookies,
                         follow_redirects=True,
                     )
@@ -336,12 +291,10 @@ 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)
-                elif path.startswith("sourcefiles/"):
-                    logger.info(f"Handling as sourcefiles: {path}")
-                    return handle_sourcefile(path)
+                    logger.info(f"Handling as dwarf source file request: {path}")
+                    return handle_dwarfsource(path)
                 else:
                     logger.info(f"Handling as local file: {path}")
                     return handle_local_file_fetch(path)