Merge branch 'master' into radio-browser-search/5239

consts/consts.go

@@ -70,8 +70,6 @@ const (
 	PlaceholderArtistArt      = "artist-placeholder.webp"
 	PlaceholderAlbumArt       = "album-placeholder.webp"
 	PlaceholderAvatar         = "logo-192x192.png"
-	UICoverArtSize            = 300
-	UIThumbnailSize           = 80
 	DefaultUIVolume           = 100
 	DefaultUISearchDebounceMs = 200
 
@@ -86,6 +84,12 @@ const (
 	Zwsp                    = string('\u200b')
 )
 
+const (
+	UICoverArtSize = 600
+)
+
+var CacheWarmerImageSizes = []int{UICoverArtSize}
+
 // Prometheus options
 const (
 	PrometheusDefaultPath = "/metrics"

core/artwork/cache_warmer.go

@@ -142,15 +142,14 @@ func (a *cacheWarmer) doCacheImage(ctx context.Context, id model.ArtworkID) erro
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()
 
-	for _, size := range []int{consts.UICoverArtSize, consts.UIThumbnailSize} {
+	for _, size := range consts.CacheWarmerImageSizes {
 		r, _, err := a.artwork.Get(ctx, id, size, true)
 		if err != nil {
 			return fmt.Errorf("caching id='%s', size=%d: %w", id, size, err)
 		}
-		defer r.Close()
+		_, err = io.Copy(io.Discard, r)
-		if _, err = io.Copy(io.Discard, r); err != nil {
+		r.Close()
-			return err
+		return err
-		}
 	}
 	return nil
 }

core/artwork/cache_warmer_test.go

@@ -176,13 +176,13 @@ var _ = Describe("CacheWarmer", func() {
 			}).Should(Equal(0))
 		})
 
-		It("pre-caches both UICoverArtSize and UIThumbnailSize", func() {
+		It("pre-caches UICoverArtSize", func() {
 			cw := NewCacheWarmer(aw, fc).(*cacheWarmer)
 			cw.PreCache(model.MustParseArtworkID("al-1"))
 
 			Eventually(func() []int {
 				return aw.getCachedSizes()
-			}).Should(ContainElements(consts.UICoverArtSize, consts.UIThumbnailSize))
+			}).Should(ContainElements(consts.UICoverArtSize))
 		})
 	})
 })

core/artwork/reader_playlist.go

@@ -264,6 +264,6 @@ func fillCenter(src image.Image, dstW, dstH int) image.Image {
 	}
 
 	dst := image.NewNRGBA(image.Rect(0, 0, dstW, dstH))
-	xdraw.BiLinear.Scale(dst, dst.Bounds(), src, cropRect, draw.Src, nil)
+	xdraw.CatmullRom.Scale(dst, dst.Bounds(), src, cropRect, draw.Src, nil)
 	return dst
 }

core/artwork/reader_resized.go

@@ -155,7 +155,7 @@ func resizeStaticImage(data []byte, size int, square bool) (io.Reader, int, erro
 		dst = image.NewNRGBA(image.Rect(0, 0, dstW, dstH))
 		dstRect = dst.Bounds()
 	}
-	xdraw.BiLinear.Scale(dst, dstRect, original, bounds, draw.Src, nil)
+	xdraw.CatmullRom.Scale(dst, dstRect, original, bounds, draw.Src, nil)
 
 	buf := bufPool.Get().(*bytes.Buffer)
 	buf.Reset()

server/subsonic/radio.go

@@ -2,8 +2,11 @@ package subsonic
 
 import (
 	"net/http"
+	"strings"
 
+	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/server/subsonic/responses"
 	"github.com/navidrome/navidrome/utils/req"
 )
@@ -66,6 +69,15 @@ func (api *Router) GetInternetRadios(r *http.Request) (*responses.Subsonic, erro
 			StreamUrl:   g.StreamUrl,
 			HomepageUrl: g.HomePageUrl,
 		}
+
+		player, _ := request.PlayerFrom(ctx)
+		if strings.Contains(conf.Server.Subsonic.LegacyClients, player.Client) {
+			continue
+		}
+		// Add coverArt if not legacy client
+		res[i].OpenSubsonicRadio = &responses.OpenSubsonicRadio{
+			CoverArt: g.UploadedImage,
+		}
 	}
 
 	response := newResponse()

server/subsonic/radio_test.go

@@ -0,0 +1,146 @@
+package subsonic
+
+import (
+	"context"
+	"net/http/httptest"
+
+	"github.com/navidrome/navidrome/conf"
+	"github.com/navidrome/navidrome/conf/configtest"
+	"github.com/navidrome/navidrome/core/auth"
+	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/model/request"
+	"github.com/navidrome/navidrome/tests"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Radio", func() {
+	var api *Router
+	var ds *tests.MockDataStore
+	var ctx context.Context
+	var radioRepo *tests.MockedRadioRepo
+
+	BeforeEach(func() {
+		ds = &tests.MockDataStore{}
+		auth.Init(ds)
+		api = &Router{ds: ds}
+		ctx = context.Background()
+		radioRepo = tests.CreateMockedRadioRepo()
+		ds.MockedRadio = radioRepo
+	})
+
+	Describe("GetInternetRadios", func() {
+		BeforeEach(func() {
+			radioRepo.All = model.Radios{
+				{ID: "rd-1", Name: "Radio 1", StreamUrl: "http://stream1.example.com", HomePageUrl: "http://home1.example.com", UploadedImage: "rd-1_cover.jpg"},
+				{ID: "rd-2", Name: "Radio 2", StreamUrl: "http://stream2.example.com"},
+			}
+		})
+
+		It("returns all radios with basic fields", func() {
+			r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+			r = r.WithContext(ctx)
+
+			response, err := api.GetInternetRadios(r)
+
+			Expect(err).ToNot(HaveOccurred())
+			Expect(response.InternetRadioStations).ToNot(BeNil())
+			Expect(response.InternetRadioStations.Radios).To(HaveLen(2))
+			Expect(response.InternetRadioStations.Radios[0].ID).To(Equal("rd-1"))
+			Expect(response.InternetRadioStations.Radios[0].Name).To(Equal("Radio 1"))
+			Expect(response.InternetRadioStations.Radios[0].StreamUrl).To(Equal("http://stream1.example.com"))
+			Expect(response.InternetRadioStations.Radios[0].HomepageUrl).To(Equal("http://home1.example.com"))
+			Expect(response.InternetRadioStations.Radios[1].ID).To(Equal("rd-2"))
+			Expect(response.InternetRadioStations.Radios[1].HomepageUrl).To(BeEmpty())
+		})
+
+		Context("with a non-legacy client", func() {
+			BeforeEach(func() {
+				DeferCleanup(configtest.SetupConfig())
+				conf.Server.Subsonic.LegacyClients = "legacy-client"
+				player := model.Player{Client: "modern-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("includes coverArt from UploadedImage", func() {
+				r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+				r = r.WithContext(ctx)
+
+				response, err := api.GetInternetRadios(r)
+
+				Expect(err).ToNot(HaveOccurred())
+				Expect(response.InternetRadioStations.Radios).To(HaveLen(2))
+				Expect(response.InternetRadioStations.Radios[0].OpenSubsonicRadio).ToNot(BeNil())
+				Expect(response.InternetRadioStations.Radios[0].CoverArt).To(Equal("rd-1_cover.jpg"))
+				Expect(response.InternetRadioStations.Radios[1].OpenSubsonicRadio).ToNot(BeNil())
+				Expect(response.InternetRadioStations.Radios[1].CoverArt).To(BeEmpty())
+			})
+		})
+
+		Context("with a legacy client", func() {
+			BeforeEach(func() {
+				DeferCleanup(configtest.SetupConfig())
+				conf.Server.Subsonic.LegacyClients = "legacy-client"
+				player := model.Player{Client: "legacy-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("does not include coverArt", func() {
+				r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+				r = r.WithContext(ctx)
+
+				response, err := api.GetInternetRadios(r)
+
+				Expect(err).ToNot(HaveOccurred())
+				Expect(response.InternetRadioStations.Radios).To(HaveLen(2))
+				Expect(response.InternetRadioStations.Radios[0].OpenSubsonicRadio).To(BeNil())
+				Expect(response.InternetRadioStations.Radios[1].OpenSubsonicRadio).To(BeNil())
+			})
+		})
+
+		Context("when no player in context", func() {
+			It("does not include coverArt (empty client matches legacy list)", func() {
+				DeferCleanup(configtest.SetupConfig())
+				conf.Server.Subsonic.LegacyClients = "legacy-client"
+
+				r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+				r = r.WithContext(ctx)
+
+				response, err := api.GetInternetRadios(r)
+
+				Expect(err).ToNot(HaveOccurred())
+				Expect(response.InternetRadioStations.Radios[0].OpenSubsonicRadio).To(BeNil())
+			})
+		})
+
+		Context("when legacy clients list is empty", func() {
+			BeforeEach(func() {
+				DeferCleanup(configtest.SetupConfig())
+				conf.Server.Subsonic.LegacyClients = ""
+				player := model.Player{Client: "any-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("includes coverArt for all clients", func() {
+				r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+				r = r.WithContext(ctx)
+
+				response, err := api.GetInternetRadios(r)
+
+				Expect(err).ToNot(HaveOccurred())
+				Expect(response.InternetRadioStations.Radios[0].OpenSubsonicRadio).ToNot(BeNil())
+				Expect(response.InternetRadioStations.Radios[0].CoverArt).To(Equal("rd-1_cover.jpg"))
+			})
+		})
+
+		It("returns error when repository fails", func() {
+			radioRepo.SetError(true)
+
+			r := httptest.NewRequest("GET", "/rest/getInternetRadios", nil)
+			r = r.WithContext(ctx)
+
+			_, err := api.GetInternetRadios(r)
+			Expect(err).To(HaveOccurred())
+		})
+	})
+})

server/subsonic/responses/responses.go

@@ -509,10 +509,15 @@ type InternetRadioStations struct {
 }
 
 type Radio struct {
-	ID          string `xml:"id,attr"                    json:"id"`
+	ID                 string `xml:"id,attr"                    json:"id"`
-	Name        string `xml:"name,attr"                  json:"name"`
+	Name               string `xml:"name,attr"                  json:"name"`
-	StreamUrl   string `xml:"streamUrl,attr"             json:"streamUrl"`
+	StreamUrl          string `xml:"streamUrl,attr"             json:"streamUrl"`
-	HomepageUrl string `xml:"homePageUrl,omitempty,attr" json:"homePageUrl,omitempty"`
+	HomepageUrl        string `xml:"homePageUrl,omitempty,attr" json:"homePageUrl,omitempty"`
+	*OpenSubsonicRadio `xml:",omitempty" json:",omitempty"`
+}
+
+type OpenSubsonicRadio struct {
+	CoverArt string `xml:"coverArt,attr,omitempty"  json:"coverArt"`
 }
 
 type JukeboxStatus struct {

ui/src/album/AlbumDetails.jsx

@@ -18,6 +18,7 @@ import {
   useTranslate,
 } from 'react-admin'
 import Lightbox from 'react-image-lightbox'
+import { COVER_ART_SIZE } from '../consts'
 import 'react-image-lightbox/style.css'
 import subsonic from '../subsonic'
 import {
@@ -254,7 +255,7 @@ const AlbumDetails = (props) => {
       })
   }, [record])
 
-  const imageUrl = subsonic.getCoverArtUrl(record, 300)
+  const imageUrl = subsonic.getCoverArtUrl(record, COVER_ART_SIZE)
   const fullImageUrl = subsonic.getCoverArtUrl(record)
 
   return (

ui/src/album/AlbumGridView.jsx

@@ -19,7 +19,7 @@ import {
   ArtistLinkField,
   OverflowTooltip,
 } from '../common'
-import { DraggableTypes } from '../consts'
+import { COVER_ART_SIZE, DraggableTypes } from '../consts'
 import clsx from 'clsx'
 import { AlbumDatesField } from './AlbumDatesField.jsx'
 
@@ -157,7 +157,7 @@ const Cover = withContentRect('bounds')(({
       <div ref={dragAlbumRef}>
         <img
           key={record.id} // Force re-render when record changes
-          src={subsonic.getCoverArtUrl(record, 300, true)}
+          src={subsonic.getCoverArtUrl(record, COVER_ART_SIZE, true)}
           alt={record.name}
           className={`${classes.cover} ${imageLoading ? classes.coverLoading : ''}`}
           onLoad={handleImageLoad}

ui/src/artist/DesktopArtistDetails.jsx

@@ -15,6 +15,7 @@ import {
 import Lightbox from 'react-image-lightbox'
 import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'
 import AlbumInfo from '../album/AlbumInfo'
+import { COVER_ART_SIZE } from '../consts'
 import subsonic from '../subsonic'
 import { SafeHTML } from '../common/SafeHTML'
 
@@ -109,7 +110,7 @@ const DesktopArtistDetails = ({ artistInfo, record, biography }) => {
             <CardMedia
               key={record.id}
               component="img"
-              src={subsonic.getCoverArtUrl(record, 300)}
+              src={subsonic.getCoverArtUrl(record, COVER_ART_SIZE)}
               className={`${classes.cover} ${imageLoading ? classes.coverLoading : ''}`}
               onClick={handleOpenLightbox}
               onLoad={handleImageLoad}

ui/src/artist/MobileArtistDetails.jsx

@@ -11,6 +11,7 @@ import {
   useImageLoadingState,
 } from '../common'
 import Lightbox from 'react-image-lightbox'
+import { COVER_ART_SIZE } from '../consts'
 import subsonic from '../subsonic'
 import { SafeHTML } from '../common/SafeHTML'
 
@@ -112,7 +113,7 @@ const MobileArtistDetails = ({ artistInfo, biography, record }) => {
               <CardMedia
                 key={record.id}
                 component="img"
-                src={subsonic.getCoverArtUrl(record, 300)}
+                src={subsonic.getCoverArtUrl(record, COVER_ART_SIZE)}
                 className={`${classes.cover} ${imageLoading ? classes.coverLoading : ''}`}
                 onClick={handleOpenLightbox}
                 onLoad={handleImageLoad}

ui/src/common/CoverArtAvatar.jsx

@@ -2,6 +2,7 @@ import { useRecordContext } from 'react-admin'
 import { Avatar } from '@material-ui/core'
 import { makeStyles } from '@material-ui/core/styles'
 import clsx from 'clsx'
+import { COVER_ART_SIZE } from '../consts'
 import subsonic from '../subsonic'
 
 const useStyles = makeStyles({
@@ -25,7 +26,7 @@ export const CoverArtAvatar = ({
   const square = variant !== 'circular'
   return (
     <Avatar
-      src={subsonic.getCoverArtUrl(record, 80, square)}
+      src={subsonic.getCoverArtUrl(record, COVER_ART_SIZE, square)}
       variant={variant}
       className={clsx(classes.avatar, square && classes.square)}
       alt={record.name}

ui/src/consts.js

@@ -26,6 +26,8 @@ DraggableTypes.ALL.push(
 
 export const RADIO_PLACEHOLDER_IMAGE = 'internet-radio-icon.svg'
 
+export const COVER_ART_SIZE = 600
+
 export const DEFAULT_SHARE_BITRATE = 128
 
 export const BITRATE_CHOICES = [

ui/src/playlist/PlaylistDetails.jsx

@@ -18,6 +18,7 @@ import {
   OverflowTooltip,
   useImageLoadingState,
 } from '../common'
+import { COVER_ART_SIZE } from '../consts'
 import subsonic from '../subsonic'
 
 const useStyles = makeStyles(
@@ -106,7 +107,7 @@ const PlaylistDetails = (props) => {
     handleCloseLightbox,
   } = useImageLoadingState(record.id)
 
-  const imageUrl = subsonic.getCoverArtUrl(record, 300, true)
+  const imageUrl = subsonic.getCoverArtUrl(record, COVER_ART_SIZE, true)
   const fullImageUrl = subsonic.getCoverArtUrl(record)
 
   return (

ui/src/radio/RadioEdit.jsx

@@ -11,7 +11,7 @@ import { makeStyles } from '@material-ui/core/styles'
 import { urlValidate } from '../utils/validations'
 import { Title, ImageUploadOverlay, useImageLoadingState } from '../common'
 import subsonic from '../subsonic'
-import { RADIO_PLACEHOLDER_IMAGE } from '../consts'
+import { COVER_ART_SIZE, RADIO_PLACEHOLDER_IMAGE } from '../consts'
 
 const useStyles = makeStyles({
   coverParent: {
@@ -83,7 +83,7 @@ const RadioCoverArt = ({ record }) => {
       {record.uploadedImage ? (
         <CardMedia
           component="img"
-          src={subsonic.getCoverArtUrl(record, 300, true)}
+          src={subsonic.getCoverArtUrl(record, COVER_ART_SIZE, true)}
           className={`${classes.cover} ${imageLoading ? classes.coverLoading : ''}`}
           onLoad={handleImageLoad}
           onError={handleImageError}

ui/src/radio/helper.jsx

@@ -1,5 +1,5 @@
 import subsonic from '../subsonic'
-import { RADIO_PLACEHOLDER_IMAGE } from '../consts'
+import { COVER_ART_SIZE, RADIO_PLACEHOLDER_IMAGE } from '../consts'
 
 export async function songFromRadio(radio) {
   if (!radio) {
@@ -8,7 +8,7 @@ export async function songFromRadio(radio) {
 
   let cover = RADIO_PLACEHOLDER_IMAGE
   if (radio.uploadedImage) {
-    cover = subsonic.getCoverArtUrl(radio, 300, true)
+    cover = subsonic.getCoverArtUrl(radio, COVER_ART_SIZE, true)
   } else {
     // Try favicon as fallback
     try {

ui/src/subsonic/index.test.js

@@ -1,4 +1,5 @@
 import { vi } from 'vitest'
+import { COVER_ART_SIZE } from '../consts'
 import subsonic from './index'
 
 describe('getCoverArtUrl', () => {
@@ -30,10 +31,10 @@ describe('getCoverArtUrl', () => {
       updatedAt: '2023-01-01T00:00:00Z',
     }
 
-    const url = subsonic.getCoverArtUrl(playlistRecord, 300, true)
+    const url = subsonic.getCoverArtUrl(playlistRecord, COVER_ART_SIZE, true)
 
     expect(url).toContain('pl-playlist-123')
-    expect(url).toContain('size=300')
+    expect(url).toContain('size=600')
     expect(url).toContain('square=true')
     expect(url).toContain('_=2023-01-01T00%3A00%3A00Z')
   })
@@ -44,10 +45,10 @@ describe('getCoverArtUrl', () => {
       sync: true,
     }
 
-    const url = subsonic.getCoverArtUrl(playlistRecord, 300, true)
+    const url = subsonic.getCoverArtUrl(playlistRecord, COVER_ART_SIZE, true)
 
     expect(url).toContain('pl-playlist-123')
-    expect(url).toContain('size=300')
+    expect(url).toContain('size=600')
     expect(url).toContain('square=true')
     expect(url).not.toContain('_=')
   })
@@ -59,10 +60,10 @@ describe('getCoverArtUrl', () => {
       updatedAt: '2023-01-01T00:00:00Z',
     }
 
-    const url = subsonic.getCoverArtUrl(albumRecord, 300, true)
+    const url = subsonic.getCoverArtUrl(albumRecord, COVER_ART_SIZE, true)
 
     expect(url).toContain('al-album-123')
-    expect(url).toContain('size=300')
+    expect(url).toContain('size=600')
     expect(url).toContain('square=true')
   })
 
@@ -73,10 +74,10 @@ describe('getCoverArtUrl', () => {
       updatedAt: '2023-01-01T00:00:00Z',
     }
 
-    const url = subsonic.getCoverArtUrl(songRecord, 300, true)
+    const url = subsonic.getCoverArtUrl(songRecord, COVER_ART_SIZE, true)
 
     expect(url).toContain('mf-song-123')
-    expect(url).toContain('size=300')
+    expect(url).toContain('size=600')
     expect(url).toContain('square=true')
   })
 
@@ -86,10 +87,10 @@ describe('getCoverArtUrl', () => {
       updatedAt: '2023-01-01T00:00:00Z',
     }
 
-    const url = subsonic.getCoverArtUrl(artistRecord, 300, true)
+    const url = subsonic.getCoverArtUrl(artistRecord, COVER_ART_SIZE, true)
 
     expect(url).toContain('ar-artist-123')
-    expect(url).toContain('size=300')
+    expect(url).toContain('size=600')
     expect(url).toContain('square=true')
   })