From e6d7328b2916a237f49b736d1fcbb84221a641b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Wed, 17 Jan 2024 23:48:48 +0100 Subject: [PATCH] refactor: clippy fixes --- cli/src/extractors/audio.rs | 4 ++-- cli/src/extractors/exif.rs | 2 +- cli/src/extractors/media.rs | 2 +- cli/src/main.rs | 46 ++++++++++++++++++------------------- cli/src/previews/mod.rs | 2 +- cli/src/routes.rs | 6 ++--- db/src/lib.rs | 2 +- 7 files changed, 31 insertions(+), 33 deletions(-) diff --git a/cli/src/extractors/audio.rs b/cli/src/extractors/audio.rs index ff937bc..372c022 100644 --- a/cli/src/extractors/audio.rs +++ b/cli/src/extractors/audio.rs @@ -42,7 +42,7 @@ impl Extractor for ID3Extractor { if let Address::Hash(hash) = address { let files = store.retrieve(hash)?; - if let Some(file) = files.get(0) { + if let Some(file) = files.first() { let file_path = file.get_file_path(); let mut job_handle = job_container.add_job( None, @@ -90,7 +90,7 @@ impl Extractor for ID3Extractor { let tmp_dir = tempfile::tempdir()?; let tmp_path = tmp_dir.path().join(format!("img-{}", idx)); let mut file = std::fs::File::create(&tmp_path)?; - file.write_all(&*picture.data)?; + file.write_all(&picture.data)?; let hash = store.store( connection, Blob::from_filepath(&tmp_path), diff --git a/cli/src/extractors/exif.rs b/cli/src/extractors/exif.rs index fc8831a..919457a 100644 --- a/cli/src/extractors/exif.rs +++ b/cli/src/extractors/exif.rs @@ -43,7 +43,7 @@ impl Extractor for ExifExtractor { if let Address::Hash(hash) = address { let files = store.retrieve(hash)?; - if let Some(file) = files.get(0) { + if let Some(file) = files.first() { let file_path = file.get_file_path(); let mut job_handle = job_container.add_job( None, diff --git a/cli/src/extractors/media.rs b/cli/src/extractors/media.rs index 86adc6b..53f0bd1 100644 --- a/cli/src/extractors/media.rs +++ b/cli/src/extractors/media.rs @@ -48,7 +48,7 @@ impl Extractor for MediaExtractor { if let Address::Hash(hash) = address { let files = store.retrieve(hash)?; - if let Some(file) = files.get(0) { + if let Some(file) = files.first() { let file_path = file.get_file_path(); let mut job_handle = job_container.add_job( None, diff --git a/cli/src/main.rs b/cli/src/main.rs index 8e62681..f6505e1 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -447,32 +447,30 @@ async fn main() -> Result<()> { } }; - if !args.no_initial_update { - if !open_result.new || args.rescan_mode.is_some() { - info!("Running update..."); - block_background::<_, _, anyhow::Error>(move || { - let connection: upend_db::UpEndConnection = upend.connection()?; + if !args.no_initial_update && (!open_result.new || args.rescan_mode.is_some()) { + info!("Running update..."); + block_background::<_, _, anyhow::Error>(move || { + let connection: upend_db::UpEndConnection = upend.connection()?; - let tree_mode = args.rescan_mode.unwrap_or_else(|| { - connection - .get_vault_options() - .unwrap() - .blob_mode - .unwrap_or_default() - }); - - let _ = state.store.update( - &upend, - job_container.clone(), - upend_db::stores::UpdateOptions { - initial: false, - tree_mode, - }, - ); - let _ = extractors::extract_all(upend, state.store, job_container); - Ok(()) + let tree_mode = args.rescan_mode.unwrap_or_else(|| { + connection + .get_vault_options() + .unwrap() + .blob_mode + .unwrap_or_default() }); - } + + let _ = state.store.update( + &upend, + job_container.clone(), + upend_db::stores::UpdateOptions { + initial: false, + tree_mode, + }, + ); + let _ = extractors::extract_all(upend, state.store, job_container); + Ok(()) + }); } #[cfg(feature = "desktop")] diff --git a/cli/src/previews/mod.rs b/cli/src/previews/mod.rs index f100f0a..66418cf 100644 --- a/cli/src/previews/mod.rs +++ b/cli/src/previews/mod.rs @@ -90,7 +90,7 @@ impl PreviewStore { } else { trace!("Calculating preview for {hash:?}..."); let files = self.store.retrieve(&hash)?; - if let Some(file) = files.get(0) { + if let Some(file) = files.first() { let file_path = file.get_file_path(); let mut job_handle = job_container.add_job( None, diff --git a/cli/src/routes.rs b/cli/src/routes.rs index fd613d4..39fb086 100644 --- a/cli/src/routes.rs +++ b/cli/src/routes.rs @@ -142,7 +142,7 @@ pub async fn get_raw( let blobs = web::block(move || _store.retrieve(_hash.as_ref())) .await? .map_err(ErrorInternalServerError)?; - if let Some(blob) = blobs.get(0) { + if let Some(blob) = blobs.first() { let file_path = blob.get_file_path(); if query.native.is_none() { @@ -231,11 +231,11 @@ pub async fn head_raw( let blobs = web::block(move || _store.retrieve(_hash.as_ref())) .await? .map_err(ErrorInternalServerError)?; - if let Some(blob) = blobs.get(0) { + if let Some(blob) = blobs.first() { let file_path = blob.get_file_path(); let mut response = HttpResponse::NoContent(); - if let Some(mime_type) = tree_magic_mini::from_filepath(&file_path) { + if let Some(mime_type) = tree_magic_mini::from_filepath(file_path) { if let Ok(mime) = mime_type.parse::() { return Ok(response.content_type(mime).finish()); } diff --git a/db/src/lib.rs b/db/src/lib.rs index df4875d..d0733d8 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -285,7 +285,7 @@ impl UpEndConnection { match entry.len() { 0 => Ok(None), - 1 => Ok(Some(Entry::try_from(entry.get(0).unwrap())?)), + 1 => Ok(Some(Entry::try_from(entry.first().unwrap())?)), _ => { unreachable!( "Multiple entries returned with the same hash - this should be impossible!"