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

Fix playlist folder mode race condition where second thread deletes successfully moved file

Browse source
This commit is contained in:
Broque Thomas 2026-03-10 10:01:39 -07:00
parent 6506c2f163
commit dbe0ce4db4
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web_server.py
View file

@ -13852,6 +13852,23 @@ def _post_process_matched_download(context_key, context, file_path):
print(f"📁 [Playlist Folder Mode] Organizing in playlist folder: {playlist_name}")
file_ext = os.path.splitext(file_path)[1]
# Build final path FIRST so we can check for already-processed files
final_path, _ = _build_final_path_for_track(context, spotify_artist, None, file_ext)
print(f"📁 Playlist mode final path: '{final_path}'")
# RACE CONDITION GUARD: If source file is gone but destination exists,
# another thread (stream processor or verification worker) already moved it.
# Return early to avoid deleting the successfully processed file.
if not os.path.exists(file_path):
if os.path.exists(final_path):
print(f"✅ [Playlist Folder Mode] Source gone but destination exists — already processed by another thread: {os.path.basename(final_path)}")
context['_final_processed_path'] = final_path
return
else:
pp_logger.info(f"[inner] EXCEPTION in post-processing for {context_key}: Source file not found and destination does not exist: {file_path}")
raise FileNotFoundError(f"Source file not found and destination does not exist: {file_path}")
context['_audio_quality'] = _get_audio_quality_string(file_path)
if context['_audio_quality']:
print(f"🎧 Audio quality detected: {context['_audio_quality']}")
@ -13860,9 +13877,6 @@ def _post_process_matched_download(context_key, context, file_path):
if _check_flac_bit_depth(file_path, context, context_key):
return
final_path, _ = _build_final_path_for_track(context, spotify_artist, None, file_ext)
print(f"📁 Playlist mode final path: '{final_path}'")
# Enhance metadata before moving
try:
print(f"🔍 [Metadata Input] Playlist mode - artist: '{spotify_artist.get('name', 'MISSING')}' (id: {spotify_artist.get('id', 'MISSING')})")
@ -13873,10 +13887,6 @@ def _post_process_matched_download(context_key, context, file_path):
# Move file to playlist folder
print(f"🚚 Moving '{os.path.basename(file_path)}' to '{final_path}'")
if os.path.exists(final_path):
print(f"⚠️ File already exists, overwriting: {os.path.basename(final_path)}")
os.remove(final_path)
_safe_move_file(file_path, final_path)
# Store final path for verification wrapper (before lossy copy may override)