fix for internal_url
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 10 Sep 2020 22:34:38 +0000 (00:34 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 10 Sep 2020 22:34:38 +0000 (00:34 +0200)
music_assistant/models/player_queue.py
music_assistant/player_manager.py
music_assistant/providers/home_assistant/__init__.py

index 0aeb89e1f5c38366606baa9cf886b7a369c38c9d..65355d58e4d0ddcdba3988aa7871c352e3bce7d7 100755 (executable)
@@ -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)
index 02f6552437be58ae2b36bfb3cf60be088a0e23f8..e2898fe57772cf36fce2d8d4f3a7ac9a9a1b4e9d 100755 (executable)
@@ -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,
                 )
index dc788a8da73f252182c516363a94f54336a5fbd5..a2a90f2d622490e57d483766997027d2b79df7f9 100644 (file)
@@ -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)