refactor(ci): clarify Cargo binary loader naming

Author: zouyonghe

scripts/ci/package_windows_portable.py

@@ -91,7 +91,7 @@ def load_portable_runtime_marker(project_root: pathlib.Path) -> str:
 def load_project_config_from(start_path: pathlib.Path) -> ProjectConfig:
     project_root = resolve_project_root_from(start_path)
     product_name = resolve_product_name(project_root)
-    binary_name = load_cargo_package_name(project_root)
+    binary_name = load_binary_name_from_cargo(project_root)
     portable_marker_name = load_portable_runtime_marker(project_root)
     return ProjectConfig(
         root=project_root,
@@ -147,7 +147,7 @@ def load_tauri_config(project_root: pathlib.Path) -> dict:
     return json.loads(config_path.read_text(encoding="utf-8"))
 
 
-def load_cargo_package_name(project_root: pathlib.Path) -> str:
+def load_binary_name_from_cargo(project_root: pathlib.Path) -> str:
     cargo_toml_path = project_root / CARGO_TOML_RELATIVE_PATH
     if not cargo_toml_path.is_file():
         raise FileNotFoundError(f"Cargo.toml not found: {cargo_toml_path}")
@@ -165,11 +165,11 @@ def load_cargo_package_name(project_root: pathlib.Path) -> str:
 
     package_table = cargo_data.get("package")
     if not isinstance(package_table, dict):
-        raise ValueError(f"Missing [package] in {CARGO_TOML_RELATIVE_PATH}")
+        raise ValueError(f"Missing [package] in {cargo_toml_path}")
 
     binary_name = str(package_table.get("name", "")).strip()
     if not binary_name:
-        raise ValueError(f"Missing [package].name in {CARGO_TOML_RELATIVE_PATH}")
+        raise ValueError(f"Missing [package].name in {cargo_toml_path}")
 
     return binary_name
 

scripts/ci/test_package_windows_portable.py

@@ -1,3 +1,4 @@
+import re
 import tempfile
 import unittest
 from pathlib import Path
@@ -137,16 +138,19 @@ def test_load_cargo_package_name_supports_inline_comments(self):
             )
 
             self.assertEqual(
-                MODULE.load_cargo_package_name(project_root),
+                MODULE.load_binary_name_from_cargo(project_root),
                 "astrbot-desktop-tauri",
             )
 
     def test_load_cargo_package_name_missing_cargo_toml_raises_file_not_found(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             project_root = Path(tmpdir)
+            cargo_toml_path = project_root / "src-tauri" / "Cargo.toml"
 
-            with self.assertRaises(FileNotFoundError):
-                MODULE.load_cargo_package_name(project_root)
+            with self.assertRaisesRegex(
+                FileNotFoundError, re.escape(str(cargo_toml_path))
+            ):
+                MODULE.load_binary_name_from_cargo(project_root)
 
     def test_load_cargo_package_name_missing_package_table_raises_value_error(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -155,8 +159,8 @@ def test_load_cargo_package_name_missing_package_table_raises_value_error(self):
             cargo_toml_path.parent.mkdir(parents=True)
             cargo_toml_path.write_text('[workspace]\nmembers = ["crates/*"]\n')
 
-            with self.assertRaises(ValueError):
-                MODULE.load_cargo_package_name(project_root)
+            with self.assertRaisesRegex(ValueError, re.escape(str(cargo_toml_path))):
+                MODULE.load_binary_name_from_cargo(project_root)
 
     def test_load_cargo_package_name_missing_package_name_raises_value_error(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -165,8 +169,8 @@ def test_load_cargo_package_name_missing_package_name_raises_value_error(self):
             cargo_toml_path.parent.mkdir(parents=True)
             cargo_toml_path.write_text('[package]\nversion = "0.1.0"\n')
 
-            with self.assertRaises(ValueError):
-                MODULE.load_cargo_package_name(project_root)
+            with self.assertRaisesRegex(ValueError, re.escape(str(cargo_toml_path))):
+                MODULE.load_binary_name_from_cargo(project_root)
 
     def test_load_cargo_package_name_empty_package_name_raises_value_error(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -175,8 +179,8 @@ def test_load_cargo_package_name_empty_package_name_raises_value_error(self):
             cargo_toml_path.parent.mkdir(parents=True)
             cargo_toml_path.write_text('[package]\nname = ""\n')
 
-            with self.assertRaises(ValueError):
-                MODULE.load_cargo_package_name(project_root)
+            with self.assertRaisesRegex(ValueError, re.escape(str(cargo_toml_path))):
+                MODULE.load_binary_name_from_cargo(project_root)
 
     def test_load_cargo_package_name_falls_back_to_package_when_bin_missing_name(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -191,7 +195,7 @@ def test_load_cargo_package_name_falls_back_to_package_when_bin_missing_name(sel
             )
 
             self.assertEqual(
-                MODULE.load_cargo_package_name(project_root),
+                MODULE.load_binary_name_from_cargo(project_root),
                 "astrbot-desktop-tauri",
             )
 
@@ -207,7 +211,9 @@ def test_load_cargo_package_name_prefers_explicit_bin_name(self):
                 'name = "AstrBot"\n'
             )
 
-            self.assertEqual(MODULE.load_cargo_package_name(project_root), "AstrBot")
+            self.assertEqual(
+                MODULE.load_binary_name_from_cargo(project_root), "AstrBot"
+            )
 
     def test_resolve_main_executable_path_uses_binary_name_not_product_name(self):
         with tempfile.TemporaryDirectory() as tmpdir: