From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 16 Apr 2020 07:31:14 +0000 (+0200)
Subject: fix imports
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=e8dc686e077b5cecd237ac638ce0a5ea7b829ec6;p=music-assistant-server.git

fix imports
---

diff --git a/music_assistant/cache.py b/music_assistant/cache.py
index c62f0a57..341123b6 100644
--- 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 d2c754e8..5af415fa 100755
--- 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 ff985305..0194743e 100755
--- 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 a979b6d9..d9fb3e61 100644
--- 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 55ae8426..ace731c7 100755
--- 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 cf6c21b9..1f127e3e 100755
--- 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 3518fe87..23c9b524 100644
--- 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 1f0595c9..40213874 100755
--- 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 3092ad63..b8f45bb9 100755
--- 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 e714bec2..3bcd27a0 100755
--- 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 edc194d8..a77f40e1 100755
--- 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 bcfdcef2..5befc5b1 100755
--- 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 cc01fdc1..864a7856 100644
--- 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 c1326573..b952eb13 100644
--- 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 257b6593..1b53f1ec 100644
--- 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 4e59a8e3..1a812afc 100644
--- 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 fdbd14b3..ab36cfff 100755
--- 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 a20d5b73..92dc11e1 100644
--- 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 2e9b6d35..513f99b4 100644
--- 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 edd57680..d4d9cbda 100644
--- 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 b0d1d31f..f8e5a97a 100644
--- 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 f1b31992..796fc301 100755
--- 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 605507ca..f6d7d246 100755
--- 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 38d403a2..5eaf654f 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 argparse
 cytoolz
-aiohttp[speedups]
+aiohttp
 requests
 spotify_token
 protobuf