diff options
Diffstat (limited to 'backend/zmusic/picard/formats/mp4.py')
| -rw-r--r-- | backend/zmusic/picard/formats/mp4.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/backend/zmusic/picard/formats/mp4.py b/backend/zmusic/picard/formats/mp4.py index 2d1763f..edb1822 100644 --- a/backend/zmusic/picard/formats/mp4.py +++ b/backend/zmusic/picard/formats/mp4.py @@ -48,19 +48,19 @@ class MP4File(File): "tvsh": "show", "purl": "podcasturl", } - __r_text_tags = dict([(v, k) for k, v in __text_tags.iteritems()]) + __r_text_tags = dict([(v, k) for k, v in __text_tags.items()]) __bool_tags = { "pcst": "podcast", "cpil": "compilation", "pgap": "gapless", } - __r_bool_tags = dict([(v, k) for k, v in __bool_tags.iteritems()]) + __r_bool_tags = dict([(v, k) for k, v in __bool_tags.items()]) __int_tags = { "tmpo": "bpm", } - __r_int_tags = dict([(v, k) for k, v in __int_tags.iteritems()]) + __r_int_tags = dict([(v, k) for k, v in __int_tags.items()]) __freeform_tags = { "----:com.apple.iTunes:MusicBrainz Track Id": "musicbrainz_trackid", @@ -97,7 +97,7 @@ class MP4File(File): "----:com.apple.iTunes:SCRIPT": "script", "----:com.apple.iTunes:LANGUAGE": "language", } - __r_freeform_tags = dict([(v, k) for k, v in __freeform_tags.iteritems()]) + __r_freeform_tags = dict([(v, k) for k, v in __freeform_tags.items()]) __other_supported_tags = ("discnumber", "tracknumber", "totaldiscs", "totaltracks") @@ -117,14 +117,12 @@ class MP4File(File): metadata.add(self.__bool_tags[name], values and '1' or '0') elif name in self.__int_tags: for value in values: - metadata.add(self.__int_tags[name], unicode(value)) + metadata.add(self.__int_tags[name], str(value)) elif name in self.__freeform_tags: for value in values: - value = value.strip("\x00").decode("utf-8", "replace") metadata.add(self.__freeform_tags[name], value) elif name == "----:com.apple.iTunes:fingerprint": for value in values: - value = value.strip("\x00").decode("utf-8", "replace") if value.startswith("MusicMagic Fingerprint"): metadata.add("musicip_fingerprint", value[22:]) elif name == "trkn": @@ -135,9 +133,9 @@ class MP4File(File): metadata["totaldiscs"] = str(values[0][1]) elif name == "covr": for value in values: - if value.format == value.FORMAT_JPEG: + if value.imageformat == value.FORMAT_JPEG: metadata.add_image("image/jpeg", value) - elif value.format == value.FORMAT_PNG: + elif value.imageformat == value.FORMAT_PNG: metadata.add_image("image/png", value) self._info(metadata, file) @@ -165,7 +163,6 @@ class MP4File(File): except ValueError: pass elif name in self.__r_freeform_tags: - values = [v.encode("utf-8") for v in values] file.tags[self.__r_freeform_tags[name]] = values elif name == "musicip_fingerprint": file.tags["----:com.apple.iTunes:fingerprint"] = ["MusicMagic Fingerprint%s" % str(v) for v in values] |