From 05d11426a8e60fa060733eb8ae7843bc2ae9725c Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 10 Jun 2024 15:28:36 +0200 Subject: apply many clippy issue --- import/src/lib.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'import/src/lib.rs') diff --git a/import/src/lib.rs b/import/src/lib.rs index f0644fd..544937c 100644 --- a/import/src/lib.rs +++ b/import/src/lib.rs @@ -59,7 +59,7 @@ struct Apis { } pub fn is_importing() -> bool { - IMPORT_SEM.available_permits() <= 0 + IMPORT_SEM.available_permits() == 0 } pub async fn import(db: &DataAcid, fed: &Federation) -> anyhow::Result<()> { @@ -213,8 +213,8 @@ async fn import_path( .read_dir()? .map(Result::unwrap) .filter_map(|e| { - if e.path().extension() == Some(&OsStr::new("yaml")) - || e.path().extension() == Some(&OsStr::new("jelly")) + if e.path().extension() == Some(OsStr::new("yaml")) + || e.path().extension() == Some(OsStr::new("jelly")) || e.metadata().unwrap().is_dir() { Some(e.path()) @@ -344,12 +344,12 @@ async fn process_source( } } // TODO lazy assets - for (_, ps) in &mut node_ext.people { + for ps in node_ext.people.values_mut() { for p in ps { if let Some(id) = p.person.ids.tmdb { if let Some(tmdb) = &ap.tmdb { let k = tmdb.person_image(id).await?; - if let Some(prof) = k.profiles.get(0) { + if let Some(prof) = k.profiles.first() { p.person.headshot = Some( AssetInner::Cache(tmdb.image(&prof.file_path).await?).ser(), ); @@ -401,10 +401,10 @@ async fn process_source( // TODO lazy assets if let Some(poster) = &details.poster_path { - node.public.poster = Some(AssetInner::Cache(tmdb.image(&poster).await?).ser()); + node.public.poster = Some(AssetInner::Cache(tmdb.image(poster).await?).ser()); } if let Some(backdrop) = &details.backdrop_path { - node.public.backdrop = Some(AssetInner::Cache(tmdb.image(&backdrop).await?).ser()); + node.public.backdrop = Some(AssetInner::Cache(tmdb.image(backdrop).await?).ser()); } node.public.tagline = details.tagline.clone(); @@ -583,7 +583,7 @@ async fn process_source( .map(|e| e.path()) .filter(|e| { e.extension() == Some(OsStr::new("yaml")) - || e.extension() == Some(&OsStr::new("jelly")) + || e.extension() == Some(OsStr::new("jelly")) }); let mut children = Vec::new(); @@ -613,7 +613,7 @@ async fn process_source( Ok(errors) } -const RE_YOUTUBE_ID: LazyLock = +static RE_YOUTUBE_ID: LazyLock = LazyLock::new(|| Regex::new(r#"\[([A-Za-z0-9_-]{11})\]"#).unwrap()); pub fn infer_id_from_path(path: &Path) -> anyhow::Result { @@ -791,7 +791,7 @@ async fn import_remote( }; make_opt_asset_federated(host, &mut node.public.backdrop)?; make_opt_asset_federated(host, &mut node.public.poster)?; - for (_, g) in &mut node_ext.people { + for g in node_ext.people.values_mut() { for a in g { make_opt_asset_federated(host, &mut a.person.headshot)?; } -- cgit v1.2.3-70-g09d2