Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2024-11-10 06:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rust v1.70: Replace once_cell with std::sync::OnceLock

Browse source
This commit is contained in:
Uwe Klotz 2023-12-21 12:42:39 +01:00 committed by Alex
parent 80273a449c
commit 7ce77290e4
7 changed files with 70 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -10,6 +10,7 @@ keywords = ["tags", "audio", "metadata", "id3", "vorbis"]
categories = ["multimedia", "multimedia::audio", "parser-implementations"]
readme = "README.md"
include = ["src", "Cargo.toml", "LICENSE-APACHE", "LICENSE-MIT", "SUPPORTED_FORMATS.md"]
rust = "1.70.0"
[dependencies]
# Vorbis comments pictures
@ -24,7 +25,6 @@ log = "0.4.20"
# OGG Vorbis/Opus
ogg_pager = "0.5.0"
# Key maps
once_cell = "1.18.0"
paste = "1.0.14"
[features]

4
src/file.rs
View file

@ -1,7 +1,7 @@
use crate::error::Result;
use crate::probe::ParseOptions;
use crate::properties::FileProperties;
use crate::resolve::CUSTOM_RESOLVERS;
use crate::resolve::custom_resolvers;
use crate::tag::{Tag, TagType};
use crate::traits::TagExt;
@ -831,7 +831,7 @@ impl FileType {
"mpc" | "mp+" | "mpp" => Some(Self::Mpc),
"spx" => Some(Self::Speex),
e => {
if let Some((ty, _)) = CUSTOM_RESOLVERS
if let Some((ty, _)) = custom_resolvers()
.lock()
.ok()?
.iter()

48
src/id3/v2/util/upgrade.rs
View file

@ -15,7 +15,7 @@ use std::collections::HashMap;
/// assert_eq!(new_title, Some("TIT2"));
/// ```
pub fn upgrade_v2(key: &str) -> Option<&'static str> {
V2KEYS.get(key).copied()
v2keys().get(key).copied()
}
/// Upgrade an ID3v2.3 key to an ID3v2.4 key
@ -31,33 +31,41 @@ pub fn upgrade_v2(key: &str) -> Option<&'static str> {
/// assert_eq!(new_involved_people_list, Some("TIPL"));
/// ```
pub fn upgrade_v3(key: &str) -> Option<&'static str> {
V3KEYS.get(key).copied()
v3keys().get(key).copied()
}
macro_rules! gen_upgrades {
(V2 => [$($($v2_key:literal)|* => $id3v24_from_v2:literal),+]; V3 => [$($($v3_key:literal)|* => $id3v24_from_v3:literal),+]) => {
use once_cell::sync::Lazy;
use std::sync::OnceLock;
static V2KEYS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
let mut map = HashMap::new();
$(
$(
map.insert($v2_key, $id3v24_from_v2);
)+
)+
map
});
static V2KEYS: OnceLock<HashMap<&'static str, &'static str>> = OnceLock::new();
static V3KEYS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
let mut map = HashMap::new();
$(
fn v2keys() -> &'static HashMap<&'static str, &'static str> {
V2KEYS.get_or_init(|| {
let mut map = HashMap::new();
$(
map.insert($v3_key, $id3v24_from_v3);
$(
map.insert($v2_key, $id3v24_from_v2);
)+
)+
)+
map
});
}
map
})
}
static V3KEYS: OnceLock<HashMap<&'static str, &'static str>> = OnceLock::new();
fn v3keys() -> &'static HashMap<&'static str, &'static str> {
V3KEYS.get_or_init(|| {
let mut map = HashMap::new();
$(
$(
map.insert($v3_key, $id3v24_from_v3);
)+
)+
map
})
}
};
}
gen_upgrades!(

27
src/id3/v2/write/mod.rs
View file

@ -15,22 +15,27 @@ use crate::probe::Probe;
use std::fs::File;
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
use std::ops::Not;
use std::sync::OnceLock;
use byteorder::{BigEndian, LittleEndian, WriteBytesExt};
static CRC_32_TABLE: OnceLock<[u32; 256]> = OnceLock::new();
// In the very rare chance someone wants to write a CRC in their extended header
static CRC_32_TABLE: once_cell::sync::Lazy<[u32; 256]> = once_cell::sync::Lazy::new(|| {
let mut crc32_table = [0; 256];
fn crc_32_table() -> &'static [u32; 256] {
CRC_32_TABLE.get_or_init(|| {
let mut crc32_table = [0; 256];
for n in 0..256 {
crc32_table[n as usize] = (0..8).fold(n as u32, |acc, _| match acc & 1 {
1 => 0xEDB8_8320 ^ (acc >> 1),
_ => acc >> 1,
});
}
for n in 0..256 {
crc32_table[n as usize] = (0..8).fold(n as u32, |acc, _| match acc & 1 {
1 => 0xEDB8_8320 ^ (acc >> 1),
_ => acc >> 1,
});
}
crc32_table
});
crc32_table
})
}
#[allow(clippy::shadow_unrelated)]
pub(crate) fn write_id3v2<'a, I: Iterator<Item = FrameRef<'a>> + Clone + 'a>(
@ -232,7 +237,7 @@ fn calculate_crc(content: &[u8]) -> [u8; 5] {
let crc: u32 = content
.iter()
.fold(!0, |crc, octet| {
(crc >> 8) ^ CRC_32_TABLE[(((crc & 0xFF) ^ u32::from(*octet)) & 0xFF) as usize]
(crc >> 8) ^ crc_32_table()[(((crc & 0xFF) ^ u32::from(*octet)) & 0xFF) as usize]
})
.not();

4
src/probe.rs
View file

@ -13,7 +13,7 @@ use crate::musepack::MpcFile;
use crate::ogg::opus::OpusFile;
use crate::ogg::speex::SpeexFile;
use crate::ogg::vorbis::VorbisFile;
use crate::resolve::CUSTOM_RESOLVERS;
use crate::resolve::custom_resolvers;
use crate::wavpack::WavPackFile;
use std::fs::File;
@ -568,7 +568,7 @@ impl<R: Read + Seek> Probe<R> {
ret
},
_ => {
if let Ok(lock) = CUSTOM_RESOLVERS.lock() {
if let Ok(lock) = custom_resolvers().lock() {
#[allow(clippy::significant_drop_in_scrutinee)]
for (_, resolve) in lock.iter() {
if let ret @ Some(_) = resolve.guess(&buf[..buf_len]) {

18
src/resolve.rs
View file

@ -9,9 +9,7 @@ use crate::tag::TagType;
use std::collections::HashMap;
use std::io::{Read, Seek};
use std::marker::PhantomData;
use std::sync::{Arc, Mutex};
use once_cell::sync::Lazy;
use std::sync::{Arc, Mutex, OnceLock};
/// A custom file resolver
///
@ -37,11 +35,14 @@ pub trait FileResolver: Send + Sync + AudioFile {
// Just broken out to its own type to make `CUSTOM_RESOLVER`'s type shorter :)
type ResolverMap = HashMap<&'static str, &'static dyn ObjectSafeFileResolver>;
pub(crate) static CUSTOM_RESOLVERS: Lazy<Arc<Mutex<ResolverMap>>> =
Lazy::new(|| Arc::new(Mutex::new(HashMap::new())));
static CUSTOM_RESOLVERS: OnceLock<Arc<Mutex<ResolverMap>>> = OnceLock::new();
pub(crate) fn custom_resolvers() -> &'static Arc<Mutex<ResolverMap>> {
CUSTOM_RESOLVERS.get_or_init(Default::default)
}
pub(crate) fn lookup_resolver(name: &'static str) -> &'static dyn ObjectSafeFileResolver {
let res = CUSTOM_RESOLVERS.lock().unwrap();
let res = custom_resolvers().lock().unwrap();
if let Some(resolver) = res.get(name).copied() {
return resolver;
@ -114,7 +115,10 @@ impl<T: FileResolver> ObjectSafeFileResolver for GhostlyResolver<T> {
/// * Attempting to register an existing name or type
/// * See [`Mutex::lock`]
pub fn register_custom_resolver<T: FileResolver + 'static>(name: &'static str) {
let mut res = CUSTOM_RESOLVERS.lock().unwrap();
let mut res = CUSTOM_RESOLVERS
.get_or_init(Default::default)
.lock()
.unwrap();
assert!(
res.iter().all(|(n, _)| *n != name),
"Resolver `{}` already exists!",

20
src/tag/item.rs
View file

@ -29,15 +29,7 @@ macro_rules! gen_map {
($(#[$meta:meta])? $NAME:ident; $($($key:literal)|+ => $variant:ident),+) => {
paste::paste! {
$(#[$meta])?
static [<$NAME _INNER>]: once_cell::sync::Lazy<HashMap<&'static str, ItemKey>> = once_cell::sync::Lazy::new(|| {
let mut map = HashMap::new();
$(
$(
map.insert($key, ItemKey::$variant);
)+
)+
map
});
static [<$NAME _INNER>]: std::sync::OnceLock<HashMap<&'static str, ItemKey>> = std::sync::OnceLock::new();
$(#[$meta])?
#[allow(non_camel_case_types)]
@ -46,7 +38,15 @@ macro_rules! gen_map {
$(#[$meta])?
impl $NAME {
pub(crate) fn get_item_key(&self, key: &str) -> Option<ItemKey> {
[<$NAME _INNER>].iter().find(|(k, _)| k.eq_ignore_ascii_case(key)).map(|(_, v)| v.clone())
[<$NAME _INNER>].get_or_init(|| {
let mut map = HashMap::new();
$(
$(
map.insert($key, ItemKey::$variant);
)+
)+
map
}).iter().find(|(k, _)| k.eq_ignore_ascii_case(key)).map(|(_, v)| v.clone())
}
pub(crate) fn get_key(&self, item_key: &ItemKey) -> Option<&str> {