From dcb1564568020d863926659c6329cb843ff4f249 Mon Sep 17 00:00:00 2001 From: quexeky Date: Fri, 27 Dec 2024 10:28:38 +1100 Subject: [PATCH] chore: Ran cargo clippy Signed-off-by: quexeky --- src-tauri/src/auth.rs | 1 - src-tauri/src/cleanup.rs | 2 - src-tauri/src/downloads/download_agent.rs | 4 -- src-tauri/src/downloads/download_logic.rs | 3 -- src-tauri/src/downloads/download_manager.rs | 1 - .../src/downloads/download_manager_builder.rs | 7 ++-- src-tauri/src/downloads/stored_manifest.rs | 13 +++---- src-tauri/src/lib.rs | 23 ++++-------- src-tauri/src/library.rs | 2 +- src-tauri/src/process/process_manager.rs | 37 ++++++++----------- src-tauri/src/state.rs | 3 +- 11 files changed, 35 insertions(+), 61 deletions(-) diff --git a/src-tauri/src/auth.rs b/src-tauri/src/auth.rs index 1e9df5a..c603a61 100644 --- a/src-tauri/src/auth.rs +++ b/src-tauri/src/auth.rs @@ -1,7 +1,6 @@ use std::{ env, sync::Mutex, - time::{SystemTime, UNIX_EPOCH}, }; use chrono::Utc; diff --git a/src-tauri/src/cleanup.rs b/src-tauri/src/cleanup.rs index 1e17c9e..925ea61 100644 --- a/src-tauri/src/cleanup.rs +++ b/src-tauri/src/cleanup.rs @@ -1,9 +1,7 @@ -use std::sync::Mutex; use log::info; use tauri::AppHandle; -use crate::AppState; #[tauri::command] pub fn quit(app: tauri::AppHandle) { diff --git a/src-tauri/src/downloads/download_agent.rs b/src-tauri/src/downloads/download_agent.rs index 551b0eb..8b070be 100644 --- a/src-tauri/src/downloads/download_agent.rs +++ b/src-tauri/src/downloads/download_agent.rs @@ -4,12 +4,8 @@ use crate::downloads::manifest::{DropDownloadContext, DropManifest}; use crate::downloads::progress_object::ProgressHandle; use crate::remote::RemoteAccessError; use crate::DB; -use core::time; use log::{debug, error, info}; use rayon::ThreadPoolBuilder; -use serde::ser::{Error, SerializeMap}; -use serde::{Deserialize, Serialize}; -use std::borrow::BorrowMut; use std::collections::VecDeque; use std::fmt::{Display, Formatter}; use std::fs::{create_dir_all, File}; diff --git a/src-tauri/src/downloads/download_logic.rs b/src-tauri/src/downloads/download_logic.rs index 0a0b444..420d0ef 100644 --- a/src-tauri/src/downloads/download_logic.rs +++ b/src-tauri/src/downloads/download_logic.rs @@ -6,14 +6,11 @@ use crate::DB; use log::warn; use md5::{Context, Digest}; use reqwest::blocking::Response; -use tauri::utils::acl::Permission; use std::fs::{set_permissions, Permissions}; use std::io::Read; #[cfg(unix)] use std::os::unix::fs::PermissionsExt; -use std::thread::sleep; -use std::time::Duration; use std::{ fs::{File, OpenOptions}, io::{self, BufWriter, Seek, SeekFrom, Write}, diff --git a/src-tauri/src/downloads/download_manager.rs b/src-tauri/src/downloads/download_manager.rs index f660430..55bfa83 100644 --- a/src-tauri/src/downloads/download_manager.rs +++ b/src-tauri/src/downloads/download_manager.rs @@ -2,7 +2,6 @@ use std::{ any::Any, collections::VecDeque, fmt::Debug, - io, sync::{ mpsc::{SendError, Sender}, Arc, Mutex, MutexGuard, diff --git a/src-tauri/src/downloads/download_manager_builder.rs b/src-tauri/src/downloads/download_manager_builder.rs index 3d813fd..91ac61c 100644 --- a/src-tauri/src/downloads/download_manager_builder.rs +++ b/src-tauri/src/downloads/download_manager_builder.rs @@ -8,17 +8,16 @@ use std::{ thread::{spawn, JoinHandle}, }; -use http::version; use log::{error, info}; use tauri::{AppHandle, Emitter}; use crate::{ db::{Database, GameStatus, GameTransientStatus}, library::{ - on_game_complete, push_game_update, GameUpdateEvent, QueueUpdateEvent, + on_game_complete, push_game_update, QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent, }, - state::{GameStatusManager, GameStatusWithTransient}, + state::GameStatusManager, DB, }; @@ -113,7 +112,7 @@ impl DownloadManagerBuilder { DownloadManager::new(terminator, queue, active_progress, command_sender) } - fn set_game_status, &String) -> ()>( + fn set_game_status, &String)>( &self, id: String, setter: F, diff --git a/src-tauri/src/downloads/stored_manifest.rs b/src-tauri/src/downloads/stored_manifest.rs index 7612ab5..bb5e6b9 100644 --- a/src-tauri/src/downloads/stored_manifest.rs +++ b/src-tauri/src/downloads/stored_manifest.rs @@ -1,12 +1,11 @@ use std::{ - default, fs::File, io::{Read, Write}, - path::{Path, PathBuf}, + path::PathBuf, sync::Mutex, }; -use log::{error, info}; +use log::error; use serde::{Deserialize, Serialize}; use serde_binary::binary_stream::Endian; @@ -44,15 +43,15 @@ impl StoredManifest { } }; - let manifest = match serde_binary::from_vec::(s, Endian::Little) { + + + match serde_binary::from_vec::(s, Endian::Little) { Ok(manifest) => manifest, Err(e) => { error!("{}", e); StoredManifest::new(game_id, game_version, base_path) } - }; - - return manifest; + } } pub fn write(&self) { let manifest_raw = match serde_binary::to_vec(&self, Endian::Little) { diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index e3ff447..b81130a 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -28,7 +28,6 @@ use library::{ use log::{debug, info, warn, LevelFilter}; use log4rs::append::console::ConsoleAppender; use log4rs::append::file::FileAppender; -use log4rs::append::rolling_file::RollingFileAppender; use log4rs::config::{Appender, Root}; use log4rs::encode::pattern::PatternEncoder; use log4rs::Config; @@ -43,7 +42,7 @@ use std::{ collections::HashMap, sync::{LazyLock, Mutex}, }; -use tauri::menu::{Menu, MenuItem, MenuItemBuilder, PredefinedMenuItem}; +use tauri::menu::{Menu, MenuItem, PredefinedMenuItem}; use tauri::tray::TrayIconBuilder; use tauri::{AppHandle, Manager, RunEvent, WindowEvent}; use tauri_plugin_deep_link::DeepLinkExt; @@ -205,7 +204,7 @@ pub fn run() { })); } - let mut app = builder + let app = builder .plugin(tauri_plugin_deep_link::init()) .invoke_handler(tauri::generate_handler![ // Core utils @@ -346,22 +345,16 @@ pub fn run() { responder.respond(resp); }) - .on_window_event(|window, event| match event { - WindowEvent::CloseRequested { api, .. } => { - window.hide().unwrap(); - api.prevent_close(); - } - _ => (), + .on_window_event(|window, event| if let WindowEvent::CloseRequested { api, .. } = event { + window.hide().unwrap(); + api.prevent_close(); }) .build(tauri::generate_context!()) .expect("error while running tauri application"); - app.run(|app_handle, event| match event { - RunEvent::ExitRequested { code, api, .. } => { - if code.is_none() { - api.prevent_exit(); - } + app.run(|app_handle, event| if let RunEvent::ExitRequested { code, api, .. } = event { + if code.is_none() { + api.prevent_exit(); } - _ => {} }); } diff --git a/src-tauri/src/library.rs b/src-tauri/src/library.rs index 01b63f9..e5705a1 100644 --- a/src-tauri/src/library.rs +++ b/src-tauri/src/library.rs @@ -7,7 +7,7 @@ use urlencoding::encode; use crate::db::DatabaseImpls; use crate::db::GameVersion; -use crate::db::{GameStatus, GameTransientStatus}; +use crate::db::GameStatus; use crate::downloads::download_manager::{DownloadManagerStatus, GameDownloadStatus}; use crate::process::process_manager::Platform; use crate::remote::RemoteAccessError; diff --git a/src-tauri/src/process/process_manager.rs b/src-tauri/src/process/process_manager.rs index a170f76..a818522 100644 --- a/src-tauri/src/process/process_manager.rs +++ b/src-tauri/src/process/process_manager.rs @@ -3,19 +3,17 @@ use std::{ fs::{File, OpenOptions}, path::{Path, PathBuf}, process::{Child, Command, ExitStatus}, - sync::{Arc, LazyLock, Mutex}, + sync::{Arc, Mutex}, thread::spawn, }; -use http::version; use log::{info, warn}; use serde::{Deserialize, Serialize}; -use tauri::{AppHandle, Emitter, Manager}; +use tauri::{AppHandle, Manager}; use crate::{ db::{GameStatus, GameTransientStatus, DATA_ROOT_DIR}, library::push_game_update, - process::process_manager, state::GameStatusManager, AppState, DB, }; @@ -70,7 +68,7 @@ impl ProcessManager<'_> { let absolute_exe = install_dir.join(root); let args = command_components[1..] - .into_iter() + .iter() .map(|v| v.to_string()) .collect(); (absolute_exe, args) @@ -91,24 +89,21 @@ impl ProcessManager<'_> { let current_state = db_handle.games.statuses.get(&game_id).cloned(); if let Some(saved_state) = current_state { - match saved_state { - GameStatus::SetupRequired { + if let GameStatus::SetupRequired { version_name, install_dir, - } => { - if let Some(exit_code) = result.ok() { - if exit_code.success() { - db_handle.games.statuses.insert( - game_id.clone(), - GameStatus::Installed { - version_name: version_name.to_string(), - install_dir: install_dir.to_string(), - }, - ); - } + } = saved_state { + if let Ok(exit_code) = result { + if exit_code.success() { + db_handle.games.statuses.insert( + game_id.clone(), + GameStatus::Installed { + version_name: version_name.to_string(), + install_dir: install_dir.to_string(), + }, + ); } } - _ => (), } } drop(db_handle); @@ -188,7 +183,7 @@ impl ProcessManager<'_> { ); let current_time = chrono::offset::Local::now(); - let mut log_file = OpenOptions::new() + let log_file = OpenOptions::new() .write(true) .truncate(true) .read(true) @@ -199,7 +194,7 @@ impl ProcessManager<'_> { ) .map_err(|v| v.to_string())?; - let mut error_file = OpenOptions::new() + let error_file = OpenOptions::new() .write(true) .truncate(true) .read(true) diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs index a67e854..cf764da 100644 --- a/src-tauri/src/state.rs +++ b/src-tauri/src/state.rs @@ -1,4 +1,3 @@ -use std::collections::HashMap; use crate::{ db::{GameStatus, GameTransientStatus}, @@ -23,6 +22,6 @@ impl GameStatusManager { return (offline_state, None); } - return (None, None); + (None, None) } }