more fixing of imports

diff --git a/music_assistant/models/__init__.py b/music_assistant/models/__init__.py
index 23c9b5245007e2df7545b5330957b18f101999e8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/music_assistant/models/__init__.py
+++ b/music_assistant/models/__init__.py
@@ -1,6 +0,0 @@
-from music_assistant.models.media_types import *
-from music_assistant.models.musicprovider import MusicProvider
-from music_assistant.models.player_queue import QueueItem, PlayerQueue
-from music_assistant.models.player import Player
-from music_assistant.models.playerstate import PlayerState
-from music_assistant.models.playerprovider import PlayerProvider
\ No newline at end of file

diff --git a/music_assistant/musicproviders/qobuz.py b/music_assistant/musicproviders/qobuz.py
index b952eb13c745557f6dabc1ca74bafdc78f9b25ce..a961ef13ca2fb395b3b3c52012e33c7dc4b5324a 100644 (file)
--- a/music_assistant/musicproviders/qobuz.py
+++ b/music_assistant/musicproviders/qobuz.py
@@ -10,8 +10,8 @@ from asyncio_throttle import Throttler
 
 from music_assistant.utils import LOGGER, parse_title_and_version
 from music_assistant.app_vars import get_app_var
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, \
-    AlbumType, Artist, Album, Track, Playlist
+from music_assistant.models.media_types import MediaType, AlbumType, Artist, Album, Track, Playlist, TrackQuality
+from music_assistant.models.musicprovider import MusicProvider
 from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, \
     CONF_TYPE_PASSWORD, EVENT_STREAM_STARTED, EVENT_PLAYBACK_STOPPED
 

diff --git a/music_assistant/musicproviders/spotify.py b/music_assistant/musicproviders/spotify.py
index 1b53f1ec08b705a6c32ae6b105a0dc92b6c2283a..b508f1f328192e6db7f70bc44b243851007b2454 100644 (file)
--- a/music_assistant/musicproviders/spotify.py
+++ b/music_assistant/musicproviders/spotify.py
@@ -12,8 +12,8 @@ import aiohttp
 
 from music_assistant.utils import LOGGER, parse_title_and_version, json
 from music_assistant.app_vars import get_app_var
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, \
-    AlbumType, Artist, Album, Track, Playlist
+from music_assistant.models.media_types import MediaType, AlbumType, Artist, Album, Track, Playlist, TrackQuality
+from music_assistant.models.musicprovider import MusicProvider
 from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD
 
 PROV_NAME = 'Spotify'

diff --git a/music_assistant/musicproviders/tunein.py b/music_assistant/musicproviders/tunein.py
index 1a812afc0ebc099763547bf727454621de3d1895..65c3ff38adb58f06f232fb03a7c6c3e51573618c 100644 (file)
--- a/music_assistant/musicproviders/tunein.py
+++ b/music_assistant/musicproviders/tunein.py
@@ -6,7 +6,8 @@ from asyncio_throttle import Throttler
 import aiohttp
 
 from music_assistant.utils import LOGGER
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, Radio
+from music_assistant.models.media_types import MediaType, TrackQuality, Radio
+from music_assistant.models.musicprovider import MusicProvider
 from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD