Replace all legacy metadata_service imports with canonical functions
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:
parent
10a2766557
commit
a6117d5174
5 changed files with 14 additions and 14 deletions
|
|
@ -140,8 +140,8 @@ class MetadataService:
|
||||||
"""
|
"""
|
||||||
self.preferred_provider = preferred_provider
|
self.preferred_provider = preferred_provider
|
||||||
self.spotify = SpotifyClient()
|
self.spotify = SpotifyClient()
|
||||||
self._fallback_source = _get_configured_fallback_source()
|
self._fallback_source = get_primary_source()
|
||||||
self.itunes = _create_fallback_client() # May be iTunesClient or DeezerClient
|
self.itunes = get_primary_client() # May be iTunesClient or DeezerClient
|
||||||
|
|
||||||
self._log_initialization()
|
self._log_initialization()
|
||||||
|
|
||||||
|
|
@ -312,10 +312,10 @@ class MetadataService:
|
||||||
logger.info("Reloading metadata service configuration")
|
logger.info("Reloading metadata service configuration")
|
||||||
self.spotify.reload_config()
|
self.spotify.reload_config()
|
||||||
# Re-create fallback client in case the setting changed
|
# 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:
|
if new_source != self._fallback_source:
|
||||||
self._fallback_source = new_source
|
self._fallback_source = new_source
|
||||||
self.itunes = _create_fallback_client()
|
self.itunes = get_primary_client()
|
||||||
elif hasattr(self.itunes, 'reload_config'):
|
elif hasattr(self.itunes, 'reload_config'):
|
||||||
self.itunes.reload_config()
|
self.itunes.reload_config()
|
||||||
self._log_initialization()
|
self._log_initialization()
|
||||||
|
|
|
||||||
|
|
@ -954,8 +954,8 @@ class PersonalizedPlaylistsService:
|
||||||
logger.warning(f"Error getting albums for {artist.get('name', artist['id'])}: {e}")
|
logger.warning(f"Error getting albums for {artist.get('name', artist['id'])}: {e}")
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
from core.metadata_service import _create_fallback_client
|
from core.metadata_service import get_primary_client
|
||||||
itunes = _create_fallback_client()
|
itunes = get_primary_client()
|
||||||
for artist in artists_for_albums:
|
for artist in artists_for_albums:
|
||||||
try:
|
try:
|
||||||
albums = itunes.get_artist_albums(artist['id'], limit=10)
|
albums = itunes.get_artist_albums(artist['id'], limit=10)
|
||||||
|
|
@ -1010,8 +1010,8 @@ class PersonalizedPlaylistsService:
|
||||||
logger.warning(f"Error getting tracks from album: {e}")
|
logger.warning(f"Error getting tracks from album: {e}")
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
from core.metadata_service import _create_fallback_client
|
from core.metadata_service import get_primary_client
|
||||||
itunes = _create_fallback_client()
|
itunes = get_primary_client()
|
||||||
for album in selected_albums:
|
for album in selected_albums:
|
||||||
try:
|
try:
|
||||||
album_data = itunes.get_album(album.id, include_tracks=True)
|
album_data = itunes.get_album(album.id, include_tracks=True)
|
||||||
|
|
|
||||||
|
|
@ -785,8 +785,8 @@ class LibraryReorganizeJob(RepairJob):
|
||||||
if not search_client:
|
if not search_client:
|
||||||
# Try fallback (iTunes/Deezer)
|
# Try fallback (iTunes/Deezer)
|
||||||
try:
|
try:
|
||||||
from core.metadata_service import _create_fallback_client
|
from core.metadata_service import get_primary_client
|
||||||
search_client = _create_fallback_client()
|
search_client = get_primary_client()
|
||||||
source_name = 'fallback'
|
source_name = 'fallback'
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
|
|
@ -161,8 +161,8 @@ class RepairWorker:
|
||||||
def itunes_client(self):
|
def itunes_client(self):
|
||||||
if self._itunes_client is None:
|
if self._itunes_client is None:
|
||||||
try:
|
try:
|
||||||
from core.metadata_service import _create_fallback_client
|
from core.metadata_service import get_primary_client
|
||||||
self._itunes_client = _create_fallback_client()
|
self._itunes_client = get_primary_client()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Failed to initialize fallback metadata client: %s", e)
|
logger.error("Failed to initialize fallback metadata client: %s", e)
|
||||||
return self._itunes_client
|
return self._itunes_client
|
||||||
|
|
|
||||||
|
|
@ -551,8 +551,8 @@ class SeasonalDiscoveryService:
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
# Fallback metadata source (iTunes or Deezer)
|
# Fallback metadata source (iTunes or Deezer)
|
||||||
from core.metadata_service import _create_fallback_client
|
from core.metadata_service import get_primary_client
|
||||||
fallback_client = _create_fallback_client()
|
fallback_client = get_primary_client()
|
||||||
|
|
||||||
for keyword in search_keywords:
|
for keyword in search_keywords:
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue