From cdcee6aa4ff76bf8ede8317a13e6bbef17e5cfac Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Fri, 16 Aug 2024 17:32:11 +0200 Subject: [PATCH] some tweaks --- music_assistant/server/controllers/music.py | 21 +++++++++++++++++-- .../server/providers/qobuz/__init__.py | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/music_assistant/server/controllers/music.py b/music_assistant/server/controllers/music.py index 4c8d30f4..41dcc1bb 100644 --- a/music_assistant/server/controllers/music.py +++ b/music_assistant/server/controllers/music.py @@ -29,7 +29,13 @@ from music_assistant.common.models.errors import ( MusicAssistantError, ProviderUnavailableError, ) -from music_assistant.common.models.media_items import BrowseFolder, MediaItemType, SearchResults +from music_assistant.common.models.media_items import ( + BrowseFolder, + MediaItemImage, + MediaItemType, + SearchResults, + UniqueList, +) from music_assistant.common.models.provider import SyncTask from music_assistant.common.models.streamdetails import LoudnessMeasurement from music_assistant.constants import ( @@ -1089,14 +1095,25 @@ class MusicController(CoreController): if not item.metadata or not item.metadata.images: continue changes = False + images: UniqueList[MediaItemImage] = UniqueList() for item in item.metadata.images: # noqa: PLW2901, B020 if "--" not in item.provider: + images.append(item) continue if item.provider.startswith(unique_provs): + images.append(item) continue - item.provider = item.provider.split("--")[0] + images.append( + MediaItemImage( + type=item.type, + path=item.path, + provider=item.provider.split("--")[0], + remotely_accessible=item.remotely_accessible, + ) + ) changes = True if changes: + item.metadata.images = images await ctrl.update_item_in_library(item.item_id, item, True) # save changes diff --git a/music_assistant/server/providers/qobuz/__init__.py b/music_assistant/server/providers/qobuz/__init__.py index c4d5dcd9..786173af 100644 --- a/music_assistant/server/providers/qobuz/__init__.py +++ b/music_assistant/server/providers/qobuz/__init__.py @@ -742,6 +742,7 @@ class QobuzProvider(MusicProvider): async def _get_data(self, endpoint, sign_request=False, **kwargs): """Get data from api.""" # pylint: disable=too-many-branches + self.logger.debug("Handling GET request to %s", endpoint) url = f"http://www.qobuz.com/api.json/0.2/{endpoint}" headers = {"X-App-Id": app_var(0)} locale = self.mass.metadata.locale.replace("_", "-") @@ -790,6 +791,7 @@ class QobuzProvider(MusicProvider): @throttle_with_retries async def _post_data(self, endpoint, params=None, data=None): """Post data to api.""" + self.logger.debug("Handling POST request to %s", endpoint) if not params: params = {} if not data: -- 2.34.1