From 9792cf63f1e4f6c9c6d0ff52c93a7e3177a416ff Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Tue, 5 Apr 2022 10:31:33 +0200
Subject: [PATCH] sort imports

---
 music_assistant/controllers/metadata/fanarttv.py    | 2 --
 music_assistant/controllers/metadata/musicbrainz.py | 1 -
 music_assistant/controllers/music/__init__.py       | 4 ++--
 music_assistant/controllers/music/playlists.py      | 6 +++---
 music_assistant/controllers/music/radio.py          | 2 +-
 music_assistant/controllers/music/tracks.py         | 8 ++------
 music_assistant/controllers/players.py              | 2 +-
 music_assistant/controllers/stream.py               | 5 ++---
 music_assistant/helpers/audio.py                    | 1 -
 music_assistant/helpers/database.py                 | 2 +-
 music_assistant/helpers/images.py                   | 2 +-
 music_assistant/helpers/typing.py                   | 3 +--
 music_assistant/mass.py                             | 1 -
 music_assistant/models/media_items.py               | 3 ---
 music_assistant/models/player.py                    | 1 -
 music_assistant/models/player_queue.py              | 1 -
 music_assistant/providers/filesystem.py             | 6 ++++--
 music_assistant/providers/qobuz.py                  | 3 +--
 music_assistant/providers/spotify/__init__.py       | 3 +--
 music_assistant/providers/tunein.py                 | 1 -
 20 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/music_assistant/controllers/metadata/fanarttv.py b/music_assistant/controllers/metadata/fanarttv.py
index a5c9c5fc..3777bb77 100755
--- 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 57b32e37..8d6ea934 100644
--- 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 ed8ee758..730e7007 100755
--- 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 73744433..9b157052 100644
--- 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 cafda653..bdb8ddd1 100644
--- 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 867bf8db..c9d37e00 100644
--- 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 0c77756e..e4129ef3 100755
--- 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 b4993117..5cff6f9f 100644
--- 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 394f202f..3e9ffe30 100644
--- 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 6e47af34..4da063b8 100755
--- 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 86b2d866..fe0d691e 100644
--- 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 56ece308..0debc056 100644
--- 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 cdba4d5e..178c7871 100644
--- 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 67a519f4..a2ec12fa 100755
--- 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 16063bc8..e58d8575 100755
--- 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 7da7f32b..5585947f 100644
--- 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 7cf847c8..6b538e59 100644
--- 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 92d59e39..669949e7 100644
--- 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 2bb23e99..68cc568a 100644
--- 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 da96aa2d..d5496ac7 100644
--- 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,
-- 
2.34.1