Skip to content

🎧 Your Personal Streaming Service

Add support for multi-line tags

Deluanaee4eb71c40f
diff --git a/scanner/metadata/ffmpeg.go b/scanner/metadata/ffmpeg.go
index 79a246c43..d1e4e7099 100644
--- a/scanner/metadata/ffmpeg.go
+++ b/scanner/metadata/ffmpeg.go
@@ -53,6 +53,9 @@ var (
// TITLE : Back In Black
tagsRx = regexp.MustCompile(`(?i)^\s{4,6}([\w\s-]+)\s*:(.*)`)
+ // : Second comment line
+ continuationRx = regexp.MustCompile(`(?i)^\s+:(.*)`)
+
// Duration: 00:04:16.00, start: 0.000000, bitrate: 995 kb/s`
durationRx = regexp.MustCompile(`^\s\sDuration: ([\d.:]+).*bitrate: (\d+)`)
@@ -107,6 +110,7 @@ func (e *ffmpegExtractor) extractMetadata(filePath, info string) (*ffmpegMetadat
func (m *ffmpegMetadata) parseInfo(info string) {
reader := strings.NewReader(info)
scanner := bufio.NewScanner(reader)
+ lastTag := ""
for scanner.Scan() {
line := scanner.Text()
if len(line) == 0 {
@@ -115,15 +119,27 @@ func (m *ffmpegMetadata) parseInfo(info string) {
match := tagsRx.FindStringSubmatch(line)
if len(match) > 0 {
tagName := strings.TrimSpace(strings.ToLower(match[1]))
- tagValue := strings.TrimSpace(match[2])
+ if tagName != "" {
+ tagValue := strings.TrimSpace(match[2])
+ // Skip when the tag was previously found
+ if _, ok := m.tags[tagName]; !ok {
+ m.tags[tagName] = tagValue
+ lastTag = tagName
+ }
+ continue
+ }
+ }
- // Skip when the tag was previously found
- if _, ok := m.tags[tagName]; !ok {
- m.tags[tagName] = tagValue
+ if lastTag != "" {
+ match = continuationRx.FindStringSubmatch(line)
+ if len(match) > 0 {
+ tagValue := m.tags[lastTag]
+ m.tags[lastTag] = tagValue + "\n" + strings.TrimSpace(match[1])
+ continue
}
- continue
}
+ lastTag = ""
match = coverRx.FindStringSubmatch(line)
if len(match) > 0 {
m.tags["has_picture"] = "true"
diff --git a/scanner/metadata/ffmpeg_test.go b/scanner/metadata/ffmpeg_test.go
index 0ccc8ca68..b9f1cb581 100644
--- a/scanner/metadata/ffmpeg_test.go
+++ b/scanner/metadata/ffmpeg_test.go
@@ -183,8 +183,7 @@ Input #0, flac, from '/Users/deluan/Downloads/06. Back In Black.flac':
Expect(md.Year()).To(Equal(1980))
})
- // TODO Handle multiline tags
- XIt("parses multiline tags", func() {
+ It("parses multiline tags", func() {
const outputWithMultilineComment = `
Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'modulo.m4a':
Metadata:
@@ -212,8 +211,7 @@ Tracklist:
05. Vírus de Sírius
06. Doktor Fritz
07. Wunderbar
-08. Quarta Dimensão
-`
+08. Quarta Dimensão`
md, _ := e.extractMetadata("tests/fixtures/test.mp3", outputWithMultilineComment)
Expect(md.Comment()).To(Equal(expectedComment))
})
diff --git a/scanner/metadata/taglib_test.go b/scanner/metadata/taglib_test.go
index ec91a387d..2bdfdd7a8 100644
--- a/scanner/metadata/taglib_test.go
+++ b/scanner/metadata/taglib_test.go
@@ -34,6 +34,7 @@ var _ = Describe("taglibExtractor", func() {
Expect(m.FilePath()).To(Equal("tests/fixtures/test.mp3"))
Expect(m.Suffix()).To(Equal("mp3"))
Expect(m.Size()).To(Equal(int64(60845)))
+ Expect(m.Comment()).To(Equal("Comment1\nComment2"))
m = mds["tests/fixtures/test.ogg"]
Expect(err).To(BeNil())
diff --git a/tests/fixtures/test.mp3 b/tests/fixtures/test.mp3
index 5fd9572b6..e6941d360 100644
Binary files a/tests/fixtures/test.mp3 and b/tests/fixtures/test.mp3 differ