From 8357b9130f6db6b9f1b8f55e54e713799ec87706 Mon Sep 17 00:00:00 2001
From: Marvin Schenkel <marvinschenkel@gmail.com>
Date: Wed, 22 Mar 2023 17:20:16 +0100
Subject: [PATCH] Escape didl image url and disable throttling. (#561)

---
 music_assistant/server/controllers/streams.py | 13 +++++++------
 music_assistant/server/helpers/didl_lite.py   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/music_assistant/server/controllers/streams.py b/music_assistant/server/controllers/streams.py
index a1d665c8..152321d2 100644
--- a/music_assistant/server/controllers/streams.py
+++ b/music_assistant/server/controllers/streams.py
@@ -421,13 +421,14 @@ class StreamsController:
                     await resp.write(chunk)
                     bytes_streamed += len(chunk)
 
+                    # DISABLE FOR NOW TO AVOID ISSUES WITH SONOS ICW YOUTUBE MUSIC
                     # do not allow the player to prebuffer more than 30 seconds
-                    seconds_streamed = int(bytes_streamed / stream_job.pcm_sample_size)
-                    if (
-                        seconds_streamed > 30
-                        and (seconds_streamed - player.corrected_elapsed_time) > 30
-                    ):
-                        await asyncio.sleep(1)
+                    # seconds_streamed = int(bytes_streamed / stream_job.pcm_sample_size)
+                    # if (
+                    #     seconds_streamed > 30
+                    #     and (seconds_streamed - player.corrected_elapsed_time) > 30
+                    # ):
+                    #     await asyncio.sleep(1)
 
                     if not enable_icy:
                         continue
diff --git a/music_assistant/server/helpers/didl_lite.py b/music_assistant/server/helpers/didl_lite.py
index 7c1f5149..d5be2943 100644
--- a/music_assistant/server/helpers/didl_lite.py
+++ b/music_assistant/server/helpers/didl_lite.py
@@ -39,7 +39,7 @@ def create_didl_metadata(url: str, queue_item: QueueItem, flow_mode: bool = Fals
             '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/">'
             f'<item id="{queue_item.queue_item_id}" parentID="0" restricted="1">'
             f"<dc:title>{_escape_str(queue_item.name)}</dc:title>"
-            f"<upnp:albumArtURI>{queue_item.image_url}</upnp:albumArtURI>"
+            f"<upnp:albumArtURI>{_escape_str(queue_item.image_url)}</upnp:albumArtURI>"
             f"<dc:queueItemId>{image}</dc:queueItemId>"
             "<upnp:class>object.item.audioItem.audioBroadcast</upnp:class>"
             f"<upnp:mimeType>audio/{ext}</upnp:mimeType>"
-- 
2.34.1