some refactoring

diff --git a/music_assistant/modules/homeassistant.py b/music_assistant/modules/homeassistant.py
index 89bb38eb035c2f56ec0bbb796ad1edc576f7ad86..e01ff03da45854542f9f877c2cca21c07c18282d 100644 (file)
--- a/music_assistant/modules/homeassistant.py
+++ b/music_assistant/modules/homeassistant.py
@@ -5,9 +5,9 @@ import asyncio
 import os
 from typing import List
 import random
-from music_assistant.utils import run_periodic, LOGGER, parse_track_title, try_parse_int
-from music_assistant.models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
+from utils import run_periodic, LOGGER, parse_track_title, try_parse_int
+from models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
 import json
 import aiohttp
 import time
@@ -15,7 +15,7 @@ import datetime
 import hashlib
 from asyncio_throttle import Throttler
 from aiocometd import Client, ConnectionType, Extension
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 import copy
 import slugify as slug
 

diff --git a/music_assistant/modules/metadata.py b/music_assistant/modules/metadata.py
index 0e89beb75c073473cdb7833aabf864b04f454898..9765d665d8dca993f7dd1c4af63337e8b2a64795 100755 (executable)
--- a/music_assistant/modules/metadata.py
+++ b/music_assistant/modules/metadata.py
@@ -3,12 +3,12 @@
 
 import asyncio
 import os
-from music_assistant.utils import run_periodic, LOGGER
+from utils import run_periodic, LOGGER
 import json
 import aiohttp
 from asyncio_throttle import Throttler
 from difflib import SequenceMatcher as Matcher
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 from yarl import URL
 import re
 

diff --git a/music_assistant/modules/music.py b/music_assistant/modules/music.py
index 2ddaf6669a36f4674e31009034878264b5393c57..2053457fc880026249c1451ff751bfd7e27c4eff 100755 (executable)
--- a/music_assistant/modules/music.py
+++ b/music_assistant/modules/music.py
@@ -3,10 +3,10 @@
 
 import asyncio
 import os
-from music_assistant.utils import run_periodic, run_async_background_task, LOGGER, try_parse_int
+from utils import run_periodic, run_async_background_task, LOGGER, try_parse_int
 import aiohttp
 from difflib import SequenceMatcher as Matcher
-from music_assistant.models import MediaType, Track, Artist, Album, Playlist
+from models import MediaType, Track, Artist, Album, Playlist
 from typing import List
 import toolz
 import operator

diff --git a/music_assistant/modules/musicproviders/file.py b/music_assistant/modules/musicproviders/file.py
index 82c9c609ae0d7be0b38e345a8fb42ee689ee8f4a..2a480ca21b71b658274da8d6ede31c321dce402b 100644 (file)
--- a/music_assistant/modules/musicproviders/file.py
+++ b/music_assistant/modules/musicproviders/file.py
@@ -6,11 +6,11 @@ import os
 from typing import List
 import sys
 import time
-from music_assistant.utils import run_periodic, LOGGER, parse_track_title
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_ENABLED
+from utils import run_periodic, LOGGER, parse_track_title
+from models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_ENABLED
 import taglib
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 
 
 def setup(mass):

diff --git a/music_assistant/modules/musicproviders/qobuz.py b/music_assistant/modules/musicproviders/qobuz.py
index bc8a4a01356fe58d4c9175cf962e16603168ee39..70a83b8ebc3edac183cc24b55a1549569825109b 100644 (file)
--- a/music_assistant/modules/musicproviders/qobuz.py
+++ b/music_assistant/modules/musicproviders/qobuz.py
@@ -4,16 +4,16 @@
 import asyncio
 import os
 from typing import List
-from music_assistant.utils import run_periodic, LOGGER, parse_track_title
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
+from utils import run_periodic, LOGGER, parse_track_title
+from models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
 import json
 import aiohttp
 import time
 import datetime
 import hashlib
 from asyncio_throttle import Throttler
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 
 
 def setup(mass):

diff --git a/music_assistant/modules/musicproviders/spotify.py b/music_assistant/modules/musicproviders/spotify.py
index f9f7420e80f575aaafca37cde5d6e034f0ba47f0..80c8b53213f67c1d151b24230623151c1771282e 100644 (file)
--- a/music_assistant/modules/musicproviders/spotify.py
+++ b/music_assistant/modules/musicproviders/spotify.py
@@ -6,13 +6,13 @@ import os
 from typing import List
 import sys
 import time
-from music_assistant.utils import run_periodic, LOGGER, parse_track_title, run_background_task
-from music_assistant.models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
+from utils import run_periodic, LOGGER, parse_track_title, run_background_task
+from models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
 from asyncio_throttle import Throttler
 import json
 import aiohttp
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 import concurrent
 
 def setup(mass):

diff --git a/music_assistant/modules/player.py b/music_assistant/modules/player.py
index c27ad3a4bb2820bc71a52c44bceef11aa26f1f54..6498372d2ad7d85f88612462f6af63b11d164dcf 100755 (executable)
--- a/music_assistant/modules/player.py
+++ b/music_assistant/modules/player.py
@@ -3,10 +3,10 @@
 
 import asyncio
 import os
-from music_assistant.utils import run_periodic, LOGGER, try_parse_int, try_parse_float, kill_proc
+from utils import run_periodic, LOGGER, try_parse_int, try_parse_float, kill_proc
 import aiohttp
 from difflib import SequenceMatcher as Matcher
-from music_assistant.models import MediaType, PlayerState, MusicPlayer
+from models import MediaType, PlayerState, MusicPlayer
 from typing import List
 import toolz
 import operator
@@ -190,7 +190,7 @@ class Player():
         if player_details.is_group and player.settings['apply_group_power']:
             await self.__update_player_group_power(player_details, player_childs)
         # compare values to detect changes
-        if player.cur_item.name != player_details.cur_item.name:
+        if player.cur_item and player_details.cur_item and player.cur_item.name != player_details.cur_item.name:
             player_changed = True
         player.cur_item = player_details.cur_item
         for key, cur_value in player.__dict__.items():

diff --git a/music_assistant/modules/playerproviders/chromecast.py b/music_assistant/modules/playerproviders/chromecast.py
index 8c6c8429c104c3c721a88dd5093264becd0ae07c..6c286489eb1239afac0077f5b9b8c945cee0b8fd 100644 (file)
--- a/music_assistant/modules/playerproviders/chromecast.py
+++ b/music_assistant/modules/playerproviders/chromecast.py
@@ -6,9 +6,9 @@ import os
 from typing import List
 import random
 import sys
-from music_assistant.utils import run_periodic, run_background_task, LOGGER, parse_track_title, try_parse_int
-from music_assistant.models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
+from utils import run_periodic, run_background_task, LOGGER, parse_track_title, try_parse_int
+from models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
 import json
 import aiohttp
 import time
@@ -16,7 +16,7 @@ import datetime
 import hashlib
 from asyncio_throttle import Throttler
 from aiocometd import Client, ConnectionType, Extension
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 import copy
 import pychromecast
 from pychromecast.controllers.multizone import MultizoneController

diff --git a/music_assistant/modules/playerproviders/lms.py b/music_assistant/modules/playerproviders/lms.py
index 640d8f2f8d007343d9b3d0f8c6a4373243f5868f..928f59f62f82ee5f0935a6bbf508bf20909e6488 100644 (file)
--- a/music_assistant/modules/playerproviders/lms.py
+++ b/music_assistant/modules/playerproviders/lms.py
@@ -6,9 +6,9 @@ import os
 from typing import List
 import random
 import sys
-from music_assistant.utils import run_periodic, LOGGER, parse_track_title
-from music_assistant.models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
-from music_assistant.constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
+from utils import run_periodic, LOGGER, parse_track_title
+from models import PlayerProvider, MusicPlayer, PlayerState, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
+from constants import CONF_ENABLED, CONF_HOSTNAME, CONF_PORT
 import json
 import aiohttp
 import time
@@ -16,7 +16,7 @@ import datetime
 import hashlib
 from asyncio_throttle import Throttler
 from aiocometd import Client, ConnectionType, Extension
-from music_assistant.modules.cache import use_cache
+from modules.cache import use_cache
 import copy
 
 def setup(mass):

diff --git a/music_assistant/modules/web.py b/music_assistant/modules/web.py
index 949a5623db0bb1717cbd7bef5c23eb7f975e639b..75d38dc8d8eaaeaa740e26144808673dcd853b30 100755 (executable)
--- a/music_assistant/modules/web.py
+++ b/music_assistant/modules/web.py
@@ -3,11 +3,11 @@
 
 import asyncio
 import os
-from music_assistant.utils import run_periodic, LOGGER
+from utils import run_periodic, LOGGER
 import json
 import aiohttp
 from aiohttp import web
-from music_assistant.models import MediaType, media_type_from_string
+from models import MediaType, media_type_from_string
 from functools import partial
 json_serializer = partial(json.dumps, default=lambda x: x.__dict__)
 import ssl