Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2025-03-04 14:57:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add missing proprietary Apple ID3v2 frames

Browse source
This commit is contained in:
Serial 2022-02-19 20:06:46 -05:00
parent dde40b78db
commit dba7fbaa8c
No known key found for this signature in database
GPG key ID: DA95198DC17C4568
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/id3/v2/frame/content.rs
View file

@ -121,7 +121,8 @@ pub(super) fn parse_content(
"COMM" | "USLT" => parse_text_language(content, id)?,
_ if id.starts_with('T') => parse_text(content)?,
// Apple proprietary frames
"WFED" | "GRP1" => parse_text(content)?,
// WFED (Podcast URL), GRP1 (Grouping), MVNM (Movement Name), MVIN (Movement Number)
"WFED" | "GRP1" | "MVNM" | "MVIN" => parse_text(content)?,
_ if id.starts_with('W') => parse_link(content)?,
// SYLT, GEOB, and any unknown frames
_ => FrameValue::Binary(content.to_vec()),
@ -134,14 +135,7 @@ fn parse_user_defined(content: &mut &[u8], link: bool) -> Result<FrameValue> {
return Err(Id3v2Error::new(Id3v2ErrorKind::BadFrameLength).into());
}
let encoding = match TextEncoding::from_u8(content.read_u8()?) {
None => {
return Err(LoftyError::new(ErrorKind::TextDecode(
"Found invalid encoding",
)))
},
Some(e) => e,
};
let encoding = verify_encoding(content.read_u8()?)?;
let description = decode_text(content, encoding, true)?.unwrap_or_default();
@ -169,14 +163,7 @@ fn parse_text_language(content: &mut &[u8], id: &str) -> Result<FrameValue> {
return Err(Id3v2Error::new(Id3v2ErrorKind::BadFrameLength).into());
}
let encoding = match TextEncoding::from_u8(content.read_u8()?) {
None => {
return Err(LoftyError::new(ErrorKind::TextDecode(
"Found invalid encoding",
)))
},
Some(e) => e,
};
let encoding = verify_encoding(content.read_u8()?)?;
let mut lang = [0; 3];
content.read_exact(&mut lang)?;
@ -204,15 +191,7 @@ fn parse_text_language(content: &mut &[u8], id: &str) -> Result<FrameValue> {
}
fn parse_text(content: &mut &[u8]) -> Result<FrameValue> {
let encoding = match TextEncoding::from_u8(content.read_u8()?) {
None => {
return Err(LoftyError::new(ErrorKind::TextDecode(
"Found invalid encoding",
)))
},
Some(e) => e,
};
let encoding = verify_encoding(content.read_u8()?)?;
let text = decode_text(content, encoding, true)?.unwrap_or_default();
Ok(FrameValue::Text {
@ -226,3 +205,12 @@ fn parse_link(content: &mut &[u8]) -> Result<FrameValue> {
Ok(FrameValue::URL(link))
}
fn verify_encoding(encoding: u8) -> Result<TextEncoding> {
match TextEncoding::from_u8(encoding) {
None => Err(LoftyError::new(ErrorKind::TextDecode(
"Found invalid encoding",
))),
Some(e) => Ok(e),
}
}