From: Marcel van der Veldt Date: Wed, 29 Mar 2023 08:46:30 +0000 (+0200) Subject: Fix adding tracks to playlists (#593) X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=3145bd5622d07467cd91d4d2ef2d23d04f8cf791;p=music-assistant-server.git Fix adding tracks to playlists (#593) * fix adding tracks to playlists * fix leftover linting --- diff --git a/music_assistant/server/controllers/media/playlists.py b/music_assistant/server/controllers/media/playlists.py index c85eb881..379fd4de 100644 --- a/music_assistant/server/controllers/media/playlists.py +++ b/music_assistant/server/controllers/media/playlists.py @@ -120,7 +120,7 @@ class PlaylistController(MediaControllerBase[Playlist]): # grab all existing track ids in the playlist so we can check for duplicates cur_playlist_track_ids = set() count = 0 - for item in await self.tracks(playlist_prov.item_id, playlist_prov.provider_domain): + async for item in self.tracks(playlist_prov.item_id, playlist_prov.provider_domain): count += 1 cur_playlist_track_ids.update( { diff --git a/music_assistant/server/helpers/util.py b/music_assistant/server/helpers/util.py index ac265e34..3a6f3b18 100644 --- a/music_assistant/server/helpers/util.py +++ b/music_assistant/server/helpers/util.py @@ -4,12 +4,8 @@ from __future__ import annotations import asyncio import importlib import logging -from collections.abc import AsyncGenerator, Iterator -from contextlib import suppress from functools import lru_cache -from typing import TYPE_CHECKING, Any - -from music_assistant.common.helpers.util import empty_queue +from typing import TYPE_CHECKING if TYPE_CHECKING: from music_assistant.server.models import ProviderModuleType diff --git a/music_assistant/server/providers/filesystem_smb/__init__.py b/music_assistant/server/providers/filesystem_smb/__init__.py index 46970060..49297b6a 100644 --- a/music_assistant/server/providers/filesystem_smb/__init__.py +++ b/music_assistant/server/providers/filesystem_smb/__init__.py @@ -286,7 +286,6 @@ class SMBFileSystemProvider(FileSystemProviderBase): task.cancel() with suppress(asyncio.CancelledError): await task - del queue async def write_file_content(self, file_path: str, data: bytes) -> None: """Write entire file content as bytes (e.g. for playlists)."""