From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 10 Sep 2020 22:34:38 +0000 (+0200)
Subject: fix for internal_url
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=06880816735d2dcfe09d24319bad303e352b7319;p=music-assistant-server.git

fix for internal_url
---

diff --git a/music_assistant/models/player_queue.py b/music_assistant/models/player_queue.py
index 0aeb89e1..65355d58 100755
--- a/music_assistant/models/player_queue.py
+++ b/music_assistant/models/player_queue.py
@@ -275,9 +275,8 @@ class PlayerQueue:
             return
         if self.use_queue_stream:
             self._next_queue_startindex = index
-            queue_stream_uri = "http://%s:%s/stream/%s" % (
-                self.mass.web.local_ip,
-                self.mass.web.http_port,
+            queue_stream_uri = "%s/stream/%s" % (
+                self.mass.web.internal_url,
                 self.player.player_id,
             )
             return await player_prov.async_cmd_play_uri(self.player_id, queue_stream_uri)
diff --git a/music_assistant/player_manager.py b/music_assistant/player_manager.py
index 02f65524..e2898fe5 100755
--- a/music_assistant/player_manager.py
+++ b/music_assistant/player_manager.py
@@ -224,9 +224,8 @@ class PlayerManager:
             async for track in tracks:
                 queue_item = QueueItem(track)
                 # generate uri for this queue item
-                queue_item.uri = "http://%s:%s/stream/%s/%s" % (
-                    self.mass.web.local_ip,
-                    self.mass.web.http_port,
+                queue_item.uri = "%s/stream/%s/%s" % (
+                    self.mass.web.internal_url,
                     player_id,
                     queue_item.queue_item_id,
                 )
diff --git a/music_assistant/providers/home_assistant/__init__.py b/music_assistant/providers/home_assistant/__init__.py
index dc788a8d..a2a90f2d 100644
--- a/music_assistant/providers/home_assistant/__init__.py
+++ b/music_assistant/providers/home_assistant/__init__.py
@@ -257,9 +257,9 @@ class HomeAssistantPlugin(Provider):
             "mass_player_id": player_id,
         }
         if cur_item:
-            host = f"{self.mass.web.local_ip}:{self.mass.web.http_port}"
+            host = self.mass.web.internal_url
             item_type = "radio" if cur_item.media_type == MediaType.Radio else "track"
-            img_url = f"http://{host}/api/{item_type}/{cur_item.item_id}/thumb?provider={cur_item.provider}"
+            img_url = f"{host}/api/{item_type}/{cur_item.item_id}/thumb?provider={cur_item.provider}"
             state_attributes["entity_picture"] = img_url
         self._published_players[entity_id] = player.player_id
         await self._hass.async_set_state(entity_id, player.state, state_attributes)