Merge pull request #60 from jeandeaual/new-list-fields

Add new list fields set by MusicBrainz Picard
beetbox · Feb 21, 2022 · 4f70ee8 · 4f70ee8
2 parents badcd22 + 2a4a77c
commit 4f70ee8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -135,6 +135,12 @@ To copy tags from one MediaFile to another:
 Changelog
 ---------
 
+v0.10.0
+''''''
+
+- Add the properties ``albumtypes``, ``catalognums`` and
+  ``languages``.
+
 v0.9.0
 ''''''
 

diff --git a/mediafile.py b/mediafile.py
@@ -1918,13 +1918,15 @@ def as_dict(self):
         ListStorageStyle('ALBUMARTISTS'),
         ASFStorageStyle('WM/AlbumArtists'),
     )
-    albumtype = MediaField(
-        MP3DescStorageStyle(u'MusicBrainz Album Type'),
-        MP4StorageStyle('----:com.apple.iTunes:MusicBrainz Album Type'),
-        StorageStyle('RELEASETYPE'),
-        StorageStyle('MUSICBRAINZ_ALBUMTYPE'),
+    albumtypes = ListMediaField(
+        MP3ListDescStorageStyle('MusicBrainz Album Type', split_v23=True),
+        MP4ListStorageStyle('----:com.apple.iTunes:MusicBrainz Album Type'),
+        ListStorageStyle('RELEASETYPE'),
+        ListStorageStyle('MUSICBRAINZ_ALBUMTYPE'),
         ASFStorageStyle('MusicBrainz/Album Type'),
     )
+    albumtype = albumtypes.single_field()
+
     label = MediaField(
         MP3StorageStyle('TPUB'),
         MP4StorageStyle('----:com.apple.iTunes:LABEL'),
@@ -1952,12 +1954,14 @@ def as_dict(self):
         StorageStyle('ASIN'),
         ASFStorageStyle('MusicBrainz/ASIN'),
     )
-    catalognum = MediaField(
-        MP3DescStorageStyle(u'CATALOGNUMBER'),
-        MP4StorageStyle('----:com.apple.iTunes:CATALOGNUMBER'),
-        StorageStyle('CATALOGNUMBER'),
+    catalognums = ListMediaField(
+        MP3ListDescStorageStyle('CATALOGNUMBER', split_v23=True),
+        MP4ListStorageStyle('----:com.apple.iTunes:CATALOGNUMBER'),
+        ListStorageStyle('CATALOGNUMBER'),
         ASFStorageStyle('WM/CatalogNo'),
     )
+    catalognum = catalognums.single_field()
+
     barcode = MediaField(
         MP3DescStorageStyle(u'BARCODE'),
         MP4StorageStyle('----:com.apple.iTunes:BARCODE'),
@@ -1993,12 +1997,14 @@ def as_dict(self):
         StorageStyle('SCRIPT'),
         ASFStorageStyle('WM/Script'),
     )
-    language = MediaField(
-        MP3StorageStyle('TLAN'),
-        MP4StorageStyle('----:com.apple.iTunes:LANGUAGE'),
-        StorageStyle('LANGUAGE'),
+    languages = ListMediaField(
+        MP3ListStorageStyle('TLAN'),
+        MP4ListStorageStyle('----:com.apple.iTunes:LANGUAGE'),
+        ListStorageStyle('LANGUAGE'),
         ASFStorageStyle('WM/Language'),
     )
+    language = languages.single_field()
+
     country = MediaField(
         MP3DescStorageStyle(u'MusicBrainz Album Release Country'),
         MP4StorageStyle('----:com.apple.iTunes:MusicBrainz '

diff --git a/test/test_mediafile.py b/test/test_mediafile.py
@@ -1109,7 +1109,8 @@ def test_known_fields(self):
         fields = list(ReadWriteTestBase.tag_fields)
         fields.extend(
             ('encoder', 'images', 'genres', 'albumtype', 'artists',
-             'albumartists', 'url', 'mb_artistids', 'mb_albumartistids')
+             'albumartists', 'url', 'mb_artistids', 'mb_albumartistids',
+             'albumtypes', 'catalognums', 'languages')
         )
         assertCountEqual(self, MediaFile.fields(), fields)