danvics/soulsync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(path-resolve): also search absolute forms of relative base dirs

Browse source 
Diagnostic on the live system showed transfer='./Transfer' (relative config)
while the files live at the absolute mount '/Transfer' — so nothing resolved.
_resolve_library_file_path now also searches the CWD-absolute (os.path.abspath)
and root-absolute ('/Transfer') forms of relative transfer/download paths, with
dedup. The unresolved-path diagnostic now logs the real dirs searched + cwd.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
dev 2026-06-15 00:06:58 +02:00
parent cf8f562e61
commit e82f3ab04f
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
web_server.py
View file

@ -11796,9 +11796,19 @@ def _resolve_library_file_path(file_path):
# curly U+2019 apostrophe in DB metadata vs ASCII U+0027 on disk) — exact # curly U+2019 apostrophe in DB metadata vs ASCII U+0027 on disk) — exact
# matches always win, so paths that already resolved are unaffected. # matches always win, so paths that already resolved are unaffected.
from core.library.path_resolve import find_on_disk from core.library.path_resolve import find_on_disk
for base_dir in [transfer_dir, download_dir] + list(library_dirs): # Config often stores RELATIVE paths ("./Transfer") that don't match the
if not base_dir or not os.path.isdir(base_dir): # actual absolute Docker mount ("/Transfer"). Also search the CWD-absolute
# and root-absolute forms so a relative config still resolves.
base_dirs = [transfer_dir, download_dir] + list(library_dirs)
for b in [transfer_dir, download_dir]:
if b and not os.path.isabs(b):
base_dirs.append(os.path.abspath(b))
base_dirs.append('/' + b.replace('./', '', 1).lstrip('/'))
seen_bases = set()
for base_dir in base_dirs:
if not base_dir or base_dir in seen_bases or not os.path.isdir(base_dir):
continue continue
seen_bases.add(base_dir)
# Start at index 0 so a clean relative path ("Artist/Album/Track.flac") # Start at index 0 so a clean relative path ("Artist/Album/Track.flac")
# is tried in FULL first — the library scanner stores exactly that, and # is tried in FULL first — the library scanner stores exactly that, and
# skipping index 0 dropped the artist folder so it never matched. A # skipping index 0 dropped the artist folder so it never matched. A
@ -11816,9 +11826,10 @@ def _resolve_library_file_path(file_path):
if not _resolve_library_diag_logged: if not _resolve_library_diag_logged:
_resolve_library_diag_logged = True _resolve_library_diag_logged = True
logger.warning( logger.warning(
"[PathResolve] Could not resolve %r under any base dir — searched transfer=%r " "[PathResolve] Could not resolve %r under any base dir — searched %r (cwd=%r). "
"download=%r library=%r. If files live elsewhere, add it under Settings > Library music paths.", "If files live elsewhere, set soulseek.transfer_path to the absolute mount or add "
file_path, transfer_dir, download_dir, sorted(library_dirs), "the dir under Settings > Library music paths.",
file_path, [b for b in base_dirs if b and os.path.isdir(b)], os.getcwd(),
) )
return None return None