Add more standard extra fields

tinytag · May 28, 2024 · 5b96600 · 5b96600
1 parent 40484db
commit 5b96600
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/tinytag/tests/test_all.py b/tinytag/tests/test_all.py
@@ -159,16 +159,15 @@
          'bitrate': 192.0, 'channels': 2, 'duration': 0.052244897959183675,
          'samplerate': 44100, 'title': 'Tony Hawk VS Wayne Gretzky'}),
     ('samples/id3_xxx_lang.mp3',
-        {'extra': {'script': 'Latn', 'originalyear': '2004',
+        {'extra': {'script': 'Latn',
                    'acoustid id': '2dc0b571-a633-45b0-aa5e-f3d25e4e0020',
                    'musicbrainz album type': 'album',
                    'musicbrainz album artist id': '078a9376-3c04-4280-b7d7-b20e158f345d',
                    'musicbrainz artist id': '078a9376-3c04-4280-b7d7-b20e158f345d',
                    'barcode': '724386668721',
                    'musicbrainz album id': '38b555fe-24c7-37b3-ad1b-f6dea9f1aafa',
-                   'artists': 'A Perfect Circle',
                    'musicbrainz release track id': '7f7c31a5-0905-39ba-ba72-68db91d3b9da',
-                   'catalognumber': '7243 8 66687 2 1',
+                   'catalog_number': '7243 8 66687 2 1',
                    'musicbrainz release group id': '0f21095a-e629-389c-981a-d9569e9673c9',
                    'musicbrainz album status': 'official',
                    'asin': 'B000641ZIQ', 'musicbrainz album release country': 'US',
@@ -177,7 +176,7 @@
                    'replaygain_album_gain': '-8.26 dB', 'publisher': 'Virgin Records America',
                    'media': 'CD', 'tso2': 'Perfect Circle, A',
                    'ufid': 'http://musicbrainz.org\x00d2b8f0e6-735a-42ee-adf0-7eca4e65cd72',
-                   'tsop': 'Perfect Circle, A', 'tory': '2004', 'tdat': '0211',
+                   'tsop': 'Perfect Circle, A', 'original_year': '2004', 'tdat': '0211',
                    'ipls': ('producer\x00Billy Howerdel\x00producer\x00Maynard James Keenan'
                             '\x00engineer\x00Billy Howerdel\x00engineer\x00Critter')},
          'filesize': 6943, 'album': 'eMOTIVe', 'albumartist': 'A Perfect Circle',

diff --git a/tinytag/tinytag.py b/tinytag/tinytag.py
@@ -391,13 +391,20 @@ class _Parser:
         atom_decoder_by_type: dict[
             int, Callable[[bytes], int | str | bytes | TagImage]] | None = None
         _CUSTOM_FIELD_NAME_MAPPING = {
+            'artists': 'artist',
             'conductor': 'extra.conductor',
             'discsubtitle': 'extra.set_subtitle',
             'initialkey': 'extra.initial_key',
             'isrc': 'extra.isrc',
             'language': 'extra.language',
             'lyricist': 'extra.lyricist',
             'media': 'extra.media',
+            'website': 'extra.url',
+            'originaldate': 'extra.original_date',
+            'originalyear': 'extra.original_year',
+            'license': 'extra.license',
+            'barcode': 'extra.barcode',
+            'catalognumber': 'extra.catalog_number',
         }
 
         @classmethod
@@ -691,6 +698,17 @@ class _ID3(TinyTag):
         'TENC': 'extra.encoded_by', 'TEN': 'extra.encoded_by',
         'TSSE': 'extra.encoder_settings', 'TSS': 'extra.encoder_settings',
         'TMED': 'extra.media', 'TMT': 'extra.media',
+        'TDOR': 'extra.original_date',
+        'TORY': 'extra.original_year', 'TOR': 'extra.original_year',
+        'WCOP': 'extra.license',
+    }
+    _ID3_MAPPING_CUSTOM = {
+        'artists': 'artist',
+        'director': 'extra.director',
+        'license': 'extra.license',
+        'originalyear': 'extra.original_year',
+        'barcode': 'extra.barcode',
+        'catalognumber': 'extra.catalog_number',
     }
     _IMAGE_FRAME_IDS = {'APIC', 'PIC'}
     _CUSTOM_FRAME_IDS = {'TXXX', 'TXX'}
@@ -982,8 +1000,11 @@ def asciidecode(x: bytes) -> str:
 
     def __parse_custom_field(self, content: str) -> bool:
         custom_field_name, separator, value = content.partition('\x00')
-        if custom_field_name and separator:
-            self._set_field(self._EXTRA_PREFIX + custom_field_name.lower(), value.lstrip('\ufeff'))
+        custom_field_name_lower = custom_field_name.lower()
+        if custom_field_name_lower and separator:
+            field_name = self._ID3_MAPPING_CUSTOM.get(
+                custom_field_name_lower, self._EXTRA_PREFIX + custom_field_name_lower)
+            self._set_field(field_name, value.lstrip('\ufeff'))
             return True
         return False
 
@@ -1144,6 +1165,7 @@ class _Ogg(TinyTag):
         'albumartist': 'albumartist',
         'title': 'title',
         'artist': 'artist',
+        'artists': 'artist',
         'author': 'artist',
         'date': 'year',
         'tracknumber': 'track',
@@ -1174,6 +1196,11 @@ class _Ogg(TinyTag):
         'encodedby': 'extra.encoded_by',
         'encodersettings': 'extra.encoder_settings',
         'media': 'extra.media',
+        'originaldate': 'extra.original_date',
+        'originalyear': 'extra.original_year',
+        'license': 'extra.license',
+        'barcode': 'extra.barcode',
+        'catalognumber': 'extra.catalog_number',
     }
 
     def __init__(self) -> None:
@@ -1529,6 +1556,7 @@ class _Wma(TinyTag):
     # and (japanese, but none the less helpful)
     # http://uguisu.skr.jp/Windows/format_asf.html
     _ASF_MAPPING = {
+        'WM/ARTISTS': 'artist',
         'WM/TrackNumber': 'track',
         'WM/PartOfSet': 'disc',
         'WM/Year': 'year',
@@ -1541,6 +1569,7 @@ class _Wma(TinyTag):
         'WM/InitialKey': 'extra.initial_key',
         'WM/Lyrics': 'extra.lyrics',
         'WM/Language': 'extra.language',
+        'WM/Director': 'extra.director',
         'WM/AuthorURL': 'extra.url',
         'WM/ISRC': 'extra.isrc',
         'WM/Conductor': 'extra.conductor',
@@ -1549,6 +1578,10 @@ class _Wma(TinyTag):
         'WM/EncodedBy': 'extra.encoded_by',
         'WM/EncodingSettings': 'extra.encoder_settings',
         'WM/Media': 'extra.media',
+        'WM/OriginalReleaseTime': 'extra.original_date',
+        'WM/OriginalReleaseYear': 'extra.original_year',
+        'WM/Barcode': 'extra.barcode',
+        'WM/CatalogNo': 'extra.catalog_number',
     }
     _ASF_CONTENT_DESCRIPTION_OBJECT = b'3&\xb2u\x8ef\xcf\x11\xa6\xd9\x00\xaa\x00b\xcel'
     _ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT = (b'@\xa4\xd0\xd2\x07\xe3\xd2\x11\x97\xf0\x00'