Merge c1f12d148dcdda283f479f7b84ddeb749620be99 into 6109bf519228b6cd6ae6b6a8b06a6a8c4e7a6cae

conf/configuration.go

@@ -716,12 +716,10 @@ func setViperDefaults() {
 	viper.SetDefault("ignoredarticles", "The El La Los Las Le Les Os As O A")
 	viper.SetDefault("indexgroups", "A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)")
 	viper.SetDefault("ffmpegpath", "")
-	viper.SetDefault("mpvpath", "")
 	viper.SetDefault("mpvcmdtemplate", "mpv --audio-device=%d --no-audio-display %f --input-ipc-server=%s")
 	viper.SetDefault("coverartpriority", "cover.*, folder.*, front.*, embedded, external")
 	viper.SetDefault("coverartquality", 75)
 	viper.SetDefault("artistartpriority", "artist.*, album/artist.*, external")
-	viper.SetDefault("artistimagefolder", "")
 	viper.SetDefault("discartpriority", "disc*.*, cd*.*, cover.*, folder.*, front.*, discsubtitle, embedded")
 	viper.SetDefault("lyricspriority", ".lrc,.txt,embedded")
 	viper.SetDefault("enablegravatar", false)
@@ -800,7 +798,6 @@ func setViperDefaults() {
 	viper.SetDefault("plugins.enabled", true)
 	viper.SetDefault("plugins.cachesize", "200MB")
 	viper.SetDefault("plugins.autoreload", false)
-	viper.SetDefault("plugins.loglevel", "")
 
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	viper.SetDefault("devlogsourceline", false)

server/subsonic/playlists.go

@@ -159,10 +159,6 @@ func (api *Router) buildPlaylist(ctx context.Context, p model.Playlist) response
 }
 
 func buildOSPlaylist(ctx context.Context, p model.Playlist) *responses.OpenSubsonicPlaylist {
-	player, ok := request.PlayerFrom(ctx)
-	if ok && isClientInList(conf.Server.Subsonic.LegacyClients, player.Client) {
-		return nil
-	}
 	pls := responses.OpenSubsonicPlaylist{}
 
 	if p.IsSmartPlaylist() {

server/subsonic/playlists_test.go

@@ -128,23 +128,6 @@ var _ = Describe("buildPlaylist", func() {
 			})
 		})
 
-		Context("with legacy client", func() {
-			BeforeEach(func() {
-				conf.Server.Subsonic.LegacyClients = "legacy-client"
-				player := model.Player{Client: "legacy-client"}
-				ctx = request.WithPlayer(ctx, player)
-			})
-
-			It("returns all standard fields but no OpenSubsonic extensions", func() {
-				result := router.buildPlaylist(ctx, playlist)
-
-				Expect(result.Comment).To(Equal("Test comment"))
-				Expect(result.Owner).To(Equal("admin"))
-				Expect(result.Public).To(BeTrue())
-				Expect(result.OpenSubsonicPlaylist).To(BeNil())
-			})
-		})
-
 		Context("when no player in context", func() {
 			It("returns all fields", func() {
 				result := router.buildPlaylist(ctx, playlist)
@@ -230,23 +213,6 @@ var _ = Describe("buildPlaylist", func() {
 				Expect(result.ValidUntil).To(Equal(&validUntil))
 			})
 		})
-
-		Context("with legacy client", func() {
-			BeforeEach(func() {
-				conf.Server.Subsonic.LegacyClients = "legacy-client"
-				player := model.Player{Client: "legacy-client"}
-				ctx = request.WithPlayer(ctx, player)
-			})
-
-			It("returns standard fields but no OpenSubsonic extensions", func() {
-				result := router.buildPlaylist(ctx, playlist)
-
-				Expect(result.Comment).To(Equal("Test comment"))
-				Expect(result.Owner).To(Equal("admin"))
-				Expect(result.Public).To(BeTrue())
-				Expect(result.OpenSubsonicPlaylist).To(BeNil())
-			})
-		})
 	})
 })
 

server/subsonic/radio.go

@@ -75,12 +75,8 @@ func (api *Router) GetInternetRadios(r *http.Request) (*responses.Subsonic, erro
 			continue
 		}
 		// Add coverArt if not legacy client
-		var coverArt string
-		if g.UploadedImage != "" {
-			coverArt = g.CoverArtID().String()
-		}
 		res[i].OpenSubsonicRadio = &responses.OpenSubsonicRadio{
-			CoverArt: coverArt,
+			CoverArt: g.UploadedImage,
 		}
 	}
 

server/subsonic/radio_test.go

@@ -71,7 +71,7 @@ var _ = Describe("Radio", func() {
 				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("ra-rd-1_0"))
+				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())
 			})
@@ -129,7 +129,7 @@ var _ = Describe("Radio", func() {
 
 				Expect(err).ToNot(HaveOccurred())
 				Expect(response.InternetRadioStations.Radios[0].OpenSubsonicRadio).ToNot(BeNil())
-				Expect(response.InternetRadioStations.Radios[0].CoverArt).To(Equal("ra-rd-1_0"))
+				Expect(response.InternetRadioStations.Radios[0].CoverArt).To(Equal("rd-1_cover.jpg"))
 			})
 		})