feat: replace Pdf module with Download for improved file handling and add download functionality

Author: Kremilly

src/cmd/tasks.rs

@@ -36,7 +36,7 @@ use crate::{
     },
 
     system::{
-        pdf::Pdf,
+        download::Download,
         markdown::Markdown,
         reporting::Reporting,
     },
@@ -113,15 +113,15 @@ impl Tasks {
 
         if line_url.contains(Uris::PROVIDERS_DOMAINS[6]) {
             let scihub_url = SciHub::new(&line_url).get_pdf().await?;
-            Pdf.download_doi(&scihub_url, &scihub_url, path).await?;
+            Download.download_doi(&scihub_url, &scihub_url, path).await?;
         }
 
         if line_url.contains(Uris::PROVIDERS_DOMAINS[7]) {
             ChatGPT::new(&line_url, &path).convert().await?;
         }
 
         if !Providers::new(&line_url).check_provider_domain() {
-            Pdf.download_line(&line_url, url, path).await?;
+            Download.download_line(&line_url, url, path).await?;
         }
 
         Ok(())

src/system/download.rs

@@ -0,0 +1,102 @@
+use indicatif::ProgressBar;
+
+use std::{
+    fs::File,
+    error::Error,
+
+    io::{
+        Read,
+        Write,
+        Cursor,
+    },
+};
+
+use crate::{
+    system::{
+        pdf::Pdf,
+        providers::Providers,
+    },
+
+    ui::{
+        ui_base::UI,
+        errors_alerts::ErrorsAlerts,
+        success_alerts::SuccessAlerts,
+    },
+
+    utils::{
+        url::UrlMisc,
+        remote::Remote,
+        file::FileUtils,
+        validation::Validate,
+    },
+};
+
+pub struct Download;
+
+impl Download {
+
+    async fn download(&self, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
+        UrlMisc::check_url_status(url).await?;
+
+        let (request_uri, filename) = Providers::new(url).get_from_provider().await?;
+        let response = reqwest::get(&request_uri).await?;
+        let total_size = Remote.get_file_size(&request_uri).await?;
+
+        let pb = ProgressBar::new(total_size);
+        pb.set_style(UI::pb_template());
+    
+        let output_path = FileUtils.get_output_path(path, &filename);
+        let mut dest = File::create(&output_path)?;
+        let content = response.bytes().await?;
+        let mut reader = Cursor::new(content);
+
+        let _ = Validate::file_type(&filename, ".pdf");
+    
+        let mut buffer = [0; 8192];
+        while let Ok(size) = reader.read(&mut buffer) {
+            if size == 0 { break; }
+            
+            dest.write_all(&buffer[..size])?;
+            pb.inc(size as u64);
+        }
+    
+        Ok(filename)
+    }
+
+    pub async fn download_line(&self, line_url: &str, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
+        if Pdf.is_pdf_file(&line_url).await? || Providers::new(url).valid_provider_domain() && !line_url.contains(".md") {
+            let result = self.download(&line_url, path).await;
+            
+            match result {
+                Ok(file) => {
+                    let file_path = &format!("{}{}", &path, &file);
+                    let password = Pdf.is_pdf_encrypted(&file_path);
+                    
+                    SuccessAlerts::download(&file, url, password);
+                    return Ok(file_path.to_string())
+                },
+
+                Err(e) => ErrorsAlerts::download(e, url),
+            }
+        }
+
+        Ok("".to_string())
+    }
+
+    pub async fn download_doi(&self, line_url: &str, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
+        let result = self.download(&line_url, path).await;
+            
+        match result {
+            Ok(file) => {
+                let file_path = &format!("{}{}", &path, &file);
+                SuccessAlerts::download(&file, url, false);
+                return Ok(file_path.to_string())
+            },
+
+            Err(e) => ErrorsAlerts::download(e, url),
+        }
+
+        Ok("".to_string())
+    }
+
+}

src/system/mod.rs

@@ -3,6 +3,7 @@ pub mod doi;
 pub mod general;
 pub mod scripts;
 pub mod markdown;
+pub mod download;
 pub mod providers;
 pub mod reporting;
 pub mod plataforms;

src/system/pdf.rs

@@ -5,13 +5,7 @@ use reqwest::header::CONTENT_TYPE as MimeType;
 use std::{
     error::Error,
     path::PathBuf,
-
-    io::{
-        Read,
-        Write,
-        Cursor,
-        BufReader
-    },
+    io::BufReader,
 
     fs::{
         self,
@@ -20,21 +14,10 @@ use std::{
 };
 
 use crate::{
+    ui::ui_base::UI,
+    utils::remote::Remote,
     render::render::Render,
-    system::providers::Providers,
-
-    ui::{
-        ui_base::UI,
-        errors_alerts::ErrorsAlerts,
-        success_alerts::SuccessAlerts,
-    },
 
-    utils::{
-        url::UrlMisc,
-        remote::Remote,
-        file::FileUtils,
-        validation::Validate,
-    },
 };
 
 pub struct Pdf;
@@ -75,34 +58,6 @@ impl Pdf {
         Ok(())
     }
 
-    pub async fn download(&self, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
-        UrlMisc::check_url_status(url).await?;
-
-        let (request_uri, filename) = Providers::new(url).get_from_provider().await?;
-        let response = reqwest::get(&request_uri).await?;
-        let total_size = Remote.get_file_size(&request_uri).await?;
-
-        let pb = ProgressBar::new(total_size);
-        pb.set_style(UI::pb_template());
-    
-        let output_path = FileUtils.get_output_path(path, &filename);
-        let mut dest = File::create(&output_path)?;
-        let content = response.bytes().await?;
-        let mut reader = Cursor::new(content);
-
-        let _ = Validate::file_type(&filename, ".pdf");
-    
-        let mut buffer = [0; 8192];
-        while let Ok(size) = reader.read(&mut buffer) {
-            if size == 0 { break; }
-            
-            dest.write_all(&buffer[..size])?;
-            pb.inc(size as u64);
-        }
-    
-        Ok(filename)
-    }
-
     pub fn is_pdf_encrypted(&self, file_path: &str) -> bool {
         if let Ok(file) = File::open(file_path) {
             let reader = BufReader::new(file);
@@ -115,40 +70,4 @@ impl Pdf {
         false
     }
 
-    pub async fn download_line(&self, line_url: &str, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
-        if self.is_pdf_file(&line_url).await? || Providers::new(url).valid_provider_domain() && !line_url.contains(".md") {
-            let result = self.download(&line_url, path).await;
-            
-            match result {
-                Ok(file) => {
-                    let file_path = &format!("{}{}", &path, &file);
-                    let password = self.is_pdf_encrypted(&file_path);
-                    
-                    SuccessAlerts::download(&file, url, password);
-                    return Ok(file_path.to_string())
-                },
-
-                Err(e) => ErrorsAlerts::download(e, url),
-            }
-        }
-
-        Ok("".to_string())
-    }
-
-    pub async fn download_doi(&self, line_url: &str, url: &str, path: &str) -> Result<String, Box<dyn Error>> {
-        let result = self.download(&line_url, path).await;
-            
-        match result {
-            Ok(file) => {
-                let file_path = &format!("{}{}", &path, &file);
-                SuccessAlerts::download(&file, url, false);
-                return Ok(file_path.to_string())
-            },
-
-            Err(e) => ErrorsAlerts::download(e, url),
-        }
-
-        Ok("".to_string())
-    }
-
 }