diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index b40776c..0cab243 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -33,11 +33,11 @@ fn try_flush() { std::io::stdout().flush().unwrap_or(()) } -fn has_arg(args: &Vec, arg: &str) -> bool { +fn has_arg(args: &[String], arg: &str) -> bool { args.contains(&arg.to_string()) } -async fn arg_handler(args: &Vec) { +async fn arg_handler(args: &[String]) { if has_arg(args, "--proxy") { let mut pathbuf = tauri::api::path::data_dir().unwrap(); pathbuf.push("cultivation"); @@ -55,7 +55,7 @@ fn main() { } // Setup datadir/cultivation just in case something went funky and it wasn't made - if !dir_exists(&data_dir().unwrap().join("cultivation").to_str().unwrap()) { + if !dir_exists(data_dir().unwrap().join("cultivation").to_str().unwrap()) { fs::create_dir_all(&data_dir().unwrap().join("cultivation")).unwrap(); } diff --git a/src-tauri/src/proxy.rs b/src-tauri/src/proxy.rs index f4c0f44..edf28c1 100644 --- a/src-tauri/src/proxy.rs +++ b/src-tauri/src/proxy.rs @@ -3,7 +3,6 @@ * https://github.com/omjadas/hudsucker/blob/main/examples/log.rs */ -use crate::system_helpers::run_command; use once_cell::sync::Lazy; use std::{path::PathBuf, str::FromStr, sync::Mutex}; @@ -180,7 +179,7 @@ pub fn connect_to_proxy(proxy_port: u16) { fs::write("/etc/environment", env_file).unwrap(); } -#[cfg(macos)] +#[cfg(target_od = "macos")] pub fn connect_to_proxy(_proxy_port: u16) { println!("No Mac support yet. Someone mail me a Macbook and I will do it B)") } diff --git a/src-tauri/src/system_helpers.rs b/src-tauri/src/system_helpers.rs index ab2f160..9200776 100644 --- a/src-tauri/src/system_helpers.rs +++ b/src-tauri/src/system_helpers.rs @@ -8,7 +8,7 @@ use registry::{Data, Hive, Security}; #[tauri::command] pub fn run_program(path: String, args: Option) { // Without unwrap_or, this can crash when UAC prompt is denied - open::that(format!("{} {}", &path, &args.unwrap_or("".into()))).unwrap_or(()); + open::that(format!("{} {}", &path, &args.unwrap_or_else(|| "".into()))).unwrap_or(()); } #[tauri::command] @@ -24,7 +24,7 @@ pub fn run_program_relative(path: String, args: Option) { std::env::set_current_dir(&path_buf).unwrap(); // Without unwrap_or, this can crash when UAC prompt is denied - open::that(format!("{} {}", &path, args.unwrap_or("".into()))).unwrap_or(()); + open::that(format!("{} {}", &path, args.unwrap_or_else(|| "".into()))).unwrap_or(()); // Restore the original working directory std::env::set_current_dir(&cwd).unwrap(); diff --git a/src-tauri/src/unzip.rs b/src-tauri/src/unzip.rs index d6c2321..9a908c9 100644 --- a/src-tauri/src/unzip.rs +++ b/src-tauri/src/unzip.rs @@ -58,7 +58,7 @@ pub fn unzip( } }; - full_path = new_path.clone(); + full_path = new_path; } println!("Is rar file? {}", zipfile.ends_with(".rar")); @@ -78,7 +78,7 @@ pub fn unzip( // Get the name of the inenr file in the zip file let mut zip = zip::ZipArchive::new(&f).unwrap(); let file = zip.by_index(0).unwrap(); - name = file.name().to_string().clone(); + name = file.name().to_string(); } if !success { @@ -111,23 +111,21 @@ pub fn unzip( for entry in read_dir(&write_path).unwrap() { let entry = entry.unwrap(); let entry_path = entry.path(); - if entry_path.is_dir() { - if !dirs.contains(&entry_path) { - new_dir = entry_path.to_str().unwrap().to_string(); - } + if entry_path.is_dir() && !dirs.contains(&entry_path) { + new_dir = entry_path.to_str().unwrap().to_string(); } } let mut res_hash = std::collections::HashMap::new(); res_hash.insert("file", zipfile.to_string()); - res_hash.insert("new_folder", new_dir.to_string()); + res_hash.insert("new_folder", new_dir); window.emit("extract_end", &res_hash).unwrap(); }); } -fn extract_rar(rarfile: &String, _f: &File, full_path: &path::PathBuf, _top_level: bool) -> bool { - let archive = Archive::new(rarfile.clone()); +fn extract_rar(rarfile: &str, _f: &File, full_path: &path::Path, _top_level: bool) -> bool { + let archive = Archive::new(rarfile.to_string()); let mut open_archive = archive .extract_to(full_path.to_str().unwrap().to_string()) @@ -149,7 +147,7 @@ fn extract_rar(rarfile: &String, _f: &File, full_path: &path::PathBuf, _top_leve } } -fn extract_zip(_zipfile: &String, f: &File, full_path: &path::PathBuf, top_level: bool) -> bool { +fn extract_zip(_zipfile: &str, f: &File, full_path: &path::Path, top_level: bool) -> bool { match zip_extract::extract(f, full_path, top_level) { Ok(_) => { println!(