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

fix str object has no attribute get error.

Browse source
This commit is contained in:
Broque Thomas 2026-02-16 10:13:56 -08:00
parent ff0cfd53c5
commit f9b0316d0f
2 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/soulseek_client.py
View file

@ -270,7 +270,10 @@ class SoulseekClient:
logger.info(f"Docker detected, using {download_path_str} for downloads") logger.info(f"Docker detected, using {download_path_str} for downloads")
self.download_path = Path(download_path_str) self.download_path = Path(download_path_str)
self.download_path.mkdir(parents=True, exist_ok=True) try:
self.download_path.mkdir(parents=True, exist_ok=True)
except OSError as e:
logger.warning(f"Could not verify download path {download_path_str}: {e}")
logger.info(f"Soulseek client configured with slskd at {self.base_url}") logger.info(f"Soulseek client configured with slskd at {self.base_url}")

38
web_server.py
View file

@ -648,8 +648,9 @@ class WebUIDownloadMonitor:
def _should_retry_task(self, task_id, task, live_transfers_lookup, current_time): def _should_retry_task(self, task_id, task, live_transfers_lookup, current_time):
"""Determine if a task should be retried due to timeout (matches GUI logic)""" """Determine if a task should be retried due to timeout (matches GUI logic)"""
task_filename = task.get('filename') or task['track_info'].get('filename') ti = task.get('track_info') if isinstance(task.get('track_info'), dict) else {}
task_username = task.get('username') or task['track_info'].get('username') task_filename = task.get('filename') or ti.get('filename')
task_username = task.get('username') or ti.get('username')
if not task_filename or not task_username: if not task_filename or not task_username:
return False return False
@ -678,8 +679,9 @@ class WebUIDownloadMonitor:
task['last_error_retry_time'] = current_time task['last_error_retry_time'] = current_time
# CRITICAL: Cancel the errored download in slskd before retry # CRITICAL: Cancel the errored download in slskd before retry
username = task.get('username') or task['track_info'].get('username') _ti = task.get('track_info') if isinstance(task.get('track_info'), dict) else {}
filename = task.get('filename') or task['track_info'].get('filename') username = task.get('username') or _ti.get('username')
filename = task.get('filename') or _ti.get('filename')
download_id = task.get('download_id') download_id = task.get('download_id')
if username and download_id: if username and download_id:
@ -774,8 +776,9 @@ class WebUIDownloadMonitor:
task['last_retry_time'] = current_time task['last_retry_time'] = current_time
# CRITICAL: Cancel the stuck download in slskd before retry # CRITICAL: Cancel the stuck download in slskd before retry
username = task.get('username') or task['track_info'].get('username') _ti = task.get('track_info') if isinstance(task.get('track_info'), dict) else {}
filename = task.get('filename') or task['track_info'].get('filename') username = task.get('username') or _ti.get('username')
filename = task.get('filename') or _ti.get('filename')
download_id = task.get('download_id') download_id = task.get('download_id')
if username and download_id: if username and download_id:
@ -871,8 +874,9 @@ class WebUIDownloadMonitor:
task['last_retry_time'] = current_time task['last_retry_time'] = current_time
# CRITICAL: Cancel the stuck download in slskd before retry # CRITICAL: Cancel the stuck download in slskd before retry
username = task.get('username') or task['track_info'].get('username') _ti = task.get('track_info') if isinstance(task.get('track_info'), dict) else {}
filename = task.get('filename') or task['track_info'].get('filename') username = task.get('username') or _ti.get('username')
filename = task.get('filename') or _ti.get('filename')
download_id = task.get('download_id') download_id = task.get('download_id')
if username and download_id: if username and download_id:
@ -12029,10 +12033,8 @@ def get_valid_candidates(results, spotify_track, query):
quality_filtered_candidates = initial_candidates quality_filtered_candidates = initial_candidates
else: else:
# Filter by user's quality profile before artist verification (Soulseek only) # Filter by user's quality profile before artist verification (Soulseek only)
# Use shared soulseek_client method for consistency # Use existing soulseek_client to avoid re-initializing (which accesses download_path filesystem)
from core.soulseek_client import SoulseekClient quality_filtered_candidates = soulseek_client.soulseek.filter_results_by_quality_preference(initial_candidates)
temp_client = SoulseekClient()
quality_filtered_candidates = temp_client.filter_results_by_quality_preference(initial_candidates)
# IMPORTANT: Respect empty results from quality filter # IMPORTANT: Respect empty results from quality filter
# If user has strict quality requirements (e.g., FLAC-only with fallback disabled), # If user has strict quality requirements (e.g., FLAC-only with fallback disabled),
@ -13618,10 +13620,11 @@ def _attempt_download_with_candidates(task_id, candidates, track, batch_id=None)
_update_task_status(task_id, 'downloading') _update_task_status(task_id, 'downloading')
# Prepare download - check if we have explicit album context from artist page # Prepare download - check if we have explicit album context from artist page
track_info = None track_info = {}
with tasks_lock: with tasks_lock:
if task_id in download_tasks: if task_id in download_tasks:
track_info = download_tasks[task_id].get('track_info', {}) raw_track_info = download_tasks[task_id].get('track_info')
track_info = raw_track_info if isinstance(raw_track_info, dict) else {}
# Use explicit album/artist context if available (from artist album downloads) # Use explicit album/artist context if available (from artist album downloads)
has_explicit_context = track_info and track_info.get('_is_explicit_album_download', False) has_explicit_context = track_info and track_info.get('_is_explicit_album_download', False)
@ -13798,7 +13801,9 @@ def _attempt_download_with_candidates(task_id, candidates, track, batch_id=None)
continue continue
except Exception as e: except Exception as e:
import traceback
print(f"❌ [Modal Worker] Error attempting download for '{candidate.filename}': {e}") print(f"❌ [Modal Worker] Error attempting download for '{candidate.filename}': {e}")
traceback.print_exc()
# Reset status back to searching for next attempt # Reset status back to searching for next attempt
with tasks_lock: with tasks_lock:
if task_id in download_tasks: if task_id in download_tasks:
@ -14179,8 +14184,9 @@ def _build_batch_status_data(batch_id, batch, live_transfers_lookup):
'ui_state': task.get('ui_state', 'normal'), # normal|cancelling|cancelled 'ui_state': task.get('ui_state', 'normal'), # normal|cancelling|cancelled
'playlist_id': task.get('playlist_id'), # For V2 system identification 'playlist_id': task.get('playlist_id'), # For V2 system identification
} }
task_filename = task.get('filename') or task['track_info'].get('filename') _ti = task.get('track_info') if isinstance(task.get('track_info'), dict) else {}
task_username = task.get('username') or task['track_info'].get('username') task_filename = task.get('filename') or _ti.get('filename')
task_username = task.get('username') or _ti.get('username')
if task_filename and task_username: if task_filename and task_username:
lookup_key = f"{task_username}::{extract_filename(task_filename)}" lookup_key = f"{task_username}::{extract_filename(task_filename)}"