Manually add replaygain tags for m4a (#2346)

* manually add replaygain tags for m4a

* Add replaygain tests for m4a, mp4, ogg

* add new valye for bitrate

scanner/metadata/metadata_test.go

@@ -40,7 +40,7 @@ var _ = Describe("Tags", func() {
 			Expect(m.Channels()).To(Equal(2))
 			Expect(m.FilePath()).To(Equal("tests/fixtures/test.mp3"))
 			Expect(m.Suffix()).To(Equal("mp3"))
-			Expect(m.Size()).To(Equal(int64(51876)))
+			Expect(m.Size()).To(Equal(int64(52050)))
 			Expect(m.RGAlbumGain()).To(Equal(3.21518))
 			Expect(m.RGAlbumPeak()).To(Equal(0.9125))
 			Expect(m.RGTrackGain()).To(Equal(-1.48))
@@ -53,10 +53,10 @@ var _ = Describe("Tags", func() {
 			Expect(m.Duration()).To(BeNumerically("~", 1.04, 0.01))
 			Expect(m.Suffix()).To(Equal("ogg"))
 			Expect(m.FilePath()).To(Equal("tests/fixtures/test.ogg"))
-			Expect(m.Size()).To(Equal(int64(5065)))
+			Expect(m.Size()).To(Equal(int64(5178)))
 			// TabLib 1.12 returns 18, previous versions return 39.
 			// See https://github.com/taglib/taglib/commit/2f238921824741b2cfe6fbfbfc9701d9827ab06b
-			Expect(m.BitRate()).To(BeElementOf(18, 39))
+			Expect(m.BitRate()).To(BeElementOf(18, 39, 40))
 		})
 	})
 })

scanner/metadata/taglib/taglib_test.go

@@ -65,7 +65,35 @@ var _ = Describe("Extractor", func() {
 			// TabLib 1.12 returns 18, previous versions return 39.
 			// See https://github.com/taglib/taglib/commit/2f238921824741b2cfe6fbfbfc9701d9827ab06b
 			Expect(m).To(HaveKey("bitrate"))
-			Expect(m["bitrate"][0]).To(BeElementOf("18", "39"))
+			Expect(m["bitrate"][0]).To(BeElementOf("18", "39", "40"))
+		})
+
+		Context("ReplayGain", func() {
+			testGain := func(file, albumGain, albumPeak, trackGain, trackPeak string) {
+				file = "tests/fixtures/" + file
+				mds, err := e.Parse(file)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(mds).To(HaveLen(1))
+
+				m := mds[file]
+
+				Expect(m).To(HaveKeyWithValue("replaygain_album_gain", []string{albumGain}))
+				Expect(m).To(HaveKeyWithValue("replaygain_album_peak", []string{albumPeak}))
+				Expect(m).To(HaveKeyWithValue("replaygain_track_gain", []string{trackGain}))
+				Expect(m).To(HaveKeyWithValue("replaygain_track_peak", []string{trackPeak}))
+			}
+
+			It("Correctly parses m4a (aac) gain tags", func() {
+				testGain("01 Invisible (RED) Edit Version.m4a", "0.37", "0.48", "0.37", "0.48")
+			})
+
+			It("correctly parses mp3 tags", func() {
+				testGain("test.mp3", "+3.21518 dB", "0.9125", "-1.48 dB", "0.4512")
+			})
+
+			It("correctly parses ogg (vorbis) tags", func() {
+				testGain("test.ogg", "+7.64 dB", "0.11772506", "+7.64 dB", "0.11772506")
+			})
 		})
 	})
 

scanner/metadata/taglib/taglib_wrapper.cpp

@@ -15,6 +15,13 @@
 
 #include "taglib_wrapper.h"
 
+// Tags necessary for M4a parsing
+const char *RG_TAGS[] = {
+    "replaygain_album_gain",
+    "replaygain_album_peak",
+    "replaygain_track_gain",
+    "replaygain_track_peak"};
+
 char has_cover(const TagLib::FileRef f);
 
 int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) {
@@ -70,6 +77,29 @@ int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) {
     }
   }
 
+  TagLib::MP4::File *m4afile(dynamic_cast<TagLib::MP4::File *>(f.file()));
+  if (m4afile != NULL)
+  {
+    const auto itemListMap = m4afile->tag();
+    {
+      char buf[200];
+
+      for (const char *key : RG_TAGS)
+      {
+        snprintf(buf, sizeof(buf), "----:com.apple.iTunes:%s", key);
+        const auto item = itemListMap->item(buf);
+        if (item.isValid())
+        {
+          char *dup = ::strdup(key);
+          char *val = ::strdup(item.toStringList().front().toCString(true));
+          go_map_put_str(id, dup, val);
+          free(dup);
+          free(val);
+        }
+      }
+    }
+  }
+
   if (has_cover(f)) {
     go_map_put_str(id, (char *)"has_picture", (char *)"true");
   }

scanner/tag_scanner_test.go

@@ -10,11 +10,12 @@ var _ = Describe("TagScanner", func() {
 		It("return all audio files from the folder", func() {
 			files, err := loadAllAudioFiles("tests/fixtures")
 			Expect(err).ToNot(HaveOccurred())
-			Expect(files).To(HaveLen(4))
+			Expect(files).To(HaveLen(5))
 			Expect(files).To(HaveKey("tests/fixtures/test.ogg"))
 			Expect(files).To(HaveKey("tests/fixtures/test.mp3"))
 			Expect(files).To(HaveKey("tests/fixtures/test_no_read_permission.ogg"))
 			Expect(files).To(HaveKey("tests/fixtures/01 Invisible (RED) Edit Version.mp3"))
+			Expect(files).To(HaveKey("tests/fixtures/01 Invisible (RED) Edit Version.m4a"))
 			Expect(files).ToNot(HaveKey("tests/fixtures/._02 Invisible.mp3"))
 			Expect(files).ToNot(HaveKey("tests/fixtures/playlist.m3u"))
 		})

scanner/walk_dir_tree_test.go

@@ -36,7 +36,7 @@ var _ = Describe("walk_dir_tree", func() {
 			Expect(collected[baseDir]).To(MatchFields(IgnoreExtras, Fields{
 				"Images":          BeEmpty(),
 				"HasPlaylist":     BeFalse(),
-				"AudioFilesCount": BeNumerically("==", 5),
+				"AudioFilesCount": BeNumerically("==", 6),
 			}))
 			Expect(collected[filepath.Join(baseDir, "artist", "an-album")]).To(MatchFields(IgnoreExtras, Fields{
 				"Images":          ConsistOf("cover.jpg", "front.png", "artist.png"),