From 6a497d58402391c938046e75e252a85251c1c565 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Tue, 23 Apr 2024 22:37:41 +0200 Subject: [PATCH] fix some typos --- music_assistant/server/controllers/media/base.py | 8 ++++---- music_assistant/server/providers/jellyfin/__init__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/music_assistant/server/controllers/media/base.py b/music_assistant/server/controllers/media/base.py index 3a2994d7..5e4bc64c 100644 --- a/music_assistant/server/controllers/media/base.py +++ b/music_assistant/server/controllers/media/base.py @@ -186,6 +186,7 @@ class MediaControllerBase(Generic[ItemCls], metaclass=ABCMeta): add_to_library: bool = False, ) -> ItemCls: """Return (full) details for a single media item.""" + metadata_lookup = force_refresh or add_to_library # always prefer the full library item if we have it library_item = await self.get_library_item_by_prov_id( item_id, @@ -193,8 +194,7 @@ class MediaControllerBase(Generic[ItemCls], metaclass=ABCMeta): ) if library_item and (time() - (library_item.metadata.last_refresh or 0)) > REFRESH_INTERVAL: # it's been too long since the full metadata was last retrieved (or never at all) - force_refresh = True - add_to_library = True + metadata_lookup = True if library_item and force_refresh: # get (first) provider item id belonging to this library item add_to_library = True @@ -222,7 +222,7 @@ class MediaControllerBase(Generic[ItemCls], metaclass=ABCMeta): # we couldn't get a match from any of the providers, raise error msg = f"Item not found: {provider_instance_id_or_domain}/{item_id}" raise MediaNotFoundError(msg) - if not add_to_library: + if not (add_to_library or metadata_lookup): # return the provider item as-is return details # create task to add the item to the library, @@ -235,7 +235,7 @@ class MediaControllerBase(Generic[ItemCls], metaclass=ABCMeta): add_task = self.mass.create_task( self.add_item_to_library, item=details, - metadata_lookup=True, + metadata_lookup=metadata_lookup, overwrite_existing=overwrite_existing, task_id=task_id, ) diff --git a/music_assistant/server/providers/jellyfin/__init__.py b/music_assistant/server/providers/jellyfin/__init__.py index 6ae8b928..4028bce8 100644 --- a/music_assistant/server/providers/jellyfin/__init__.py +++ b/music_assistant/server/providers/jellyfin/__init__.py @@ -643,7 +643,7 @@ class JellyfinProvider(MusicProvider): if prov_artist_id.startswith(FAKE_ARTIST_PREFIX): # This artist does not exist in jellyfin, so we can just load it from DB. - if db_artist := await self.mass.music.artists.get_db_item_by_prov_id( + if db_artist := await self.mass.music.artists.get_library_item_by_prov_id( prov_artist_id, self.instance_id ): return db_artist -- 2.34.1