Add Track MBIDs to ripped files

See https://musicbrainz.org/doc/Track

First part of https://github.com/whipper-team/whipper/issues/200

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>

whipper/common/mbngs.py

@@ -52,6 +52,7 @@ class TrackMetadata(object):
     mbid = None
     sortName = None
     mbidArtist = None
+    mbidRecording = None
 
 
 class DiscMetadata(object):
@@ -229,7 +230,8 @@ def _getMetadata(releaseShort, release, discid, country=None):
                     track.mbidArtist = trackCredit.getIds()
 
                     track.title = t['recording']['title']
-                    track.mbid = t['recording']['id']
+                    track.mbid = t['id']
+                    track.mbidRecording = t['recording']['id']
 
                     # FIXME: unit of duration ?
                     track.duration = int(t['recording'].get('length', 0))

whipper/common/program.py

@@ -393,7 +393,8 @@ class Program:
                     track = self.metadata.tracks[number - 1]
                     trackArtist = track.artist
                     title = track.title
-                    mbidRecording = track.mbid
+                    mbidRecording = track.mbidRecording
+                    mbidTrack = track.mbid
                     mbidTrackArtist = track.mbidArtist
                 except IndexError as e:
                     logger.error('no track %d found, %r', number, e)
@@ -420,6 +421,7 @@ class Program:
                 tags['DATE'] = self.metadata.release
 
             if number > 0:
+                tags['MUSICBRAINZ_RELEASETRACKID'] = mbidTrack
                 tags['MUSICBRAINZ_TRACKID'] = mbidRecording
                 tags['MUSICBRAINZ_ARTISTID'] = mbidTrackArtist
                 tags['MUSICBRAINZ_ALBUMID'] = mbidRelease