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

id3v2: Replace literals with named constants

Browse source
This commit is contained in:
Uwe Klotz 2023-01-12 13:25:42 +01:00 • committed by Alex
parent 7d1aab461b
commit b2250df119
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/id3/v2/tag.rs
View file

@ -22,6 +22,8 @@ use lofty_attr::tag;
const COMMENT_FRAME_ID: &str = "COMM"; const COMMENT_FRAME_ID: &str = "COMM";
const V4_MULTI_VALUE_SEPARATOR: char = '\0';
const NUMBER_PAIR_SEPARATOR: char = '/';
macro_rules! impl_accessor { macro_rules! impl_accessor {
($($name:ident => $id:literal;)+) => { ($($name:ident => $id:literal;)+) => {
@ -164,11 +166,13 @@ impl ID3v2Tag {
.. ..
}) = frame }) = frame
{ {
if !value.contains('\0') || self.original_version != ID3v2Version::V4 { if !value.contains(V4_MULTI_VALUE_SEPARATOR)
|| self.original_version != ID3v2Version::V4
{
return Some(Cow::Borrowed(value.as_str())); return Some(Cow::Borrowed(value.as_str()));
} }
return Some(Cow::Owned(value.replace('\0', "/"))); return Some(Cow::Owned(value.replace(V4_MULTI_VALUE_SEPARATOR, "/")));
} }
None None
@ -289,7 +293,9 @@ impl ID3v2Tag {
.. ..
}) = self.get(id) }) = self.get(id)
{ {
let mut split = value.split(&['\0', '/'][..]).flat_map(str::parse::<u32>); let mut split = value
.split(&[V4_MULTI_VALUE_SEPARATOR, NUMBER_PAIR_SEPARATOR][..])
.flat_map(str::parse::<u32>);
return (split.next(), split.next()); return (split.next(), split.next());
} }
@ -537,7 +543,8 @@ impl From<ID3v2Tag> for Tag {
current_key: ItemKey, current_key: ItemKey,
total_key: ItemKey, total_key: ItemKey,
) -> Option<()> { ) -> Option<()> {
let mut split = content.splitn(2, &['\0', '/'][..]); let mut split =
content.splitn(2, &[V4_MULTI_VALUE_SEPARATOR, NUMBER_PAIR_SEPARATOR][..]);
let current = split.next()?.to_string(); let current = split.next()?.to_string();
tag.items tag.items
.push(TagItem::new(current_key, ItemValue::Text(current))); .push(TagItem::new(current_key, ItemValue::Text(current)));
@ -595,7 +602,7 @@ impl From<ID3v2Tag> for Tag {
}), }),
) => { ) => {
let item_key = ItemKey::from_key(TagType::ID3v2, description); let item_key = ItemKey::from_key(TagType::ID3v2, description);
for c in content.split('\0') { for c in content.split(V4_MULTI_VALUE_SEPARATOR) {
tag.items.push(TagItem::new( tag.items.push(TagItem::new(
item_key.clone(), item_key.clone(),
ItemValue::Text(c.to_string()), ItemValue::Text(c.to_string()),
@ -696,7 +703,7 @@ impl From<Tag> for ID3v2Tag {
let mut s = String::with_capacity(iter.size_hint().0); let mut s = String::with_capacity(iter.size_hint().0);
s.push_str(&first); s.push_str(&first);
iter.for_each(|i| { iter.for_each(|i| {
s.push('\0'); s.push(V4_MULTI_VALUE_SEPARATOR);
s.push_str(&i); s.push_str(&i);
}); });