fastled 1.4.40__py3-none-any.whl → 1.4.42__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.4.40"
+__version__ = "1.4.42"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

fastled/docker_manager.py

@@ -26,7 +26,6 @@ from docker.models.images import Image
 from filelock import FileLock
 
 from fastled.print_filter import PrintFilter, PrintFilterDefault
-from fastled.spinner import Spinner
 
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
 CONFIG_DIR.mkdir(parents=True, exist_ok=True)
@@ -507,14 +506,9 @@ class DockerManager:
                         return False
 
                     # Quick check for latest version
-                    with Spinner(f"Pulling newer version of {image_name}:{tag}..."):
-                        cmd_list = ["docker", "pull", f"{image_name}:{tag}"]
-                        subprocess.run(
-                            cmd_list,
-                            check=True,
-                            stdout=subprocess.DEVNULL,
-                            stderr=subprocess.DEVNULL,
-                        )
+                    print(f"Pulling newer version of {image_name}:{tag}...")
+                    cmd_list = ["docker", "pull", f"{image_name}:{tag}"]
+                    subprocess.run(cmd_list, check=True)
                     print(f"Updated to newer version of {image_name}:{tag}")
                     local_image_hash = self.client.images.get(f"{image_name}:{tag}").id
                     assert local_image_hash is not None
@@ -524,15 +518,10 @@ class DockerManager:
 
             except ImageNotFound:
                 print(f"Image {image_name}:{tag} not found.")
-                with Spinner("Loading "):
-                    # We use docker cli here because it shows the download.
-                    cmd_list = ["docker", "pull", f"{image_name}:{tag}"]
-                    subprocess.run(
-                        cmd_list,
-                        check=True,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    )
+                print("Loading...")
+                # We use docker cli here because it shows the download.
+                cmd_list = ["docker", "pull", f"{image_name}:{tag}"]
+                subprocess.run(cmd_list, check=True)
                 try:
                     local_image = self.client.images.get(f"{image_name}:{tag}")
                     local_image_hash = local_image.id

fastled/string_diff.py

@@ -80,14 +80,100 @@ def string_diff(
     exact_matches = [s for s in string_list if s == input_string]
     substring_matches = [s for s in string_list if input_string in s]
 
-    # If there's an exact match AND other substring matches, return all substring matches
-    # This provides better user experience for partial matching
-    if exact_matches and len(substring_matches) > 1:
-        out: list[tuple[float, str]] = []
-        for i, s in enumerate(substring_matches):
-            s_mapped = map_string.get(s, s)
-            out.append((i, s_mapped))
-        return out
+    # If there's exactly one exact match, and there are substring matches,
+    # check if we should prioritize the exact match or return all variants
+    if len(exact_matches) == 1 and len(substring_matches) > 1:
+        exact_match = exact_matches[0]
+        other_substring_matches = [s for s in substring_matches if s != exact_match]
+
+        # Prioritize exact match only if it appears at the start of other matches
+        # AND those matches have a camelCase boundary (indicating compound words)
+        # We need to use the original (non-lowercased) strings for camelCase detection
+        should_prioritize_exact = True
+        original_exact_match = map_string[exact_match]  # Get the original casing
+
+        for other_match in other_substring_matches:
+            original_other_match = map_string[other_match]  # Get the original casing
+
+            if not original_other_match.lower().startswith(
+                original_exact_match.lower()
+            ):
+                # If the exact match isn't at the start, don't prioritize
+                should_prioritize_exact = False
+                break
+
+            # Check for camelCase boundary after the exact match in the ORIGINAL string
+            remainder = original_other_match[len(original_exact_match) :]
+            if remainder and remainder[0].isupper():
+                # Only prioritize exact match if the exact match is very short (4 chars or less)
+                # AND the remainder suggests a different concept
+                if len(original_exact_match) <= 4 and len(remainder) >= 6:
+                    # This looks like a camelCase compound word (e.g., "wasm" -> "WasmScreenCoords")
+                    continue
+                else:
+                    # This looks like a variant (e.g., "Noise" -> "NoisePlayground", "Fire2012" -> "Fire2012WithPalette")
+                    should_prioritize_exact = False
+                    break
+            else:
+                # This looks like a variant/extension (e.g., "Blur" -> "Blur2d")
+                should_prioritize_exact = False
+                break
+
+        if should_prioritize_exact:
+            out: list[tuple[float, str]] = []
+            for i, s in enumerate(exact_matches):
+                s_mapped = map_string.get(s, s)
+                out.append((i, s_mapped))
+            return out
+        else:
+            # Apply character count filtering only for very specific compound terms
+            # Main criteria: contains numbers AND ends with numbers/letters (like Wave2d, Fire2012)
+            original_exact_match = map_string[exact_match]
+            should_apply_char_filter = (
+                len(original_exact_match) >= 5  # Longer terms
+                and any(c.isdigit() for c in original_exact_match)  # Contains numbers
+                and (
+                    original_exact_match[-1].isdigit()
+                    or original_exact_match[-1].islower()
+                )  # Ends specifically (compound pattern)
+            )
+
+            if should_apply_char_filter:
+                # Filter substring matches based on extra character count
+                # Use a more lenient threshold for shorter base terms
+                if len(original_exact_match) <= 6:
+                    # For short terms, allow more extra chars (e.g., "Wave2d" + "FxWave2d")
+                    MAX_EXTRA_CHARS = min(10, len(original_exact_match) * 2)
+                else:
+                    # For longer terms, allow significant extensions (e.g., "Fire2012" + "Fire2012WithPalette")
+                    MAX_EXTRA_CHARS = 12
+
+                filtered_matches = []
+
+                for s in substring_matches:
+                    original_s = map_string[s]
+                    if s == exact_match:
+                        # Always include the exact match
+                        filtered_matches.append(s)
+                    else:
+                        # Calculate extra characters
+                        extra_chars = len(original_s) - len(original_exact_match)
+                        if extra_chars <= MAX_EXTRA_CHARS:
+                            filtered_matches.append(s)
+
+                # Return filtered matches
+                out: list[tuple[float, str]] = []
+                for i, s in enumerate(filtered_matches):
+                    s_mapped = map_string.get(s, s) or s
+                    out.append((i, s_mapped))
+                return out
+            else:
+                # Return all substring matches (original behavior for base terms)
+                out: list[tuple[float, str]] = []
+                for i, s in enumerate(substring_matches):
+                    s_mapped = map_string.get(s, s) or s
+                    out.append((i, s_mapped))
+                return out
 
     # If there's only an exact match and no other substring matches, return just the exact match
     if exact_matches and len(substring_matches) == 1:

{fastled-1.4.40.dist-info → fastled-1.4.42.dist-info}/METADATA

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

{fastled-1.4.40.dist-info → fastled-1.4.42.dist-info}/RECORD

@@ -1,6 +1,6 @@
 fastled/__init__.py,sha256=LlLu9fO3O4FeB5-wt2wHGIFJW76H9FlhdABytEqg8A4,7717
 fastled/__main__.py,sha256=OcKv2ER1_iQAsZzLIUb3C8hRC9L2clNOhCrjpshrlf4,336
-fastled/__version__.py,sha256=0pXyPjHx0w-0o_I1bOwnCMF-7z8_EX6vs8nA9YwHlDg,373
+fastled/__version__.py,sha256=h6_pqiRQu9IEYEfAK9ev6nZGN0bUwNh6Sdxqs4k-McQ,373
 fastled/app.py,sha256=fWOH2SA4rxW8BPNgBrKs4xsWvUEMX6RzMWPKyyjBoVM,7539
 fastled/args.py,sha256=Xa7AYnoMcsuSVQUyM6M2P_8liQtQFJzuuBdPbfw9U-g,4786
 fastled/cli.py,sha256=drgR2AOxVrj3QEz58iiKscYAumbbin2vIV-k91VCOAA,561
@@ -9,7 +9,7 @@ fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6
 fastled/client_server.py,sha256=RnxVnQSFZ4B6xqDHkde6uu9bB6xpPsH5k39m77yrCZc,24730
 fastled/compile_server.py,sha256=MgKX4vnC-Zn_dj6svdoDmSP_3lLW_1QGpP3vooygjaQ,3421
 fastled/compile_server_impl.py,sha256=__Uiyys_8-LD8Lnev0BMUr6UpHd-2LaF--rTybxZPVE,13049
-fastled/docker_manager.py,sha256=_C-H3_gvT43TTT9yraCXBJmwweBmSe3o_YZOTI_7sfc,41205
+fastled/docker_manager.py,sha256=mjlqVA4_kPPoCqP8DSeEN3hgRNdpId8gyV_sk2icVHE,40769
 fastled/emoji_util.py,sha256=z3lROwgfCxpqIIJFzQxehH8gcTwGdf4VLPsUgcbcFBM,849
 fastled/filewatcher.py,sha256=1EFeOLPEA_aN_V_tzgixS3mDhfleh0arTGUy0vWq6Is,10101
 fastled/find_good_connection.py,sha256=xnrJjrbwNZUkvSQRn_ZTMoVh5GBWTbO-lEsr_L95xq8,3372
@@ -29,7 +29,7 @@ fastled/server_start.py,sha256=W9yKStkRlRNuXeV6j_6O7HjjFPyVLBHMcF9Uy2QjDWQ,479
 fastled/settings.py,sha256=8RLN3S0ZK4DMphr0gKPfwPKfwIzOtHiQsqMTpGnX7Xg,1842
 fastled/sketch.py,sha256=Ftbh55Nt-p4hmPuPpj8Q9HrMzvnUazhoG_q9FHcxkns,3473
 fastled/spinner.py,sha256=VHxmvB92P0Z_zYxRajb5HiNmkHHvZ5dG7hKtZltzpcs,867
-fastled/string_diff.py,sha256=oTncu0qYdLlLUtYLLDB4bzdQ2OfzegAR6XNAzwE9fIs,6002
+fastled/string_diff.py,sha256=C1b0DQp4GLV1Axj8t1InRWhjP0HHbvWHwf1yzrBKthA,10345
 fastled/types.py,sha256=tBikcoKjbBcCTi36MMCz_TjMEBoa-FppRL-yKAVwXFc,1909
 fastled/util.py,sha256=lJ6Pcqgn4DiNhvAqp6i8O0ghpvvE-JfA1XwvJ5qS9B0,2701
 fastled/version.py,sha256=TpBMiEVdO3_sUZEu6wmwN8Q4AgX2BiCxStCsnPKh6E0,1209
@@ -52,9 +52,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=M0o-5NIhCuwcUHo7CPQw5llLd3OU3FfPgussVScd8Fs,1741
-fastled-1.4.40.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.4.40.dist-info/METADATA,sha256=IqWMpSs1ezW2_dvzV2HfqkDIe1vqtvTuDmSjcvrVCMk,31944
-fastled-1.4.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fastled-1.4.40.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.4.40.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.4.40.dist-info/RECORD,,
+fastled-1.4.42.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.4.42.dist-info/METADATA,sha256=RQkpIIf9yff394zIUUbByeGP7u5VFa0Om-i6L78WYQI,31944
+fastled-1.4.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fastled-1.4.42.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.4.42.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.4.42.dist-info/RECORD,,