Add musicbrainz_composerid tag

Author: iron-prog

picard/const/tags.py

@@ -708,6 +708,12 @@
         longdesc=N_('The MusicBrainz Identifier (MBID) for the Work if a related work exists.'),
         is_multi_value=True,  # TODO: Need to confirm multi-value.
     ),
+    TagVar(
+        'musicbrainz_composerid',
+        shortdesc=N_('Composer MBID'),
+        longdesc=N_('The MusicBrainz Identifier (MBID) for the composer(s).'),
+        is_multi_value=True,
+    ),
     TagVar(
         'musicip_fingerprint',
         shortdesc=N_('MusicIP Fingerprint'),

picard/formats/asf.py

@@ -166,6 +166,7 @@ class ASFFile(File):
         'musicbrainz_trmid': 'MusicBrainz/TRM Id',
         'musicbrainz_discid': 'MusicBrainz/Disc Id',
         'musicbrainz_workid': 'MusicBrainz/Work Id',
+        'musicbrainz_composerid': 'MusicBrainz/Composer Id',
         'musicbrainz_releasegroupid': 'MusicBrainz/Release Group Id',
         'musicbrainz_originalalbumid': 'MusicBrainz/Original Album Id',
         'musicbrainz_originalartistid': 'MusicBrainz/Original Artist Id',

picard/formats/id3.py

@@ -198,6 +198,7 @@ class ID3File(File):
         'MusicBrainz Release Track Id': 'musicbrainz_trackid',
         'MusicBrainz Disc Id': 'musicbrainz_discid',
         'MusicBrainz Work Id': 'musicbrainz_workid',
+        'MusicBrainz Composer Id': 'musicbrainz_composerid',
         'MusicBrainz Release Group Id': 'musicbrainz_releasegroupid',
         'MusicBrainz Original Album Id': 'musicbrainz_originalalbumid',
         'MusicBrainz Original Artist Id': 'musicbrainz_originalartistid',

picard/formats/mp4.py

@@ -126,6 +126,7 @@ class MP4File(File):
         '----:com.apple.iTunes:MusicBrainz Disc Id': 'musicbrainz_discid',
         '----:com.apple.iTunes:MusicBrainz TRM Id': 'musicbrainz_trmid',
         '----:com.apple.iTunes:MusicBrainz Work Id': 'musicbrainz_workid',
+        '----:com.apple.iTunes:MusicBrainz Composer Id': 'musicbrainz_composerid',
         '----:com.apple.iTunes:MusicBrainz Release Group Id': 'musicbrainz_releasegroupid',
         '----:com.apple.iTunes:MusicBrainz Release Track Id': 'musicbrainz_trackid',
         '----:com.apple.iTunes:MusicBrainz Original Album Id': 'musicbrainz_originalalbumid',

picard/mbjson.py

@@ -178,8 +178,11 @@ def _relations_to_metadata_target_type_artist(relation, m, context):
     if context.instrumental and name == 'lyricist':
         return
     m.add_unique(name, translated_name)
+    artist_id = artist.get('id')
     if name == 'composer':
         m.add_unique('composersort', sort_name)
+        if artist_id:
+            m.add_unique('musicbrainz_composerid', artist_id)
     elif name == 'lyricist':
         m.add_unique('~lyricistsort', sort_name)
     elif name == 'writer':

test/test_mbjson.py

@@ -1052,3 +1052,22 @@ def test_other_relation(self):
         }
         _relations_to_metadata([relation], m)
         self.assertNotIn('~broadcast_date', m)
+
+
+class RelationsToMetadataTargetTypeArtistTest(PicardTestCase):
+    def test_composer_adds_musicbrainz_composerid(self):
+        m = Metadata()
+        relation = {
+            'type': 'composer',
+            'target-type': 'artist',
+            'artist': {
+                'id': '12345678-1234-1234-1234-123456789abc',
+                'name': 'Ludwig van Beethoven',
+                'sort-name': 'Beethoven, Ludwig van',
+            },
+        }
+
+        _relations_to_metadata([relation], m)
+
+        self.assertEqual(m.getall('composer'), ['Ludwig van Beethoven'])
+        self.assertEqual(m.getall('musicbrainz_composerid'), ['12345678-1234-1234-1234-123456789abc'])