stash

multithreading, error handling

Cargo.toml

@@ -18,6 +18,7 @@ nanoserde = "0.1.37"
 sha1_smol = "1.0.0"
 indicatif = "0.17.8"
 webpki = "0.22.4"
+rayon = "1.8"
 
 [build-dependencies]
 winres = "0.1.12"

README.md

@@ -54,6 +54,7 @@ INSTALLDIR=/home/pluto/pluto_dir
 - ```--backup-restore <backup>``` - Restore backup
 - ```--cdn-url``` - Override CDN URL
 - ```-e, --exclude <path>``` - Exclude file/folder from update
+- ```--threads <number>``` - Number of download threads (default: 2)
 
 ### Building from Source
 1. Install [Rust](https://rustup.rs/)

src/args.rs

@@ -69,6 +69,10 @@ pub struct Args {
     // Exclude remote dirs
     #[clap(short, long)]
     pub exclude: Vec<String>,
+
+    /// Number of download threads
+    #[clap(long, default_value = "2")]
+    pub threads: usize,
 }
 
 pub fn get() -> Args {

src/http.rs

@@ -1,26 +1,31 @@
-use colored::*;
-use std::{fs, io::Write, path::Path, str};
+use std::{fs, io::Write, path::Path};
 
-pub fn get_body(url: &str) -> Vec<u8> {
+pub fn get_body(url: &str) -> Result<Vec<u8>, String> {
     let mut res: Vec<u8> = Vec::new();
-    http_req::request::get(url, &mut res).unwrap_or_else(|error| {
-        panic!("\n\n{}:\n{:?}", "Error".bright_red(), error);
-    });
-
-    res
+    http_req::request::get(url, &mut res)
+        .map_err(|e| format!("Failed to download from {}: {:#?}", url, e))?;
+    Ok(res)
 }
 
-pub fn get_body_string(url: &str) -> String {
-    String::from_utf8(get_body(url)).unwrap()
+pub fn get_body_string(url: &str) -> Result<String, String> {
+    let body = get_body(url)?;
+    String::from_utf8(body).map_err(|e| format!("Failed to parse response as UTF-8: {:#?}", e))
 }
 
-pub fn download_file(url: &str, file_path: &Path) {
-    let body = get_body(url);
+pub fn download_file(url: &str, file_path: &Path) -> Result<(), String> {
+    let body = get_body(url)?;
+
+    let parent = file_path
+        .parent()
+        .ok_or_else(|| format!("Failed to get parent directory of {}", file_path.display()))?;
+
+    fs::create_dir_all(parent)
+        .map_err(|e| format!("Failed to create directory {}: {:#?}", parent.display(), e))?;
+
+    fs::File::create(file_path)
+        .map_err(|e| format!("Failed to create file {}: {:#?}", file_path.display(), e))?
+        .write_all(&body)
+        .map_err(|e| format!("Failed to write to file {}: {:#?}", file_path.display(), e))?;
 
-    let mut f = fs::File::create(file_path).unwrap_or_else(|error| {
-        panic!("\n\n{}:\n{:?}", "Error".bright_red(), error);
-    });
-    f.write_all(&body).unwrap_or_else(|error| {
-        panic!("\n\n{}:\n{:?}", "Error".bright_red(), error);
-    });
+    Ok(())
 }