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

Replace all legacy metadata_service imports with canonical functions

Browse source 
All callers of _create_fallback_client() and _get_configured_fallback_source()
now use get_primary_client() and get_primary_source() directly. No more
legacy alias usage anywhere in the codebase.
This commit is contained in:
Broque Thomas 2026-04-10 12:52:36 -07:00
parent 10a2766557
commit a6117d5174
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/metadata_service.py
View file

@ -140,8 +140,8 @@ class MetadataService:
"""
self.preferred_provider = preferred_provider
self.spotify = SpotifyClient()
self._fallback_source = _get_configured_fallback_source()
self.itunes = _create_fallback_client() # May be iTunesClient or DeezerClient
self._fallback_source = get_primary_source()
self.itunes = get_primary_client() # May be iTunesClient or DeezerClient
self._log_initialization()
@ -312,10 +312,10 @@ class MetadataService:
logger.info("Reloading metadata service configuration")
self.spotify.reload_config()
# Re-create fallback client in case the setting changed
new_source = _get_configured_fallback_source()
new_source = get_primary_source()
if new_source != self._fallback_source:
self._fallback_source = new_source
self.itunes = _create_fallback_client()
self.itunes = get_primary_client()
elif hasattr(self.itunes, 'reload_config'):
self.itunes.reload_config()
self._log_initialization()

8
core/personalized_playlists.py
View file

@ -954,8 +954,8 @@ class PersonalizedPlaylistsService:
logger.warning(f"Error getting albums for {artist.get('name', artist['id'])}: {e}")
continue
else:
from core.metadata_service import _create_fallback_client
itunes = _create_fallback_client()
from core.metadata_service import get_primary_client
itunes = get_primary_client()
for artist in artists_for_albums:
try:
albums = itunes.get_artist_albums(artist['id'], limit=10)
@ -1010,8 +1010,8 @@ class PersonalizedPlaylistsService:
logger.warning(f"Error getting tracks from album: {e}")
continue
else:
from core.metadata_service import _create_fallback_client
itunes = _create_fallback_client()
from core.metadata_service import get_primary_client
itunes = get_primary_client()
for album in selected_albums:
try:
album_data = itunes.get_album(album.id, include_tracks=True)

4
core/repair_jobs/library_reorganize.py
View file

@ -785,8 +785,8 @@ class LibraryReorganizeJob(RepairJob):
if not search_client:
# Try fallback (iTunes/Deezer)
try:
from core.metadata_service import _create_fallback_client
search_client = _create_fallback_client()
from core.metadata_service import get_primary_client
search_client = get_primary_client()
source_name = 'fallback'
except Exception:
pass

4
core/repair_worker.py
View file

@ -161,8 +161,8 @@ class RepairWorker:
def itunes_client(self):
if self._itunes_client is None:
try:
from core.metadata_service import _create_fallback_client
self._itunes_client = _create_fallback_client()
from core.metadata_service import get_primary_client
self._itunes_client = get_primary_client()
except Exception as e:
logger.error("Failed to initialize fallback metadata client: %s", e)
return self._itunes_client

4
core/seasonal_discovery.py
View file

@ -551,8 +551,8 @@ class SeasonalDiscoveryService:
continue
else:
# Fallback metadata source (iTunes or Deezer)
from core.metadata_service import _create_fallback_client
fallback_client = _create_fallback_client()
from core.metadata_service import get_primary_client
fallback_client = get_primary_client()
for keyword in search_keywords:
try: