mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

not optional

This commit is contained in:
Kendall Garner 2024-03-13 07:07:00 -07:00
parent 7745555943
commit aacbb800ec
No known key found for this signature in database
GPG Key ID: 18D2767419676C87
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/subsonic/helpers.go
View File

@ -15,7 +15,6 @@ import (
"github.com/navidrome/navidrome/model/request"
"github.com/navidrome/navidrome/server/public"
"github.com/navidrome/navidrome/server/subsonic/responses"
"github.com/navidrome/navidrome/utils/gg"
)
func newResponse() *responses.Subsonic {
@ -321,12 +320,8 @@ func buildAlbumID3(ctx context.Context, album model.Album) responses.AlbumID3 {
dir.MusicBrainzId = album.MbzAlbumID
dir.IsCompilation = album.Compilation
dir.SortName = album.SortAlbumName
if album.OriginalDate != "" {
dir.OriginalReleaseDate = gg.P(toItemDate(album.OriginalDate))
}
if album.ReleaseDate != "" {
dir.ReleaseDate = gg.P(toItemDate(album.ReleaseDate))
}
dir.OriginalReleaseDate = toItemDate(album.OriginalDate)
dir.ReleaseDate = toItemDate(album.ReleaseDate)
return dir
}

4
server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match .JSON
View File

@ -12,6 +12,8 @@
"musicBrainzId": "",
"isCompilation": false,
"sortName": "",
"discTitles": []
"discTitles": [],
"originalReleaseDate": {},
"releaseDate": {}
}
}

5
server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match .XML
View File

@ -1,3 +1,6 @@
<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
<album id="" name="" userRating="0" musicBrainzId="" isCompilation="false" sortName=""></album>
<album id="" name="" userRating="0" musicBrainzId="" isCompilation="false" sortName="">
<originalReleaseDate></originalReleaseDate>
<releaseDate></releaseDate>
</album>
</subsonic-response>

4
server/subsonic/responses/responses.go
View File

@ -231,8 +231,8 @@ type AlbumID3 struct {
IsCompilation bool `xml:"isCompilation,attr" json:"isCompilation"`
SortName string `xml:"sortName,attr" json:"sortName"`
DiscTitles DiscTitles `xml:"discTitles" json:"discTitles"`
OriginalReleaseDate *ItemDate `xml:"originalReleaseDate" json:"originalReleaseDate,omitempty"`
ReleaseDate *ItemDate `xml:"releaseDate" json:"releaseDate,omitempty"`
OriginalReleaseDate ItemDate `xml:"originalReleaseDate" json:"originalReleaseDate,omitempty"`
ReleaseDate ItemDate `xml:"releaseDate" json:"releaseDate,omitempty"`
}
type ArtistWithAlbumsID3 struct {

4
server/subsonic/responses/responses_test.go
View File

@ -177,8 +177,8 @@ var _ = Describe("Responses", func() {
Genres: []ItemGenre{{Name: "rock"}, {Name: "progressive"}},
MusicBrainzId: "1234", IsCompilation: true, SortName: "sorted album",
DiscTitles: DiscTitles{{Disc: 1, Title: "disc 1"}, {Disc: 2, Title: "disc 2"}},
OriginalReleaseDate: &ItemDate{Year: 1994, Month: 2, Day: 4},
ReleaseDate: &ItemDate{Year: 2000, Month: 5, Day: 10},
OriginalReleaseDate: ItemDate{Year: 1994, Month: 2, Day: 4},
ReleaseDate: ItemDate{Year: 2000, Month: 5, Day: 10},
}
t := time.Date(2016, 03, 2, 20, 30, 0, 0, time.UTC)
songs := []Child{{