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

Don't add empty TIPL roles

This commit is contained in:
Deluan 2024-01-24 19:19:06 -05:00
parent a6fc84a2e1
commit fb7fd21984
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scanner/metadata/taglib/taglib.go
View File

@ -78,7 +78,7 @@ func parseTIPL(tags metadata.ParsedTags) {
} }
addRole := func(tags metadata.ParsedTags, currentRole string, currentValue []string) { addRole := func(tags metadata.ParsedTags, currentRole string, currentValue []string) {
if currentRole != "" { if currentRole != "" && len(currentValue) > 0 {
role := tiplMapping[currentRole] role := tiplMapping[currentRole]
tags[role] = append(tags[currentRole], strings.Join(currentValue, " ")) tags[role] = append(tags[currentRole], strings.Join(currentValue, " "))
} }

23
scanner/metadata/taglib/taglib_test.go
View File

@ -24,7 +24,8 @@ var _ = Describe("Extractor", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
}) })
}) })
Context("Parse", func() {
Describe("Parse", func() {
It("correctly parses metadata from all files in folder", func() { It("correctly parses metadata from all files in folder", func() {
mds, err := e.Parse( mds, err := e.Parse(
"tests/fixtures/test.mp3", "tests/fixtures/test.mp3",
@ -90,6 +91,7 @@ var _ = Describe("Extractor", func() {
Expect(m).To(HaveKey("bitrate")) Expect(m).To(HaveKey("bitrate"))
Expect(m["bitrate"][0]).To(BeElementOf("18", "39", "40", "43", "49")) Expect(m["bitrate"][0]).To(BeElementOf("18", "39", "40", "43", "49"))
}) })
DescribeTable("Format-Specific tests", DescribeTable("Format-Specific tests",
func(file, duration, channels, albumGain, albumPeak, trackGain, trackPeak string, id3Lyrics bool) { func(file, duration, channels, albumGain, albumPeak, trackGain, trackPeak string, id3Lyrics bool) {
file = "tests/fixtures/" + file file = "tests/fixtures/" + file
@ -178,7 +180,7 @@ var _ = Describe("Extractor", func() {
) )
}) })
Context("Error Checking", func() { Describe("Error Checking", func() {
It("correctly handle unreadable file due to insufficient read permission", func() { It("correctly handle unreadable file due to insufficient read permission", func() {
_, err := e.extractMetadata(accessForbiddenFile) _, err := e.extractMetadata(accessForbiddenFile)
Expect(err).To(MatchError(os.ErrPermission)) Expect(err).To(MatchError(os.ErrPermission))
@ -207,15 +209,22 @@ var _ = Describe("Extractor", func() {
It("correctly parses roles and names", func() { It("correctly parses roles and names", func() {
tags["tipl"] = []string{"arranger Andrew Powell dj-mix François Kevorkian engineer Chris Blair"} tags["tipl"] = []string{"arranger Andrew Powell dj-mix François Kevorkian engineer Chris Blair"}
parseTIPL(tags) parseTIPL(tags)
Expect(tags["arranger"]).To(Equal([]string{"Andrew Powell"})) Expect(tags["arranger"]).To(ConsistOf("Andrew Powell"))
Expect(tags["engineer"]).To(Equal([]string{"Chris Blair"})) Expect(tags["engineer"]).To(ConsistOf("Chris Blair"))
Expect(tags["djmixer"]).To(Equal([]string{"François Kevorkian"})) Expect(tags["djmixer"]).To(ConsistOf("François Kevorkian"))
}) })
It("handles multiple names for a single role", func() { It("handles multiple names for a single role", func() {
tags["tipl"] = []string{"engineer Pat Stapley producer Eric Woolfson engineer Chris Blair"} tags["tipl"] = []string{"engineer Pat Stapley producer Eric Woolfson engineer Chris Blair"}
parseTIPL(tags) parseTIPL(tags)
Expect(tags["producer"]).To(Equal([]string{"Eric Woolfson"})) Expect(tags["producer"]).To(ConsistOf("Eric Woolfson"))
Expect(tags["engineer"]).To(ConsistOf("Pat Stapley", "Chris Blair"))
})
It("discards roles without names", func() {
tags["tipl"] = []string{"engineer Pat Stapley producer engineer Chris Blair"}
parseTIPL(tags)
Expect(tags).ToNot(HaveKey("producer"))
Expect(tags["engineer"]).To(ConsistOf("Pat Stapley", "Chris Blair")) Expect(tags["engineer"]).To(ConsistOf("Pat Stapley", "Chris Blair"))
}) })
}) })
@ -234,8 +243,6 @@ var _ = Describe("Extractor", func() {
Expect(tags).To(BeEmpty()) Expect(tags).To(BeEmpty())
}) })
}) })
// Add any additional edge cases if necessary
}) })
}) })