🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
refactor(scanner): refactor legacyReleaseDate logic and add tests for date mapping
Deluand57a8e6d84c8
diff --git a/model/metadata/legacy_ids.go b/model/metadata/legacy_ids.goindex 0a3bf0bf3..18a273550 100644--- a/model/metadata/legacy_ids.go+++ b/model/metadata/legacy_ids.go@@ -23,7 +23,7 @@ func legacyTrackID(mf model.MediaFile, prependLibId bool) string {}func legacyAlbumID(mf model.MediaFile, md Metadata, prependLibId bool) string {- releaseDate := legacyReleaseDate(md)+ _, _, releaseDate := md.mapDates()albumPath := strings.ToLower(fmt.Sprintf("%s\\%s", legacyMapAlbumArtistName(md), legacyMapAlbumName(md)))if !conf.Server.Scanner.GroupAlbumReleases {if len(releaseDate) != 0 {@@ -55,9 +55,3 @@ func legacyMapAlbumName(md Metadata) string {consts.UnknownAlbum,)}--// Keep the TaggedLikePicard logic for backwards compatibility-func legacyReleaseDate(md Metadata) string {- _, _, releaseDate := md.mapDates()- return string(releaseDate)-}diff --git a/model/metadata/legacy_ids_test.go b/model/metadata/legacy_ids_test.godeleted file mode 100644index b6d096763..000000000--- a/model/metadata/legacy_ids_test.go+++ /dev/null@@ -1,30 +0,0 @@-package metadata--import (- . "github.com/onsi/ginkgo/v2"- . "github.com/onsi/gomega"-)--var _ = Describe("legacyReleaseDate", func() {-- DescribeTable("legacyReleaseDate",- func(recordingDate, originalDate, releaseDate, expected string) {- md := New("", Info{- Tags: map[string][]string{- "DATE": {recordingDate},- "ORIGINALDATE": {originalDate},- "RELEASEDATE": {releaseDate},- },- })-- result := legacyReleaseDate(md)- Expect(result).To(Equal(expected))- },- Entry("regular mapping", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),- Entry("legacy mapping", "2020-05-15", "2019-02-10", "", "2020-05-15"),- Entry("legacy mapping, originalYear < year", "2018-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),- Entry("legacy mapping, originalYear empty", "2020-05-15", "", "2021-01-01", "2021-01-01"),- Entry("legacy mapping, releaseYear", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),- Entry("legacy mapping, same dates", "2020-05-15", "2020-05-15", "", "2020-05-15"),- )-})diff --git a/model/metadata/map_mediafile_test.go b/model/metadata/map_mediafile_test.goindex ddda39bc2..e3adf3fae 100644--- a/model/metadata/map_mediafile_test.go+++ b/model/metadata/map_mediafile_test.go@@ -75,6 +75,23 @@ var _ = Describe("ToMediaFile", func() {Expect(mf.OriginalYear).To(Equal(1966))Expect(mf.ReleaseYear).To(Equal(2014))})+ DescribeTable("legacyReleaseDate (TaggedLikePicard old behavior)",+ func(recordingDate, originalDate, releaseDate, expected string) {+ mf := toMediaFile(model.RawTags{+ "DATE": {recordingDate},+ "ORIGINALDATE": {originalDate},+ "RELEASEDATE": {releaseDate},+ })++ Expect(mf.ReleaseDate).To(Equal(expected))+ },+ Entry("regular mapping", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),+ Entry("legacy mapping", "2020-05-15", "2019-02-10", "", "2020-05-15"),+ Entry("legacy mapping, originalYear < year", "2018-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),+ Entry("legacy mapping, originalYear empty", "2020-05-15", "", "2021-01-01", "2021-01-01"),+ Entry("legacy mapping, releaseYear", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),+ Entry("legacy mapping, same dates", "2020-05-15", "2020-05-15", "", "2020-05-15"),+ )})Describe("Lyrics", func() {