lr-lumenlabel-cli 3.0.0__tar.gz → 3.0.2__tar.gz

{lr_lumenlabel_cli-3.0.0/src/lr_lumenlabel_cli.egg-info → lr_lumenlabel_cli-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-lumenlabel-cli
-Version: 3.0.0
+Version: 3.0.2
 Summary: CLI for the LumenRadio LumenLabel label printing station: import label packages fetched from Arena with gladiator, list labels and inspect the station, locally, on the LAN or through the Fleet relay.
 Author-email: Jonas Estberger <jonas.estberger@lumenradio.com>
 License-Expression: MIT

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/lumenlabel.spec

@@ -30,6 +30,8 @@ exe = EXE(
     a.datas,
     [],
     name="lumenlabel",
+    # Windows Explorer icon of the .exe; the GUI's icon, so both look alike.
+    icon="../src/img/LR_icon.ico",
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2/src/lr_lumenlabel_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-lumenlabel-cli
-Version: 3.0.0
+Version: 3.0.2
 Summary: CLI for the LumenRadio LumenLabel label printing station: import label packages fetched from Arena with gladiator, list labels and inspect the station, locally, on the LAN or through the Fleet relay.
 Author-email: Jonas Estberger <jonas.estberger@lumenradio.com>
 License-Expression: MIT

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/src/lumenlabel/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.0.0'
-__version_tuple__ = version_tuple = (3, 0, 0)
+__version__ = version = '3.0.2'
+__version_tuple__ = version_tuple = (3, 0, 2)
 
 __commit_id__ = commit_id = None

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/src/lumenlabel/build_words.py

@@ -40,7 +40,7 @@ def _load_wordlist(path: Path) -> tuple[str, ...]:
 
 _WORDLIST: tuple[str, ...] = _load_wordlist(WORDLIST_PATH)
 
-__all__ = ["BUILD_WORDS_COUNT", "content_digest", "build_words"]
+__all__ = ["BUILD_WORDS_COUNT", "content_digest", "label_digest", "build_words"]
 
 
 def _canonical_entry(entry: Any) -> dict[str, Any]:
@@ -70,6 +70,17 @@ def words_from_digest(digest: str) -> str:
     return f"{_WORDLIST[value >> _BITS_PER_WORD]} {_WORDLIST[value & 0x7FF]}"
 
 
+def label_digest(files: Iterable[Any]) -> str:
+    """:func:`content_digest` of *files* with every ``title`` as null.
+
+    LumenLabel leaves the file title out of Build Words (§6.1): it
+    controls nothing on the station, and a 2.x label folder has no record
+    of it, so the station can fingerprint an unmanaged label from its files
+    alone (LUL-106).
+    """
+    return content_digest({**_canonical_entry(f), "title": None} for f in files)
+
+
 def build_words(files: Iterable[Any]) -> str:
-    """Two BIP39 words for *files*. The manifest header is not hashed."""
-    return words_from_digest(content_digest(files))
+    """Two BIP39 words for *files*. The manifest header and titles are not hashed."""
+    return words_from_digest(label_digest(files))

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/src/lumenlabel/commands/label.py

@@ -226,7 +226,7 @@ def list_labels(ctx: typer.Context, output: OutputFormat = output_option()) -> N
         table.add_row(
             label["article"],
             label.get("revision") or "-",
-            label.get("build_words") or "local",
+            label.get("build_words") or "-",
             _media_text(label.get("media_article"), label.get("media_name")),
             label.get("name") or label.get("product") or "",
             _state(label),

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/src/lumenlabel/config_rules.py

@@ -62,7 +62,7 @@ def _box_quantity(config: dict[str, Any]) -> int | None:
 def _fields_problem(
     config: dict[str, Any], labeltype: str, quantity: int | None
 ) -> str | None:
-    for key in ("product", "article", "serial_field"):
+    for key in ("product", "serial_field"):
         if not str(config.get(key, "")):
             return f"{key} is required"
     if labeltype == "pcba" and not config.get("serial_source"):

{lr_lumenlabel_cli-3.0.0 → lr_lumenlabel_cli-3.0.2}/tests/test_build_words.py

@@ -68,17 +68,21 @@ LABEL_109_1182_A2 = [
 def test_lumentest_golden_vector():
     digest = cli_words.content_digest(GOLDEN)
     assert digest == "791a3dbf367bab0d9ccfe024ba3c015b7c575a13490a418f312e9ba77f2c00b1"
-    assert cli_words.build_words(GOLDEN) == "jungle spin"
+    assert cli_words.words_from_digest(digest) == "jungle spin"
 
 
-def test_109_1182_rev_a2_is_usual_hammer():
+def test_109_1182_rev_a2_is_person_chat():
     digest = cli_words.content_digest(LABEL_109_1182_A2)
     assert digest == "f02d12a2623371989ecc41106e6d3fd5eb6b99134f13b2d20671b72ad508186a"
-    assert cli_words.build_words(LABEL_109_1182_A2) == "usual hammer"
+    digest = cli_words.label_digest(LABEL_109_1182_A2)
+    assert digest == "a344da3d2001fa9e7e62db47edfbff9ee26721ebaec1999181f0f431dc67f1ae"
+    assert cli_words.build_words(LABEL_109_1182_A2) == "person chat"
 
 
-def test_order_and_header_do_not_matter():
-    assert cli_words.build_words(reversed(LABEL_109_1182_A2)) == "usual hammer"
+def test_order_header_and_titles_do_not_matter():
+    assert cli_words.build_words(reversed(LABEL_109_1182_A2)) == "person chat"
+    untitled = [{k: v for k, v in f.items() if k != "title"} for f in LABEL_109_1182_A2]
+    assert cli_words.build_words(untitled) == "person chat"
 
 
 @pytest.fixture(scope="module")
@@ -114,6 +118,7 @@ def test_cli_and_station_give_the_same_words(station_words):
     rng = random.Random(93)
     for vector in (GOLDEN, LABEL_109_1182_A2):
         assert cli_words.content_digest(vector) == station_words.content_digest(vector)
+        assert cli_words.label_digest(vector) == station_words.label_digest(vector)
     for _ in range(500):
         files = _random_files(rng)
         assert cli_words.build_words(files) == station_words.build_words(files)