Skip to content

fix(presets): tolerate non-UTF-8 legacy commands #3896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcelsafin wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −1
Open

fix(presets): tolerate non-UTF-8 legacy commands #3896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/specify_cli/presets/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5225,7 +5225,7 @@ def _find_in_subdirs(base_dir: Path) -> Optional[Path]:
fm_strategy = fm_data.get("strategy")
if isinstance(fm_strategy, str) and fm_strategy.lower() in VALID_PRESET_STRATEGIES:
strategy = fm_strategy.lower()
except (yaml.YAMLError, OSError):
except (UnicodeDecodeError, yaml.YAMLError, OSError):
# Best-effort legacy frontmatter parsing: keep default
# strategy ("replace") when content is unreadable/invalid.
pass
Expand Down
18 changes: 18 additions & 0 deletions tests/test_presets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11513,6 +11513,24 @@ def test_resolve_content_rewrites_extension_base_subdir_paths(
class TestCollectAllLayers:
"""Test PresetResolver.collect_all_layers() method."""

def test_non_utf8_legacy_command_keeps_replace_strategy(self, project_dir):
presets_dir = project_dir / ".specify" / "presets"
command_path = (
presets_dir / "legacy-pack" / "commands" / "speckit.legacy.md"
)
command_path.parent.mkdir(parents=True)
command_path.write_bytes(b"\xff\xfe")
PresetRegistry(presets_dir).add(
"legacy-pack", {"version": "1.0.0", "priority": 10}
)

layers = PresetResolver(project_dir).collect_all_layers(
"speckit.legacy", "command"
)

assert layers[0]["path"] == command_path
assert layers[0]["strategy"] == "replace"

def test_single_core_layer(self, project_dir):
"""Test collecting layers with only core template."""
resolver = PresetResolver(project_dir)
Expand Down