Fix transparent PNG image thumbs

Author: marcelveldt

music_assistant/controllers/metadata.py

@@ -394,10 +394,12 @@ def get_image_url(
         image: MediaItemImage,
         size: int = 0,
         prefer_proxy: bool = False,
-        image_format: str = "png",
+        image_format: str | None = None,
         prefer_stream_server: bool = False,
     ) -> str:
         """Get (proxied) URL for MediaItemImage."""
+        if image_format is None:
+            image_format = "png" if image.path.lower().endswith(".png") else "jpg"
         if not image.remotely_accessible or prefer_proxy or size:
             # return imageproxy url for images that need to be resolved
             # the original path is double encoded
@@ -417,11 +419,13 @@ async def get_thumbnail(
         provider: str,
         size: int | None = None,
         base64: bool = False,
-        image_format: str = "png",
+        image_format: str | None = None,
     ) -> bytes | str:
         """Get/create thumbnail image for path (image url or local path)."""
         if not self.mass.get_provider(provider) and not path.startswith("http"):
             raise ProviderUnavailableError
+        if image_format is None:
+            image_format = "png" if path.lower().endswith(".png") else "jpg"
         if provider == "builtin" and path.startswith("/collage/"):
             # special case for collage images
             path = os.path.join(self._collage_images_dir, path.split("/collage/")[-1])
@@ -441,7 +445,9 @@ async def handle_imageproxy(self, request: web.Request) -> web.Response:
             # temporary for backwards compatibility
             provider = "builtin"
         size = int(request.query.get("size", "0"))
-        image_format = request.query.get("fmt", "png")
+        image_format = request.query.get("fmt", None)
+        if image_format is None:
+            image_format = "png" if path.lower().endswith(".png") else "jpg"
         if not self.mass.get_provider(provider) and not path.startswith("http"):
             return web.Response(status=404)
         if "%" in path:

music_assistant/helpers/images.py

@@ -74,6 +74,10 @@ async def get_image_thumb(
     if not size and image_format.encode() in img_data:
         return img_data
 
+    image_format = image_format.upper()
+    if image_format == "JPG":
+        image_format = "JPEG"
+
     def _create_image() -> bytes:
         data = BytesIO()
         try: