ID3v2: Support more frames #236
Conversation
The spec defines multiple frames that are only meant to appear in a tag once. They are the following: "MCDI", "ETCO", "MLLT", "SYTC", "RVRB", "PCNT", "RBUF", "POSS", "OWNE", "SEEK", and "ASPI". We now check for their presence in `Id3v2::insert` to prevent multiple appearing in a tag.
| /// Represents an "RVA2" frame | ||
| RelativeVolumeAdjustment(RelativeVolumeAdjustmentFrame), | ||
| /// Unique file identifier | ||
| UniqueFileIdentifier(UniqueFileIdentifierFrame), |
There was a problem hiding this comment.
Great. This is used by many MusicBrainz tags needed for http://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#id21
| }) | ||
| } | ||
|
|
||
| /// Used for errors in write::frame::verify_frame | ||
| pub(super) fn name(&self) -> &'static str { |
There was a problem hiding this comment.
I use strum for this purpose: https://docs.rs/strum/latest/strum/trait.VariantNames.html
There was a problem hiding this comment.
Oh yeah, looks like they have some useful derives. There are probably a few places they could be used. I might look into it eventually.
| @@ -320,8 +331,18 @@ impl Id3v2Tag { | |||
| } | |||
|
|
|||
| /// Removes a [`Frame`] by id | |||
| pub fn remove(&mut self, id: &str) { | |||
| self.frames.retain(|f| f.id_str() != id) | |||
| pub fn remove(&mut self, id: &str) -> impl Iterator<Item = Frame<'static>> + '_ { | |||
There was a problem hiding this comment.
Passing a FrameId<'_> would be type safe and avoid the somehow unrelated eq_ignore_ascii_case(). Otherwise we should extract a function that explcitly matches FrameId with str consistently instead of inlining this code here and probably elsewhere.
There was a problem hiding this comment.
Yeah, I'll change that soon in a follow up PR. I don't know how many places it's used right now.
This adds support for the following frames: "RVA2", "OWNE", "ETCO", and "PRIV".
Additionally, this changes
Id3v2Tag::removeto return the frame(s) removed, andId3v2Tag::insertto check for frames that only meant to appear once in a file, replacing if necessary. Those frames are: "MCDI", "ETCO", "MLLT", "SYTC", "RVRB", "PCNT", "RBUF", "POSS", "OWNE", "SEEK", and "ASPI".Part of #189