fix imports

diff --git a/music_assistant/cache.py b/music_assistant/cache.py
index c62f0a5727ce874222505ab266fe0225568c3ebf..341123b6a00a0119778aa40f9a36dc5cbe57c89c 100644 (file)
--- a/music_assistant/cache.py
+++ b/music_assistant/cache.py
@@ -9,7 +9,7 @@ import pickle
 from functools import reduce
 import aiosqlite
 
-from .utils import run_periodic, LOGGER
+from music_assistant.utils import run_periodic, LOGGER
 
 
 class Cache(object):

diff --git a/music_assistant/config.py b/music_assistant/config.py
index d2c754e8d137d345fc7b8062404e1446f068e807..5af415fa4264330ee48c8bd7dc528366cb7fd18d 100755 (executable)
--- a/music_assistant/config.py
+++ b/music_assistant/config.py
@@ -4,8 +4,8 @@
 import os
 import shutil
 
-from .utils import try_load_json_file, json, LOGGER
-from .constants import CONF_KEY_BASE, CONF_KEY_PLAYERSETTINGS, \
+from music_assistant.utils import try_load_json_file, json, LOGGER
+from music_assistant.constants import CONF_KEY_BASE, CONF_KEY_PLAYERSETTINGS, \
         CONF_KEY_MUSICPROVIDERS, CONF_KEY_PLAYERPROVIDERS, EVENT_CONFIG_CHANGED
 
 

diff --git a/music_assistant/database.py b/music_assistant/database.py
index ff985305069fa640c3193dc4223169fbcf7df2b4..0194743e1798636babfcee8bdeefadc4cb161cd1 100755 (executable)
--- a/music_assistant/database.py
+++ b/music_assistant/database.py
@@ -7,8 +7,8 @@ import os
 from typing import List
 import aiosqlite
 
-from .utils import LOGGER, get_sort_name, try_parse_int
-from .models.media_types import MediaType, Artist, Album, Track, Playlist, Radio
+from music_assistant.utils import LOGGER, get_sort_name, try_parse_int
+from music_assistant.models.media_types import MediaType, Artist, Album, Track, Playlist, Radio
 
 
 def commit_guard(func):

diff --git a/music_assistant/homeassistant.py b/music_assistant/homeassistant.py
index a979b6d9a414842e48cd56988ae37672be029f04..d9fb3e616d89cf97f92664153e2189ec361d1be4 100644 (file)
--- a/music_assistant/homeassistant.py
+++ b/music_assistant/homeassistant.py
@@ -14,9 +14,9 @@ from aiocometd import Client, ConnectionType, Extension
 import copy
 import slugify as slug
 import json
-from .utils import run_periodic, LOGGER, IS_HASSIO, try_parse_int
-from .models.media_types import Track
-from .constants import CONF_ENABLED, CONF_URL, CONF_TOKEN, EVENT_PLAYER_CHANGED, EVENT_PLAYER_ADDED, EVENT_HASS_ENTITY_CHANGED
+from music_assistant.utils import run_periodic, LOGGER, IS_HASSIO, try_parse_int
+from music_assistant.models.media_types import Track
+from music_assistant.constants import CONF_ENABLED, CONF_URL, CONF_TOKEN, EVENT_PLAYER_CHANGED, EVENT_PLAYER_ADDED, EVENT_HASS_ENTITY_CHANGED
 
 CONF_KEY = 'homeassistant'
 CONF_PUBLISH_PLAYERS = "publish_players"

diff --git a/music_assistant/http_streamer.py b/music_assistant/http_streamer.py
index 55ae84264c052323c038d201060da2d94681596b..ace731c7fedd3326d4b16ff16895f91e0d2affdd 100755 (executable)
--- a/music_assistant/http_streamer.py
+++ b/music_assistant/http_streamer.py
@@ -17,10 +17,10 @@ import subprocess
 import gc
 import shlex
 
-from .constants import EVENT_STREAM_STARTED, EVENT_STREAM_ENDED
-from .utils import LOGGER, try_parse_int, get_ip, run_async_background_task, run_periodic, get_folder_size
-from .models.media_types import TrackQuality, MediaType
-from .models.playerstate import PlayerState
+from music_assistant.constants import EVENT_STREAM_STARTED, EVENT_STREAM_ENDED
+from music_assistant.utils import LOGGER, try_parse_int, get_ip, run_async_background_task, run_periodic, get_folder_size
+from music_assistant.models.media_types import TrackQuality, MediaType
+from music_assistant.models.playerstate import PlayerState
 
 
 class HTTPStreamer():

diff --git a/music_assistant/metadata.py b/music_assistant/metadata.py
index cf6c21b9a51ab1b0c2b08582af87d0be227bc38b..1f127e3ee8a32dd48895d0c6de5278dc4b8ae259 100755 (executable)
--- a/music_assistant/metadata.py
+++ b/music_assistant/metadata.py
@@ -6,8 +6,8 @@ from asyncio_throttle import Throttler
 from yarl import URL
 import re
 
-from .utils import LOGGER, compare_strings, get_compare_string
-from .cache import use_cache
+from music_assistant.utils import LOGGER, compare_strings, get_compare_string
+from music_assistant.cache import use_cache
 
 LUCENE_SPECIAL = r'([+\-&|!(){}\[\]\^"~*?:\\\/])'
 

diff --git a/music_assistant/models/__init__.py b/music_assistant/models/__init__.py
index 3518fe877c84d7597e9cb0af706a38f4bafd8100..23c9b5245007e2df7545b5330957b18f101999e8 100644 (file)
--- a/music_assistant/models/__init__.py
+++ b/music_assistant/models/__init__.py
@@ -1,6 +1,6 @@
-from .media_types import *
-from .musicprovider import MusicProvider
-from .player_queue import QueueItem, PlayerQueue
-from .player import Player
-from .playerstate import PlayerState
-from .playerprovider import PlayerProvider
\ No newline at end of file
+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/models/musicprovider.py b/music_assistant/models/musicprovider.py
index 1f0595c920d2144d2d7b2ba25848f1c0fa2c2bb1..4021387478d43ad1affb6b23ad29dc880f25b794 100755 (executable)
--- a/music_assistant/models/musicprovider.py
+++ b/music_assistant/models/musicprovider.py
@@ -3,9 +3,9 @@
 
 import asyncio
 from typing import List
-from ..utils import LOGGER, compare_strings
-from ..cache import cached_iterator, cached
-from .media_types import Album, Artist, Track, Playlist, MediaType, Radio
+from music_assistant.utils import LOGGER, compare_strings
+from music_assistant.cache import cached_iterator, cached
+from music_assistant.models.media_types import Album, Artist, Track, Playlist, MediaType, Radio
 
 
 class MusicProvider():

diff --git a/music_assistant/models/player.py b/music_assistant/models/player.py
index 3092ad63b39cb385fb13f79b94f4384863f90c8b..b8f45bb9768ea620295ea90ca622a695a634500a 100755 (executable)
--- a/music_assistant/models/player.py
+++ b/music_assistant/models/player.py
@@ -6,10 +6,10 @@
 """
 
 import time
-from ..utils import try_parse_int, try_parse_bool, try_parse_float
-from ..constants import EVENT_PLAYER_CHANGED
-from .player_queue import PlayerQueue
-from .playerstate import PlayerState
+from music_assistant.utils import try_parse_int, try_parse_bool, try_parse_float
+from music_assistant.constants import EVENT_PLAYER_CHANGED
+from music_assistant.models.player_queue import PlayerQueue
+from music_assistant.models.playerstate import PlayerState
 
 # pylint: disable=too-many-instance-attributes
 # pylint: disable=too-many-public-methods

diff --git a/music_assistant/models/player_queue.py b/music_assistant/models/player_queue.py
index e714bec23c0ada9bb8b20c6653bac288fe273935..3bcd27a03208bd4c23fee0d1a3bbe87ec07f4c53 100755 (executable)
--- a/music_assistant/models/player_queue.py
+++ b/music_assistant/models/player_queue.py
@@ -11,11 +11,11 @@ import random
 import uuid
 from enum import Enum
 
-from ..utils import LOGGER, serialize_values
-from ..constants import EVENT_PLAYBACK_STARTED, EVENT_PLAYBACK_STOPPED, \
+from music_assistant.utils import LOGGER, serialize_values
+from music_assistant.constants import EVENT_PLAYBACK_STARTED, EVENT_PLAYBACK_STOPPED, \
     EVENT_QUEUE_UPDATED, EVENT_QUEUE_ITEMS_UPDATED
-from .media_types import Track
-from .playerstate import PlayerState
+from music_assistant.models.media_types import Track
+from music_assistant.models.playerstate import PlayerState
 
 # pylint: disable=too-many-instance-attributes
 # pylint: disable=too-many-public-methods

diff --git a/music_assistant/models/playerprovider.py b/music_assistant/models/playerprovider.py
index edc194d84aa531c124745282302f259ae8b60dfd..a77f40e1c166ad2b51eb6020080257708fcf3f0d 100755 (executable)
--- a/music_assistant/models/playerprovider.py
+++ b/music_assistant/models/playerprovider.py
@@ -4,11 +4,11 @@
 import asyncio
 from enum import Enum
 from typing import List
-from ..utils import run_periodic, LOGGER
-from ..constants import CONF_ENABLED
-from .player_queue import PlayerQueue
-from .media_types import Track
-from .player import Player
+from music_assistant.utils import run_periodic, LOGGER
+from music_assistant.constants import CONF_ENABLED
+from music_assistant.models.player_queue import PlayerQueue
+from music_assistant.models.media_types import Track
+from music_assistant.models.player import Player
 
 
 class PlayerProvider():

diff --git a/music_assistant/music_manager.py b/music_assistant/music_manager.py
index bcfdcef2a9b9e38af1d2803ffcc0555da385f80b..5befc5b1352aa20e1d4b2ae7339c6d3c862b5b1f 100755 (executable)
--- a/music_assistant/music_manager.py
+++ b/music_assistant/music_manager.py
@@ -11,9 +11,9 @@ import toolz
 from PIL import Image
 import aiohttp
 
-from .utils import run_periodic, LOGGER, load_provider_modules
-from .models.media_types import MediaItem, MediaType, Track, Artist, Album, Playlist, Radio
-from .constants import CONF_KEY_MUSICPROVIDERS, EVENT_MUSIC_SYNC_STATUS
+from music_assistant.utils import run_periodic, LOGGER, load_provider_modules
+from music_assistant.models.media_types import MediaItem, MediaType, Track, Artist, Album, Playlist, Radio
+from music_assistant.constants import CONF_KEY_MUSICPROVIDERS, EVENT_MUSIC_SYNC_STATUS
 
 
 def sync_task(desc):

diff --git a/music_assistant/musicproviders/file.py b/music_assistant/musicproviders/file.py
index cc01fdc1405376366c3fe3eb81028cde61c6ca9e..864a7856bfb78ffa5e575a271381835367f2c6b3 100644 (file)
--- a/music_assistant/musicproviders/file.py
+++ b/music_assistant/musicproviders/file.py
@@ -9,9 +9,9 @@ import time
 import base64
 import taglib
 
-from ..utils import run_periodic, LOGGER, parse_title_and_version
-from ..models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from ..constants import CONF_ENABLED
+from music_assistant.utils import run_periodic, LOGGER, parse_title_and_version
+from music_assistant.models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from music_assistant.constants import CONF_ENABLED
 
 PROV_NAME = 'Local files and playlists'
 PROV_CLASS = 'FileProvider'

diff --git a/music_assistant/musicproviders/qobuz.py b/music_assistant/musicproviders/qobuz.py
index c1326573f41293082f7903c2f9af5106e99f3fc6..b952eb13c745557f6dabc1ca74bafdc78f9b25ce 100644 (file)
--- a/music_assistant/musicproviders/qobuz.py
+++ b/music_assistant/musicproviders/qobuz.py
@@ -8,11 +8,11 @@ import time
 import aiohttp
 from asyncio_throttle import Throttler
 
-from ..utils import LOGGER, parse_title_and_version
-from ..app_vars import get_app_var
-from ..models import MusicProvider, MediaType, TrackQuality, \
+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 ..constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, \
+from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, \
     CONF_TYPE_PASSWORD, EVENT_STREAM_STARTED, EVENT_PLAYBACK_STOPPED
 
 PROV_NAME = 'Qobuz'

diff --git a/music_assistant/musicproviders/spotify.py b/music_assistant/musicproviders/spotify.py
index 257b659313e379c4dc73f527f62cd39e116e064f..1b53f1ec08b705a6c32ae6b105a0dc92b6c2283a 100644 (file)
--- a/music_assistant/musicproviders/spotify.py
+++ b/music_assistant/musicproviders/spotify.py
@@ -10,11 +10,11 @@ import asyncio
 from asyncio_throttle import Throttler
 import aiohttp
 
-from ..utils import LOGGER, parse_title_and_version, json
-from ..app_vars import get_app_var
-from ..models import MusicProvider, MediaType, TrackQuality, \
+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 ..constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD
+from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD
 
 PROV_NAME = 'Spotify'
 PROV_CLASS = 'SpotifyProvider'

diff --git a/music_assistant/musicproviders/tunein.py b/music_assistant/musicproviders/tunein.py
index 4e59a8e3abc578fda101c999661a08caed0d627b..1a812afc0ebc099763547bf727454621de3d1895 100644 (file)
--- a/music_assistant/musicproviders/tunein.py
+++ b/music_assistant/musicproviders/tunein.py
@@ -5,9 +5,9 @@ from typing import List
 from asyncio_throttle import Throttler
 import aiohttp
 
-from ..utils import LOGGER
-from ..models import MusicProvider, MediaType, TrackQuality, Radio
-from ..constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD
+from music_assistant.utils import LOGGER
+from music_assistant.models import MusicProvider, MediaType, TrackQuality, Radio
+from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD
 
 
 PROV_NAME = 'TuneIn Radio'

diff --git a/music_assistant/player_manager.py b/music_assistant/player_manager.py
index fdbd14b3a1417261efa849b4cd321b9588d0520d..ab36cfff745c2cb5d0354825f7ffbd1ae0e8f8e8 100755 (executable)
--- a/music_assistant/player_manager.py
+++ b/music_assistant/player_manager.py
@@ -4,12 +4,12 @@
 import os
 from typing import List
 
-from .constants import CONF_KEY_PLAYERPROVIDERS, EVENT_PLAYER_ADDED, \
+from music_assistant.constants import CONF_KEY_PLAYERPROVIDERS, EVENT_PLAYER_ADDED, \
     EVENT_PLAYER_REMOVED, EVENT_HASS_ENTITY_CHANGED
-from .utils import LOGGER, load_provider_modules, iter_items
-from .models.media_types import MediaItem, MediaType
-from .models.player_queue import QueueItem, QueueOption
-from .models.player import Player
+from music_assistant.utils import LOGGER, load_provider_modules, iter_items
+from music_assistant.models.media_types import MediaItem, MediaType
+from music_assistant.models.player_queue import QueueItem, QueueOption
+from music_assistant.models.player import Player
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 MODULES_PATH = os.path.join(BASE_DIR, "playerproviders")

diff --git a/music_assistant/playerproviders/chromecast.py b/music_assistant/playerproviders/chromecast.py
index a20d5b7347eb2453051b3856cea967347dd055bb..92dc11e168bc0c2adaaf62b1abe96327a8facb8e 100644 (file)
--- a/music_assistant/playerproviders/chromecast.py
+++ b/music_assistant/playerproviders/chromecast.py
@@ -12,12 +12,12 @@ import types
 import time
 import uuid
 
-from ..utils import run_periodic, LOGGER, try_parse_int
-from ..models.playerprovider import PlayerProvider
-from ..models.player import Player, PlayerState
-from ..models.playerstate import PlayerState
-from ..models.player_queue import QueueItem, PlayerQueue
-from ..constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
+from music_assistant.utils import run_periodic, LOGGER, try_parse_int
+from music_assistant.models.playerprovider import PlayerProvider
+from music_assistant.models.player import Player, PlayerState
+from music_assistant.models.playerstate import PlayerState
+from music_assistant.models.player_queue import QueueItem, PlayerQueue
+from music_assistant.constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
 
 PROV_ID = 'chromecast'
 PROV_NAME = 'Chromecast'

diff --git a/music_assistant/playerproviders/sonos.py b/music_assistant/playerproviders/sonos.py
index 2e9b6d3540bfe72d56f2a433d9ea4ed647f54f51..513f99b47192479f9362139fa07a44798f95dcaa 100644 (file)
--- a/music_assistant/playerproviders/sonos.py
+++ b/music_assistant/playerproviders/sonos.py
@@ -8,12 +8,12 @@ import logging
 import types
 import time
 
-from ..utils import run_periodic, LOGGER, try_parse_int
-from ..models.playerprovider import PlayerProvider
-from ..models.player import Player, PlayerState
-from ..models.playerstate import PlayerState
-from ..models.player_queue import QueueItem, PlayerQueue
-from ..constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
+from music_assistant.utils import run_periodic, LOGGER, try_parse_int
+from music_assistant.models.playerprovider import PlayerProvider
+from music_assistant.models.player import Player, PlayerState
+from music_assistant.models.playerstate import PlayerState
+from music_assistant.models.player_queue import QueueItem, PlayerQueue
+from music_assistant.constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
 
 PROV_ID = 'sonos'
 PROV_NAME = 'Sonos'

diff --git a/music_assistant/playerproviders/squeezebox.py b/music_assistant/playerproviders/squeezebox.py
index edd576806cc6cf02e05e1f7a58541f3a53f264a0..d4d9cbda5a27ee1959461ed8b0a25827166180bb 100644 (file)
--- a/music_assistant/playerproviders/squeezebox.py
+++ b/music_assistant/playerproviders/squeezebox.py
@@ -11,9 +11,9 @@ from typing import List
 import random
 import sys
 import socket
-from ..utils import run_periodic, LOGGER, try_parse_int, get_ip, get_hostname
-from ..models import PlayerProvider, Player, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from ..constants import CONF_ENABLED
+from music_assistant.utils import run_periodic, LOGGER, try_parse_int, get_ip, get_hostname
+from music_assistant.models import PlayerProvider, Player, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from music_assistant.constants import CONF_ENABLED
 
 
 PROV_ID = 'squeezebox'

diff --git a/music_assistant/playerproviders/webplayer.py b/music_assistant/playerproviders/webplayer.py
index b0d1d31f641c7d02316d38e1e3ec362e41423bb0..f8e5a97a52f054117ff835c048542667363bdebb 100644 (file)
--- a/music_assistant/playerproviders/webplayer.py
+++ b/music_assistant/playerproviders/webplayer.py
@@ -11,9 +11,9 @@ from typing import List
 import random
 import sys
 import socket
-from ..utils import run_periodic, LOGGER, try_parse_int, get_ip, get_hostname
-from ..models import PlayerProvider, Player, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from ..constants import CONF_ENABLED
+from music_assistant.utils import run_periodic, LOGGER, try_parse_int, get_ip, get_hostname
+from music_assistant.models import PlayerProvider, Player, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from music_assistant.constants import CONF_ENABLED
 
 
 PROV_ID = 'webplayer'

diff --git a/music_assistant/utils.py b/music_assistant/utils.py
index f1b31992c62a21b63cb6faa244fbae2943db93ca..796fc3016b49b9ddd77e5d0ae36e3d729219e409 100755 (executable)
--- a/music_assistant/utils.py
+++ b/music_assistant/utils.py
@@ -14,7 +14,7 @@ except ImportError:
     import json
 LOGGER = logging.getLogger('music_assistant')
 
-from .constants import CONF_KEY_MUSICPROVIDERS, CONF_ENABLED
+from music_assistant.constants import CONF_KEY_MUSICPROVIDERS, CONF_ENABLED
 
 IS_HASSIO = os.path.isfile('/data/options.json')
 

diff --git a/music_assistant/web.py b/music_assistant/web.py
index 605507ca5289523046cd4be3a8322ae3dfb44d26..f6d7d246fd578c662f0f18abd3c5636b9ce28b57 100755 (executable)
--- a/music_assistant/web.py
+++ b/music_assistant/web.py
@@ -11,9 +11,9 @@ from functools import partial
 import ssl
 import concurrent
 import threading
-from .models.media_types import MediaItem, MediaType, media_type_from_string
-from .utils import run_periodic, LOGGER, IS_HASSIO, run_async_background_task, get_ip, json_serializer
-from .constants import CONF_KEY_PLAYERSETTINGS, CONF_KEY_MUSICPROVIDERS, CONF_KEY_PLAYERPROVIDERS
+from music_assistant.models.media_types import MediaItem, MediaType, media_type_from_string
+from music_assistant.utils import run_periodic, LOGGER, IS_HASSIO, run_async_background_task, get_ip, json_serializer
+from music_assistant.constants import CONF_KEY_PLAYERSETTINGS, CONF_KEY_MUSICPROVIDERS, CONF_KEY_PLAYERPROVIDERS
 
 CONF_KEY = 'web'
 

diff --git a/requirements.txt b/requirements.txt
index 38d403a2e108377d300a266ddc38e11e9ce15926..5eaf654f61329fb1ebd5da1322de5d665ced4017 100755 (executable)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 argparse
 cytoolz
-aiohttp[speedups]
+aiohttp
 requests
 spotify_token
 protobuf