id3: Add option to combine id3v1/id3v2 tags during load #357
Conversation
|
I think we can enable it by default as I can't think of any downsides. We don't support saving without updating id3v1 in some way so there is no chance of getting non-removable tags which get reloaded from id3v1 next time etc. If we want to make it optional I think having a load_v1=True option which also affects the currently active no-v2-header fallback would be easier to understand. |
tests/test_id3.py
Outdated
| self.assertEquals(tags["TPE1"].text, ["Anais Mitchell"]) | ||
| with self.assertRaises(KeyError): | ||
| tags["TALB"] | ||
| tags["TDRC"] |
There was a problem hiding this comment.
This only tests if one of them raises KeyError, not both
mutagen/id3/_file.py
Outdated
| @@ -171,6 +174,13 @@ class XMYF(Frame): ... | |||
| else: | |||
| self.update_to_v24() | |||
|
|
|||
| if self._header and combine_v1v2: | |||
There was a problem hiding this comment.
That will cause issues with the precedence, since if e.g. the ID3v2 header contains a TYER tag and the ID3v1 one a TDRC tag, both will get added and then TYER removed when updating (I'll add a test for this case). find_id3v1() already updates the ID3v1 tags, but to be explicit I guess we can run the translation twice (before and after adding the ID3v1 tags).
There was a problem hiding this comment.
Ah, good catch. What if we make find_id3v1() take an optional v2_version=4 arg which if 3 makes it return TYER instead of TDRC?
There was a problem hiding this comment.
Yeah, that sounds a bit cleaner
|
I think it should be okay now. |
mutagen/id3/_file.py
Outdated
| if frames is None: | ||
| raise | ||
|
|
||
| self.version = ID3Header._V11 | ||
| for v in frames.values(): | ||
| self.add(v) | ||
| for k, v in frames.items(): |
There was a problem hiding this comment.
Some issues with this:
- known_frames can map existing frame keys to different frame classes, so while the old code ignored known_frames this ignores the value part of it and always uses the builtin frame types anyway. I guess it's still an improvement though.
- besides that, frames is a HashKey->Frame mapping while known_frames is a FrameID->Frame mapping, so this will throw away all COMM frames from ParseID3v1 for example.
- If you keep the known_frames change can you add a small test?
mutagen/id3/_file.py
Outdated
| frames, offset = find_id3v1(fileobj, v2_version) | ||
| if frames: | ||
| for k, v in frames.items(): | ||
| if (len(self.getall(k)) == 0 and |
|
looks good otherwise |
Also add some additional tests.
|
Thanks for the feedback. I believe it does the right thing now. |
|
Thanks! |
…. See #357 In case of no translation use the version of the tag we are loading.
Otherwise we lose things like TCON index translation. This changes one test result where a TYER frame in a v2.4 tag is replaced by the v1 TDRC. Since that is off-spec I don't think that will be a problem, and it will likely contain the same data anyway.
Fixes #351
Currently disabled by default. Having it enabled by default might lead to some surprises, but is perhaps more intuitive, especially given that translate is enabled by default already.