From 5e3d26b3ca32229f3ba250a39a4ef2051017a62e Mon Sep 17 00:00:00 2001 From: quexeky Date: Mon, 11 Nov 2024 18:27:39 +1100 Subject: [PATCH] refactor(downloads): ran cargo clippy & cargo fmt Signed-off-by: quexeky --- src-tauri/src/downloads/download_agent.rs | 7 ++++--- src-tauri/src/downloads/download_logic.rs | 14 ++++++-------- .../downloads/download_thread_control_flag.rs | 1 - src-tauri/src/downloads/mod.rs | 2 +- src-tauri/src/downloads/progress_object.rs | 18 +++++++++++------- src-tauri/src/settings.rs | 1 + 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src-tauri/src/downloads/download_agent.rs b/src-tauri/src/downloads/download_agent.rs index c612025..a46eceb 100644 --- a/src-tauri/src/downloads/download_agent.rs +++ b/src-tauri/src/downloads/download_agent.rs @@ -132,9 +132,10 @@ impl GameDownloadAgent { return chunk.lengths.iter().sum::(); }) .sum::(); - let chunk_count = manifest_download.iter().map(|(_, chunk)| { - chunk.lengths.len() - }).sum(); + let chunk_count = manifest_download + .values() + .map(|chunk| chunk.lengths.len()) + .sum(); self.progress = ProgressObject::new(length.try_into().unwrap(), chunk_count); if let Ok(mut manifest) = self.manifest.lock() { diff --git a/src-tauri/src/downloads/download_logic.rs b/src-tauri/src/downloads/download_logic.rs index 7b4ca78..2a0c21f 100644 --- a/src-tauri/src/downloads/download_logic.rs +++ b/src-tauri/src/downloads/download_logic.rs @@ -75,13 +75,13 @@ impl DropDownloadPipeline { progress: Arc, size: usize, ) -> Self { - return Self { + Self { source, destination, control_flag, progress, size, - }; + } } fn copy(&mut self) -> Result { @@ -99,10 +99,8 @@ impl DropDownloadPipeline { current_size += bytes_read; buf_writer.write_all(©_buf[0..bytes_read])?; - self.progress.fetch_add( - bytes_read.try_into().unwrap(), - std::sync::atomic::Ordering::Relaxed, - ); + self.progress + .fetch_add(bytes_read, std::sync::atomic::Ordering::Relaxed); if current_size == self.size { break; @@ -114,7 +112,7 @@ impl DropDownloadPipeline { fn finish(self) -> Result { let checksum = self.destination.finish()?; - return Ok(checksum); + Ok(checksum) } } @@ -187,5 +185,5 @@ pub fn download_game_chunk( return Err(GameDownloadError::ChecksumError); } - return Ok(true); + Ok(true) } diff --git a/src-tauri/src/downloads/download_thread_control_flag.rs b/src-tauri/src/downloads/download_thread_control_flag.rs index 6a18aef..30da7c6 100644 --- a/src-tauri/src/downloads/download_thread_control_flag.rs +++ b/src-tauri/src/downloads/download_thread_control_flag.rs @@ -25,7 +25,6 @@ impl From for DownloadThreadControlFlag { } } - #[derive(Clone)] pub struct DownloadThreadControl { inner: Arc, diff --git a/src-tauri/src/downloads/mod.rs b/src-tauri/src/downloads/mod.rs index 9559d8a..d4ade96 100644 --- a/src-tauri/src/downloads/mod.rs +++ b/src-tauri/src/downloads/mod.rs @@ -3,4 +3,4 @@ pub mod download_commands; mod download_logic; mod download_thread_control_flag; mod manifest; -mod progress_object; \ No newline at end of file +mod progress_object; diff --git a/src-tauri/src/downloads/progress_object.rs b/src-tauri/src/downloads/progress_object.rs index a9625b5..f3be4fb 100644 --- a/src-tauri/src/downloads/progress_object.rs +++ b/src-tauri/src/downloads/progress_object.rs @@ -1,4 +1,7 @@ -use std::sync::{atomic::{AtomicUsize, Ordering}, Arc}; +use std::sync::{ + atomic::{AtomicUsize, Ordering}, + Arc, +}; #[derive(Clone)] pub struct ProgressObject { @@ -8,16 +11,17 @@ pub struct ProgressObject { impl ProgressObject { pub fn new(max: usize, length: usize) -> Self { - let arr = (0..length).map(|_| { Arc::new(AtomicUsize::new(0)) }).collect(); + let arr = (0..length).map(|_| Arc::new(AtomicUsize::new(0))).collect(); Self { max, - progress_instances: Arc::new(arr) + progress_instances: Arc::new(arr), } } pub fn sum(&self) -> usize { - self.progress_instances.iter().map(|instance| { - instance.load(Ordering::Relaxed) - }).sum() + self.progress_instances + .iter() + .map(|instance| instance.load(Ordering::Relaxed)) + .sum() } pub fn get_progress(&self) -> f64 { @@ -26,4 +30,4 @@ impl ProgressObject { pub fn get(&self, index: usize) -> Arc { self.progress_instances[index].clone() } -} \ No newline at end of file +} diff --git a/src-tauri/src/settings.rs b/src-tauri/src/settings.rs index e69de29..8b13789 100644 --- a/src-tauri/src/settings.rs +++ b/src-tauri/src/settings.rs @@ -0,0 +1 @@ +