Some fixes

Author: Bircoder432

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dwrs"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["vadim rofeds12345@gmail.com"]
 edition = "2024"
 description = "CLI tool for parallel file downloads with progress bar and i18n support"

Cargo.toml

@@ -7,14 +7,14 @@ use serde::{Deserialize, Serialize};
 struct ConfigFile {
     pub template: Option<String>,
     pub bar_chars: Option<String>,
-    pub workers: Option<u8>,
+    pub workers: Option<usize>,
 }
 
 #[derive(Debug)]
 pub struct Config {
     pub template: String,
     pub bar_chars: String,
-    pub workers: u8,
+    pub workers: usize,
 }
 
 impl Config {
@@ -27,10 +27,11 @@ impl Config {
                 bar_chars: None,
                 workers: None,
             });
+        let default = Self::default();
         Self {
-            template: config_file.template.unwrap_or(Self::default().template),
-            bar_chars: config_file.bar_chars.unwrap_or(Self::default().bar_chars),
-            workers: config_file.workers.unwrap_or(Self::default().workers),
+            template: config_file.template.unwrap_or(default.template),
+            bar_chars: config_file.bar_chars.unwrap_or(default.bar_chars),
+            workers: config_file.workers.unwrap_or(default.workers),
         }
     }
 

src/config.rs

@@ -12,16 +12,16 @@ pub async fn download_file(
     resume: bool,
     workers: usize,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let head_resp = client.head(url).send().await?;
+    let head_resp = client.head(url).send().await.ok();
     let total_size = head_resp
-        .headers()
-        .get(reqwest::header::CONTENT_LENGTH)
+        .as_ref()
+        .and_then(|r| r.headers().get(reqwest::header::CONTENT_LENGTH))
         .and_then(|v| v.to_str().ok()?.parse::<u64>().ok())
         .unwrap_or(0);
 
     let accept_ranges = head_resp
-        .headers()
-        .get(reqwest::header::ACCEPT_RANGES)
+        .as_ref()
+        .and_then(|r| r.headers().get(reqwest::header::ACCEPT_RANGES))
         .and_then(|v| v.to_str().ok())
         .unwrap_or("");
 
@@ -88,7 +88,12 @@ async fn download_range(
 
     let mut offset = start;
     if resume && output.exists() {
-        offset += fs::metadata(output).await?.len();
+        let existing_len = fs::metadata(output).await?.len();
+        if existing_len > end - start + 1 {
+            fs::remove_file(output).await.ok();
+        } else {
+            offset += existing_len;
+        }
     }
 
     let mut request = client.get(url);

src/download.rs

@@ -27,6 +27,7 @@ pub mod progress;
 
 use futures::stream::{FuturesUnordered, StreamExt};
 use indicatif::MultiProgress;
+use notify_rust::Notification;
 use reqwest::Client;
 use rust_i18n::t;
 use tokio::sync::Semaphore;
@@ -114,7 +115,15 @@ impl Downloader {
             self.config.continue_download,
             self.config.workers,
         )
-        .await
+        .await?;
+        if self.config.notify {
+            Notification::new()
+                .summary("Download end")
+                .body("Download end")
+                .show()
+                .ok();
+        }
+        Ok(())
     }
 
     /// Download multiple files in parallel
@@ -174,6 +183,13 @@ impl Downloader {
         while let Some(result) = tasks.next().await {
             let _ = result??;
         }
+        if self.config.notify {
+            Notification::new()
+                .summary("Downloading end")
+                .body("download end")
+                .show()
+                .ok();
+        }
 
         Ok(())
     }

src/lib.rs

@@ -27,10 +27,10 @@ async fn main() {
 
     let mut workers = cfg.workers;
     if args.workers != 1 {
-        workers = args.workers as u8;
+        workers = args.workers;
     }
     let download_config = dwrs::DownloadConfig {
-        workers: workers as usize,
+        workers: workers,
         template: cfg.template,
         chars: cfg.bar_chars,
         continue_download: args.continue_,