sort imports

diff --git a/music_assistant/controllers/metadata/fanarttv.py b/music_assistant/controllers/metadata/fanarttv.py
index a5c9c5fca4c2c1a60479c1a383c112238df739f1..3777bb77dbd2ad1b5e883eeda64e7adf9ea147e8 100755 (executable)
--- a/music_assistant/controllers/metadata/fanarttv.py
+++ b/music_assistant/controllers/metadata/fanarttv.py
@@ -5,10 +5,8 @@ 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 ?
 # TODO: Add support for album artwork ?
 

diff --git a/music_assistant/controllers/metadata/musicbrainz.py b/music_assistant/controllers/metadata/musicbrainz.py
index 57b32e375bf952373537ce701518e8e14e9848fb..8d6ea9346b7481cf76a9e070e9de99a7acf3bd07 100644 (file)
--- a/music_assistant/controllers/metadata/musicbrainz.py
+++ b/music_assistant/controllers/metadata/musicbrainz.py
@@ -6,7 +6,6 @@ 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/controllers/music/__init__.py b/music_assistant/controllers/music/__init__.py
index ed8ee758f81b2ae680107561a6050c6825137d4a..730e70074345732c095917bc29313f3d8b1606f0 100755 (executable)
--- a/music_assistant/controllers/music/__init__.py
+++ b/music_assistant/controllers/music/__init__.py
@@ -13,13 +13,13 @@ from music_assistant.controllers.music.radio import RadioController
 from music_assistant.controllers.music.tracks import TracksController
 from music_assistant.helpers.cache import cached
 from music_assistant.helpers.datetime import utc_timestamp
+from music_assistant.helpers.typing import MusicAssistant
+from music_assistant.helpers.util import create_task
 from music_assistant.models.errors import (
     AlreadyRegisteredError,
     MusicAssistantError,
     SetupFailedError,
 )
-from music_assistant.helpers.typing import MusicAssistant
-from music_assistant.helpers.util import create_task
 from music_assistant.models.media_items import (
     Album,
     MediaItem,

diff --git a/music_assistant/controllers/music/playlists.py b/music_assistant/controllers/music/playlists.py
index 7374443345ca9cab9c87af842f36fb96bcb190e4..9b1570520f04e170ad9dfeb4838caefee28f6604 100644 (file)
--- a/music_assistant/controllers/music/playlists.py
+++ b/music_assistant/controllers/music/playlists.py
@@ -1,14 +1,14 @@
 """Manage MediaItems of type Playlist."""
 from __future__ import annotations
-import time
 
+import time
 from typing import List
 
 from music_assistant.constants import EventType
 from music_assistant.helpers.cache import cached
-from music_assistant.models.errors import InvalidDataError, MediaNotFoundError
-from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
 from music_assistant.helpers.json import json_serializer
+from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
+from music_assistant.models.errors import InvalidDataError, MediaNotFoundError
 from music_assistant.models.media_controller import MediaControllerBase
 from music_assistant.models.media_items import MediaType, Playlist, Track
 

diff --git a/music_assistant/controllers/music/radio.py b/music_assistant/controllers/music/radio.py
index cafda6535af06b485fc213cdc5a1e752a69a2d40..bdb8ddd11f968b8998f8bf7b0f1b30fcc00b3537 100644 (file)
--- a/music_assistant/controllers/music/radio.py
+++ b/music_assistant/controllers/music/radio.py
@@ -2,8 +2,8 @@
 from __future__ import annotations
 
 from music_assistant.constants import EventType
-from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
 from music_assistant.helpers.json import json_serializer
+from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
 from music_assistant.models.media_controller import MediaControllerBase
 from music_assistant.models.media_items import MediaType, Radio
 

diff --git a/music_assistant/controllers/music/tracks.py b/music_assistant/controllers/music/tracks.py
index 867bf8dbb6c250cde137f1f0ad5b89764d01f4ef..c9d37e0053e16b7d02ef32900c86a9333421ebc2 100644 (file)
--- a/music_assistant/controllers/music/tracks.py
+++ b/music_assistant/controllers/music/tracks.py
@@ -10,14 +10,10 @@ from music_assistant.helpers.compare import (
     compare_strings,
     compare_track,
 )
-from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
 from music_assistant.helpers.json import json_serializer
+from music_assistant.helpers.util import create_sort_name, merge_dict, merge_list
 from music_assistant.models.media_controller import MediaControllerBase
-from music_assistant.models.media_items import (
-    ItemMapping,
-    MediaType,
-    Track,
-)
+from music_assistant.models.media_items import ItemMapping, MediaType, Track
 
 
 class TracksController(MediaControllerBase[Track]):

diff --git a/music_assistant/controllers/players.py b/music_assistant/controllers/players.py
index 0c77756e4bc2815bb176158d6b6d1edf83dc528a..e4129ef32787cc1be43b7c669359bb79cfdfb69c 100755 (executable)
--- a/music_assistant/controllers/players.py
+++ b/music_assistant/controllers/players.py
@@ -5,8 +5,8 @@ from typing import Dict, Tuple
 
 from music_assistant.constants import EventType
 from music_assistant.controllers.stream import StreamController
-from music_assistant.models.errors import AlreadyRegisteredError
 from music_assistant.helpers.typing import MusicAssistant
+from music_assistant.models.errors import AlreadyRegisteredError
 from music_assistant.models.player import Player, PlayerGroup
 from music_assistant.models.player_queue import PlayerQueue
 

diff --git a/music_assistant/controllers/stream.py b/music_assistant/controllers/stream.py
index b4993117bfc591b422c43cef0576e999ed877203..5cff6f9f4d817431a7e800fb5ecb7b0a8cbf13a8 100644 (file)
--- a/music_assistant/controllers/stream.py
+++ b/music_assistant/controllers/stream.py
@@ -4,12 +4,11 @@ from __future__ import annotations
 import asyncio
 from asyncio import Task
 from dataclasses import dataclass
-
-from typing import AsyncGenerator, Awaitable, Callable, Dict, List
 from time import time
+from typing import AsyncGenerator, Awaitable, Callable, Dict, List
 from uuid import uuid4
-from aiohttp import web
 
+from aiohttp import web
 from music_assistant.constants import EventType
 from music_assistant.helpers.audio import (
     check_audio_support,

diff --git a/music_assistant/helpers/audio.py b/music_assistant/helpers/audio.py
index 394f202fa00a468e263d1e24ebed869f66135d61..3e9ffe3090bd6d953f5260a095c72fd062a7e460 100644 (file)
--- a/music_assistant/helpers/audio.py
+++ b/music_assistant/helpers/audio.py
@@ -7,7 +7,6 @@ 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 6e47af34320003dafd882465cc85d6fb9c72d7f1..4da063b8bc0d8166083ad4cee595f37234640676 100755 (executable)
--- a/music_assistant/helpers/database.py
+++ b/music_assistant/helpers/database.py
@@ -1,11 +1,11 @@
 """Database logic."""
 from __future__ import annotations
+
 from contextlib import asynccontextmanager
 from typing import Any, Dict, List, Mapping
 
 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 86b2d8660294495c29118e589666d239ffe04a76..fe0d691ecd6acfef670ce439b321064667dd2e5e 100644 (file)
--- a/music_assistant/helpers/images.py
+++ b/music_assistant/helpers/images.py
@@ -3,7 +3,7 @@
 from io import BytesIO
 
 from music_assistant.helpers.typing import MusicAssistant
-from music_assistant.models.media_items import ItemMapping, MediaType, MediaItemType
+from music_assistant.models.media_items import ItemMapping, MediaItemType, MediaType
 from PIL import Image
 
 

diff --git a/music_assistant/helpers/typing.py b/music_assistant/helpers/typing.py
index 56ece3082500200f3378f28351452594816c305e..0debc056a1e32a05f39ef0eceadff8bf5f9cbb32 100644 (file)
--- a/music_assistant/helpers/typing.py
+++ b/music_assistant/helpers/typing.py
@@ -1,7 +1,6 @@
 """Typing helper."""
 
-from typing import TYPE_CHECKING, Any, Optional, List
-
+from typing import TYPE_CHECKING, Any, List, Optional
 
 # pylint: disable=invalid-name
 if TYPE_CHECKING:

diff --git a/music_assistant/mass.py b/music_assistant/mass.py
index cdba4d5ea9fcfe43838763ab474bb31ae01dfc16..178c7871af323299f95a2c81c44f7fdff253c5ca 100644 (file)
--- a/music_assistant/mass.py
+++ b/music_assistant/mass.py
@@ -8,7 +8,6 @@ from typing import Any, Callable, Coroutine, Optional, Tuple
 
 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 67a519f49a6cd4fd9c16d371727b7bf93eaeedfe..a2ec12fac359ad63e3e340b161e4fb0e57b4d2ac 100755 (executable)
--- a/music_assistant/models/media_items.py
+++ b/music_assistant/models/media_items.py
@@ -6,10 +6,7 @@ from enum import Enum, IntEnum
 from typing import Any, Dict, List, Mapping
 
 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 16063bc8318336a927b67782e72acef4e1980c91..e58d85750603c4deaadf6c28d4c523ab67532c70 100755 (executable)
--- a/music_assistant/models/player.py
+++ b/music_assistant/models/player.py
@@ -7,7 +7,6 @@ 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 create_task

diff --git a/music_assistant/models/player_queue.py b/music_assistant/models/player_queue.py
index 7da7f32b2aa8e2829ae6408a1ff4c94f71c2c620..5585947f563f584390d639f8af5b7b7e30294fae 100644 (file)
--- a/music_assistant/models/player_queue.py
+++ b/music_assistant/models/player_queue.py
@@ -11,7 +11,6 @@ from typing import TYPE_CHECKING, List, Tuple
 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 7cf847c84f5f9ce10a270ce7f5e2b13147fd36f1..6b538e591eb502640edcfe4625b7cd856fba6724 100644 (file)
--- a/music_assistant/providers/filesystem.py
+++ b/music_assistant/providers/filesystem.py
@@ -1,12 +1,13 @@
 """Filesystem musicprovider support for MusicAssistant."""
 from __future__ import annotations
+
 import base64
 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.helpers.compare import get_compare_string, compare_strings
 from music_assistant.models.media_items import (
     Album,
     AlbumType,
@@ -22,6 +23,7 @@ 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 92d59e392e7202534d6da78ea7c2715278f6a5b0..669949e70eee7f843302e419eec87104d3f9fd9e 100644 (file)
--- a/music_assistant/providers/qobuz.py
+++ b/music_assistant/providers/qobuz.py
@@ -6,13 +6,12 @@ import time
 from typing import List, Optional
 
 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,
 )
-from music_assistant.models.errors import LoginFailed
 from music_assistant.helpers.util import parse_title_and_version, try_parse_int
+from music_assistant.models.errors import LoginFailed
 from music_assistant.models.media_items import (
     Album,
     AlbumType,

diff --git a/music_assistant/providers/spotify/__init__.py b/music_assistant/providers/spotify/__init__.py
index 2bb23e993bb45b08497fab607dde9a48c17d866e..68cc568afda2453972caf5aa89edcb0e1b370438 100644 (file)
--- a/music_assistant/providers/spotify/__init__.py
+++ b/music_assistant/providers/spotify/__init__.py
@@ -8,12 +8,11 @@ from json.decoder import JSONDecodeError
 from typing import List, Optional
 
 from asyncio_throttle import Throttler
-
 from music_assistant.helpers.app_vars import (  # noqa # pylint: disable=no-name-in-module
     get_app_var,
 )
-from music_assistant.models.errors import LoginFailed
 from music_assistant.helpers.util import parse_title_and_version
+from music_assistant.models.errors import LoginFailed
 from music_assistant.models.media_items import (
     Album,
     AlbumType,

diff --git a/music_assistant/providers/tunein.py b/music_assistant/providers/tunein.py
index da96aa2d54d710eed64c7d0d9a2198426352c17a..d5496ac7e6ce9751587b6d8788ea5f8ac3a8ed8f 100644 (file)
--- a/music_assistant/providers/tunein.py
+++ b/music_assistant/providers/tunein.py
@@ -2,7 +2,6 @@
 from typing import List, Optional
 
 from asyncio_throttle import Throttler
-
 from music_assistant.models.media_items import (
     ContentType,
     MediaItemProviderId,