Skip to content

refactor(sloppak): route the rigs loader through the shared path helper #1041

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
gionnibgud wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −10
Open

refactor(sloppak): route the rigs loader through the shared path helper #1041

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
12 changes: 2 additions & 10 deletions lib/sloppak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,16 +816,8 @@ def _load_rigs_file(source_dir: Path, rel: str) -> dict | None:
realization selection and the `intent.gm` fallback belong to whatever
voices the part.
"""
try:
r_path = (source_dir / rel).resolve()
r_path.relative_to(source_dir.resolve())
except ValueError:
log.warning("sloppak: rigs path %r escapes source_dir — skipped", rel)
return None
except OSError as e:
log.warning("sloppak: rigs path resolution failed (%s) — skipped", e)
return None
if not r_path.exists():
r_path = _resolve_pack_path(source_dir, rel, "rigs")
if r_path is None or not r_path.exists():
return None
try:
raw = load_json(r_path)
Expand Down
Loading