From 078bb1f6a163cf88031f7a9b7f70017cf3cbbd2f Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sun, 10 Apr 2022 19:48:46 +0200 Subject: [PATCH] linting isort --- music_assistant/controllers/metadata/fanarttv.py | 1 + music_assistant/controllers/metadata/musicbrainz.py | 1 + music_assistant/helpers/audio.py | 1 + music_assistant/helpers/database.py | 1 + music_assistant/helpers/images.py | 3 ++- music_assistant/mass.py | 1 + music_assistant/models/media_items.py | 1 + music_assistant/models/player.py | 1 + music_assistant/models/player_queue.py | 1 + music_assistant/providers/filesystem.py | 3 ++- music_assistant/providers/qobuz.py | 1 + music_assistant/providers/spotify/__init__.py | 1 + music_assistant/providers/tunein.py | 1 + 13 files changed, 15 insertions(+), 2 deletions(-) diff --git a/music_assistant/controllers/metadata/fanarttv.py b/music_assistant/controllers/metadata/fanarttv.py index 3777bb77..8e0ce9ae 100755 --- a/music_assistant/controllers/metadata/fanarttv.py +++ b/music_assistant/controllers/metadata/fanarttv.py @@ -5,6 +5,7 @@ from typing import Dict import aiohttp from asyncio_throttle import Throttler + from music_assistant.helpers.typing import MusicAssistant # TODO: add support for personal api keys ? diff --git a/music_assistant/controllers/metadata/musicbrainz.py b/music_assistant/controllers/metadata/musicbrainz.py index 8d6ea934..57b32e37 100644 --- a/music_assistant/controllers/metadata/musicbrainz.py +++ b/music_assistant/controllers/metadata/musicbrainz.py @@ -6,6 +6,7 @@ from typing import Optional import aiohttp from asyncio_throttle import Throttler + from music_assistant.helpers.cache import cached from music_assistant.helpers.compare import compare_strings, get_compare_string from music_assistant.helpers.typing import MusicAssistant diff --git a/music_assistant/helpers/audio.py b/music_assistant/helpers/audio.py index a1d4988d..9438c70a 100644 --- a/music_assistant/helpers/audio.py +++ b/music_assistant/helpers/audio.py @@ -8,6 +8,7 @@ from io import BytesIO from typing import AsyncGenerator, List, Optional, Tuple import aiofiles + from music_assistant.constants import EventType from music_assistant.helpers.process import AsyncProcess, check_output from music_assistant.helpers.typing import MusicAssistant, QueueItem diff --git a/music_assistant/helpers/database.py b/music_assistant/helpers/database.py index b34813fe..c0ba1830 100755 --- a/music_assistant/helpers/database.py +++ b/music_assistant/helpers/database.py @@ -6,6 +6,7 @@ from typing import Any, Dict, List, Mapping, Optional from databases import Database as Db from databases import DatabaseURL + from music_assistant.helpers.typing import MusicAssistant # pylint: disable=invalid-name diff --git a/music_assistant/helpers/images.py b/music_assistant/helpers/images.py index c6b92207..64156bb5 100644 --- a/music_assistant/helpers/images.py +++ b/music_assistant/helpers/images.py @@ -3,9 +3,10 @@ from __future__ import annotations from io import BytesIO +from PIL import Image + from music_assistant.helpers.typing import MusicAssistant from music_assistant.models.media_items import ItemMapping, MediaItemType, MediaType -from PIL import Image async def create_thumbnail(mass: MusicAssistant, url, size: int = 150) -> bytes: diff --git a/music_assistant/mass.py b/music_assistant/mass.py index 0a00f01b..d98342f9 100644 --- a/music_assistant/mass.py +++ b/music_assistant/mass.py @@ -11,6 +11,7 @@ from typing import Any, Callable, Coroutine, List, Optional, Tuple, Type, Union import aiohttp from databases import DatabaseURL + from music_assistant.constants import EventType from music_assistant.controllers.metadata import MetaDataController from music_assistant.controllers.music import MusicController diff --git a/music_assistant/models/media_items.py b/music_assistant/models/media_items.py index a1e93656..65e6734a 100755 --- a/music_assistant/models/media_items.py +++ b/music_assistant/models/media_items.py @@ -6,6 +6,7 @@ from enum import Enum, IntEnum from typing import Any, Dict, List, Mapping, Optional, Union from mashumaro import DataClassDictMixin + from music_assistant.helpers.json import json from music_assistant.helpers.util import create_sort_name diff --git a/music_assistant/models/player.py b/music_assistant/models/player.py index 42f68ec8..0095b6d5 100755 --- a/music_assistant/models/player.py +++ b/music_assistant/models/player.py @@ -8,6 +8,7 @@ from enum import Enum, IntEnum from typing import TYPE_CHECKING, Any, Dict, List from mashumaro import DataClassDictMixin + from music_assistant.constants import EventType from music_assistant.helpers.typing import MusicAssistant from music_assistant.helpers.util import get_changed_keys diff --git a/music_assistant/models/player_queue.py b/music_assistant/models/player_queue.py index 5068a433..4ebd4b38 100644 --- a/music_assistant/models/player_queue.py +++ b/music_assistant/models/player_queue.py @@ -10,6 +10,7 @@ from typing import TYPE_CHECKING, List, Optional, Tuple, Union from uuid import uuid4 from mashumaro import DataClassDictMixin + from music_assistant.constants import EventType from music_assistant.helpers.audio import get_stream_details from music_assistant.helpers.typing import MusicAssistant diff --git a/music_assistant/providers/filesystem.py b/music_assistant/providers/filesystem.py index 931f6009..4b050534 100644 --- a/music_assistant/providers/filesystem.py +++ b/music_assistant/providers/filesystem.py @@ -6,6 +6,8 @@ import os from typing import List, Optional, Tuple import aiofiles +from tinytag import TinyTag + from music_assistant.helpers.compare import compare_strings, get_compare_string from music_assistant.helpers.util import parse_title_and_version, try_parse_int from music_assistant.models.media_items import ( @@ -23,7 +25,6 @@ from music_assistant.models.media_items import ( Track, ) from music_assistant.models.provider import MusicProvider -from tinytag import TinyTag def split_items(org_str: str) -> Tuple[str]: diff --git a/music_assistant/providers/qobuz.py b/music_assistant/providers/qobuz.py index e7443d22..aeadba29 100644 --- a/music_assistant/providers/qobuz.py +++ b/music_assistant/providers/qobuz.py @@ -9,6 +9,7 @@ from typing import List, Optional import aiohttp from asyncio_throttle import Throttler + from music_assistant.constants import EventType from music_assistant.helpers.app_vars import ( # pylint: disable=no-name-in-module get_app_var, diff --git a/music_assistant/providers/spotify/__init__.py b/music_assistant/providers/spotify/__init__.py index fcc49649..f3da3a1e 100644 --- a/music_assistant/providers/spotify/__init__.py +++ b/music_assistant/providers/spotify/__init__.py @@ -11,6 +11,7 @@ from typing import List, Optional import aiohttp from asyncio_throttle import Throttler + from music_assistant.helpers.app_vars import ( # noqa # pylint: disable=no-name-in-module get_app_var, ) diff --git a/music_assistant/providers/tunein.py b/music_assistant/providers/tunein.py index f151d834..0bcf025b 100644 --- a/music_assistant/providers/tunein.py +++ b/music_assistant/providers/tunein.py @@ -4,6 +4,7 @@ from __future__ import annotations from typing import List, Optional from asyncio_throttle import Throttler + from music_assistant.models.media_items import ( ContentType, MediaItemProviderId, -- 2.34.1