JDM170/spotizerr-dev
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update backend for "spotify_metadata" deezspot option

Browse Source
This commit is contained in:
Xoconoch
2025-08-13 21:18:54 -06:00
parent d7c9470f1f
commit db785a1bfa
6 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
routes/system/config.py
View File

@@ -168,6 +168,7 @@ def _migrate_legacy_keys_inplace(cfg: dict) -> bool:
"retry_delay_increase": "retryDelayIncrease",
"artist_separator": "artistSeparator",
"recursive_quality": "recursiveQuality",
"spotify_metadata": "spotifyMetadata",
}
modified = False
for legacy, camel in legacy_map.items():

2
routes/utils/album.py
View File

@@ -29,6 +29,7 @@ def download_album(
bitrate=None,
artist_separator="; ",
recursive_quality=True,
spotify_metadata=True,
_is_celery_task_execution=False, # Added to skip duplicate check from Celery task
):
if not _is_celery_task_execution:
@@ -114,6 +115,7 @@ def download_album(
convert_to=convert_to,
bitrate=bitrate,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
)
print(
f"DEBUG: album.py - Album download via Deezer (account: {fallback}) successful for Spotify URL."

2
routes/utils/celery_config.py
View File

@@ -46,6 +46,7 @@ DEFAULT_MAIN_CONFIG = {
"bitrate": None,
"artistSeparator": "; ",
"recursiveQuality": False,
"spotifyMetadata": True,
"watch": {},
}
@@ -60,6 +61,7 @@ def _migrate_legacy_keys(cfg: dict) -> tuple[dict, bool]:
"retry_delay_increase": "retryDelayIncrease",
"artist_separator": "artistSeparator",
"recursive_quality": "recursiveQuality",
"spotify_metadata": "spotifyMetadata",
}
for legacy, camel in legacy_map.items():
if legacy in out and camel not in out:

12
routes/utils/celery_tasks.py
View File

@@ -1623,6 +1623,9 @@ def download_track(self, **task_data):
artist_separator = task_data.get(
"artist_separator", config_params.get("artistSeparator", "; ")
)
spotify_metadata = task_data.get(
"spotify_metadata", config_params.get("spotifyMetadata", True)
)
# Execute the download - service is now determined from URL
download_track_func(
@@ -1641,6 +1644,7 @@ def download_track(self, **task_data):
bitrate=bitrate,
recursive_quality=recursive_quality,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
_is_celery_task_execution=True, # Skip duplicate check inside Celery task (consistency)
)
@@ -1718,6 +1722,9 @@ def download_album(self, **task_data):
artist_separator = task_data.get(
"artist_separator", config_params.get("artistSeparator", "; ")
)
spotify_metadata = task_data.get(
"spotify_metadata", config_params.get("spotifyMetadata", True)
)
# Execute the download - service is now determined from URL
download_album_func(
@@ -1736,6 +1743,7 @@ def download_album(self, **task_data):
bitrate=bitrate,
recursive_quality=recursive_quality,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
_is_celery_task_execution=True, # Skip duplicate check inside Celery task
)
@@ -1813,6 +1821,9 @@ def download_playlist(self, **task_data):
artist_separator = task_data.get(
"artist_separator", config_params.get("artistSeparator", "; ")
)
spotify_metadata = task_data.get(
"spotify_metadata", config_params.get("spotifyMetadata", True)
)
# Get retry parameters
initial_retry_delay = task_data.get(
@@ -1843,6 +1854,7 @@ def download_playlist(self, **task_data):
bitrate=bitrate,
recursive_quality=recursive_quality,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
_is_celery_task_execution=True, # Skip duplicate check inside Celery task
)

2
routes/utils/playlist.py
View File

@@ -26,6 +26,7 @@ def download_playlist(
bitrate=None,
artist_separator="; ",
recursive_quality=True,
spotify_metadata=True,
_is_celery_task_execution=False, # Added to skip duplicate check from Celery task
):
if not _is_celery_task_execution:
@@ -111,6 +112,7 @@ def download_playlist(
convert_to=convert_to,
bitrate=bitrate,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
)
print(
f"DEBUG: playlist.py - Playlist download via Deezer (account: {fallback}) successful for Spotify URL."

2
routes/utils/track.py
View File

@@ -27,6 +27,7 @@ def download_track(
bitrate=None,
artist_separator="; ",
recursive_quality=False,
spotify_metadata=True,
_is_celery_task_execution=False, # Added for consistency, not currently used for duplicate check
):
try:
@@ -105,6 +106,7 @@ def download_track(
convert_to=convert_to,
bitrate=bitrate,
artist_separator=artist_separator,
spotify_metadata=spotify_metadata,
)
print(
f"DEBUG: track.py - Track download via Deezer (account: {fallback}) successful for Spotify URL."