Skip to content

PICARD-3029: Incorrect mapping of case-variant tags in MP4 files #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 13, 2025
Merged

PICARD-3029: Incorrect mapping of case-variant tags in MP4 files #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d5590d
Fix #3029: incorrect mapping of case-variant tags in MP4 files
jpmsousa03 Mar 15, 2025
9c3e5ad
fixed stylistic issues
jpmsousa03 Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions picard/formats/mp4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,19 @@ def _save(self, filename, metadata):
name = 'lyrics'
if name == 'comment:':
name = 'comment'
if name in self.__r_text_tags:
if name in self.__r_freeform_tags_ci:
values = [v.encode('utf-8') for v in values]
delall_ci(tags, self.__r_freeform_tags_ci[name])
if name in self.__casemap:
name = self.__casemap[name]
else:
name = self.__r_freeform_tags_ci[name]
tags[name] = values
elif name in self.__casemap:
values = [v.encode('utf-8') for v in values]
name = self.__casemap.get(name, name)
tags['----:com.apple.iTunes:' + name] = values
elif name in self.__r_text_tags:
tags[self.__r_text_tags[name]] = values
elif name in self.__r_bool_tags:
tags[self.__r_bool_tags[name]] = (values[0] == '1')
Expand All @@ -277,14 +289,6 @@ def _save(self, filename, metadata):
elif name in self.__r_freeform_tags:
values = [v.encode('utf-8') for v in values]
tags[self.__r_freeform_tags[name]] = values
elif name in self.__r_freeform_tags_ci:
values = [v.encode('utf-8') for v in values]
delall_ci(tags, self.__r_freeform_tags_ci[name])
if name in self.__casemap:
name = self.__casemap[name]
else:
name = self.__r_freeform_tags_ci[name]
tags[name] = values
elif name == 'musicip_fingerprint':
tags['----:com.apple.iTunes:fingerprint'] = [b'MusicMagic Fingerprint%s' % v.encode('ascii') for v in values]
elif self.supports_tag(name) and name not in self.__other_supported_tags:
Expand Down Expand Up @@ -353,16 +357,19 @@ def supports_tag(cls, name):
def _get_tag_name(self, name):
if name.startswith('lyrics:'):
name = 'lyrics'
if name in self.__r_text_tags:
if name in self.__r_freeform_tags_ci:
return self.__r_freeform_tags_ci[name]
elif name in self.__casemap:
name = self.__casemap.get(name, name)
return '----:com.apple.iTunes:' + name
elif name in self.__r_text_tags:
return self.__r_text_tags[name]
elif name in self.__r_bool_tags:
return self.__r_bool_tags[name]
elif name in self.__r_int_tags:
return self.__r_int_tags[name]
elif name in self.__r_freeform_tags:
return self.__r_freeform_tags[name]
elif name in self.__r_freeform_tags_ci:
return self.__r_freeform_tags_ci[name]
elif name == 'musicip_fingerprint':
return '----:com.apple.iTunes:fingerprint'
elif name in {'tracknumber', 'totaltracks'}:
Expand Down
2 changes: 1 addition & 1 deletion test/formats/test_mp4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def test_replaygain_tags_case_insensitive(self):
def test_ci_tags_preserve_case(self):
# Ensure values are not duplicated on repeated save and are saved
# case preserving.
for name in ('Replaygain_Album_Peak', 'Custom', 'äöüéß\0'):
for name in ('Replaygain_Album_Peak', 'Label', 'Custom', 'äöüéß\0'):
tags = mutagen.mp4.MP4Tags()
tags['----:com.apple.iTunes:' + name] = [b'foo']
save_raw(self.filename, tags)
Expand Down
Loading