v0.2.0 overall structure and error handling improved

Author: git-user-cpp

src/functionality/configs.rs

@@ -69,21 +69,37 @@ fn copy_item_as_root(src: &str, dest: &str, description: &str) -> i8 {
             return 0;
         }
         Err(e) => {
-            eprintln!("{} failed to copy '{}' to '{}': {}",
-                      "error:".red(), src, dest, e.red());
+            eprintln!(
+                "{} failed to copy '{}' to '{}': {}",
+                "error:".red(),
+                src,
+                dest,
+                e.red()
+            );
             return 1;
         }
     }
 }
 
-
 /// sets up root config in /root directory by copying files/directories from user's home
 /// Note: Copies .oh-my-zsh, .zshrc, and .vimrc using 'cp -r' via sudo.
 pub fn setup_root_config(home_dir: &str) -> i8 {
     let items_to_copy = [
-        (format!("{}/.oh-my-zsh", home_dir), "/root/.oh-my-zsh".to_string(), "/root/.oh-my-zsh"),
-        (format!("{}/.zshrc", home_dir), "/root/.zshrc".to_string(), "/root/.zshrc"),
-        (format!("{}/.vimrc", home_dir), "/root/.vimrc".to_string(), "/root/.vimrc"),
+        (
+            format!("{}/.oh-my-zsh", home_dir),
+            "/root/.oh-my-zsh".to_string(),
+            "/root/.oh-my-zsh",
+        ),
+        (
+            format!("{}/.zshrc", home_dir),
+            "/root/.zshrc".to_string(),
+            "/root/.zshrc",
+        ),
+        (
+            format!("{}/.vimrc", home_dir),
+            "/root/.vimrc".to_string(),
+            "/root/.vimrc",
+        ),
     ];
 
     for (src, dest, desc) in &items_to_copy {
@@ -94,4 +110,4 @@ pub fn setup_root_config(home_dir: &str) -> i8 {
     }
 
     return 0;
-}
+}

src/functionality/env.rs

@@ -28,8 +28,12 @@ pub fn get_env_var(env_var: &str) -> Option<String> {
     match var(env_var) {
         Ok(value) => Some(value),
         Err(e) => {
-            eprintln!("{} failed to get environment variable '{}': {}",
-                      "error:".red(), env_var, e);
+            eprintln!(
+                "{} failed to get environment variable '{}': {}",
+                "error:".red(),
+                env_var,
+                e
+            );
             None
         }
     }

src/functionality/iptables.rs

@@ -22,30 +22,53 @@ use super::commands::{run_sudo_command, run_sudo_command_with_stdin};
 use colored::Colorize;
 use std::{fs::read_to_string, path::Path};
 
-/// sets up iptables
+/// sets up iptables file by reading from source and writing to destination as root
 pub fn iptables_file_setup() -> i8 {
     let source_path = Path::new("../configs/iptables.rules");
     let dest_path = Path::new("/etc/iptables/iptables.rules");
 
-    match read_to_string(source_path) {
-        Ok(rules) => {
-            let command = "tee";
-            let args = &[dest_path.as_os_str().to_str().unwrap()];
+    let rules = match read_to_string(source_path) {
+        Ok(rules_content) => rules_content,
+        Err(e) => {
+            eprintln!(
+                "{} failed to read iptables rules from source file '{}': {}",
+                "error:".red(),
+                source_path.display(),
+                e
+            );
+            return 2;
+        }
+    };
+
+    let command = "tee";
+
+    let dest_path_str = match dest_path.to_str() {
+        Some(s) => s,
+        None => {
+            eprintln!(
+                "{} destination path '{}' is not valid UTF-8.",
+                "error:".red(),
+                dest_path.display()
+            );
+            return 1;
+        }
+    };
+
+    let args = &[dest_path_str];
 
-            match run_sudo_command_with_stdin(command, args, rules) {
-                Ok(_) => {
-                    println!("iptables.rules {}", "created successfully".green());
-                    return 0;
-                }
-                Err(e) => {
-                    eprintln!("error setting up iptables file: {}", e);
-                    1
-                }
-            }
+    match run_sudo_command_with_stdin(command, args, rules) {
+        Ok(()) => {
+            println!("iptables.rules {}", "created successfully".green());
+            return 0;
         }
         Err(e) => {
-            eprintln!("failed to read iptables rules from source file: {}", e);
-            2
+            eprintln!(
+                "{} failed to write iptables rules to '{}': {}",
+                "error:".red(),
+                dest_path.display(),
+                e.red()
+            );
+            return 1;
         }
     }
 }
@@ -59,11 +82,11 @@ pub fn iptables_rules_setup() -> i8 {
     match run_sudo_command(command, args) {
         Ok(_) => {
             println!("iptables.rules {}", "set successfully".green());
-            0
+            return 0;
         }
         Err(e) => {
             eprintln!("error applying iptables rules: {}", e);
-            1
+            return 1;
         }
     }
 }

src/functionality/prog_fun.rs

@@ -95,11 +95,9 @@ pub fn check_sw_install_type() -> bool {
             println!("{}", "you chose to use the default list.\ninstallation takes a few minutes, please wait...".green());
             return false;
         }
-        Err(_) => {
-            handle_error(
-                "please enter 0 for a custom list or any other number for the default list.",
-            )
-        }
+        Err(_) => handle_error(
+            "please enter 0 for a custom list or any other number for the default list.",
+        ),
     }
 }
 

src/functionality/shell.rs

@@ -30,26 +30,30 @@ pub fn change_def_shell(name: &str) -> i8 {
 
     match run_sudo_command(command, args) {
         Ok(_) => {
-            println!("zsh {}", "shell set successfully".green());
+            println!("zsh {}{}", "shell set successfully for ".green(), name);
             return 0;
         }
         Err(e) => {
-            eprintln!("{} failed to change default shell for user '{}': {}",
-                      "error:".red(), name, e.red());
+            eprintln!(
+                "{} failed to change default shell for user '{}': {}",
+                "error:".red(),
+                name,
+                e.red()
+            );
             return 1;
         }
     }
 }
 
-
 /// installs oh my zsh by piping curl output to bash
 pub fn install_omz() -> i8 {
     let mut curl_cmd = Command::new("curl");
-    curl_cmd.args(&[
-        "-fsSL",
-        "https://github.com/ohmyzsh/ohmyzsh/master/tools/install.sh",
-    ])
-    .stdout(Stdio::piped());
+    curl_cmd
+        .args(&[
+            "-fsSL",
+            "https://github.com/ohmyzsh/ohmyzsh/master/tools/install.sh",
+        ])
+        .stdout(Stdio::piped());
 
     let mut curl_process = match curl_cmd.spawn() {
         Ok(process) => process,
@@ -95,9 +99,13 @@ pub fn install_omz() -> i8 {
     };
 
     if !curl_status.success() {
-        eprintln!("{} curl command failed with status: {}",
-                  "error:".red(),
-                  curl_status.code().map_or_else(|| "terminated by signal".into(), |c| c.to_string()));
+        eprintln!(
+            "{} curl command failed with status: {}",
+            "error:".red(),
+            curl_status
+                .code()
+                .map_or_else(|| "terminated by signal".into(), |c| c.to_string())
+        );
         let _ = bash_process.kill();
         let _ = bash_process.wait();
         return 1;
@@ -118,7 +126,10 @@ pub fn install_omz() -> i8 {
         eprintln!(
             "{} oh-my-zsh installation script failed with status: {}",
             "error:".red(),
-            output.status.code().map_or_else(|| "terminated by signal".into(), |c| c.to_string())
+            output
+                .status
+                .code()
+                .map_or_else(|| "terminated by signal".into(), |c| c.to_string())
         );
         if !output.stdout.is_empty() {
             eprintln!("--- Script stdout ---");
@@ -140,17 +151,13 @@ pub fn install_omz() -> i8 {
 /// Takes home directory, plugin name (for directory and messages), and repository URL.
 fn install_zsh_plugin(home_dir: &str, plugin_name: &str, repo_url: &str) -> i8 {
     let zsh_custom_path = format!("{}/.oh-my-zsh/custom/plugins/{}", home_dir, plugin_name);
-    let args = &[
-        "clone",
-        repo_url,
-        &zsh_custom_path,
-    ];
+    let args = &["clone", repo_url, &zsh_custom_path];
 
     println!("Cloning {}...", plugin_name.green());
 
     match run_user_command("git", args) {
         Ok(_) => {
-            println!("{} {}", plugin_name.green(), "installed successfully".green());
+            println!("{} {}", plugin_name, "installed successfully".green());
             return 0;
         }
         Err(e) => {
@@ -167,7 +174,6 @@ fn install_zsh_plugin(home_dir: &str, plugin_name: &str, repo_url: &str) -> i8 {
     }
 }
 
-
 /// installs zsh autosuggestions plugin
 /// Uses the generic zsh plugin installer.
 pub fn install_zsh_autosuggestions(home_dir: &str) -> i8 {

src/functionality/software.rs

@@ -18,9 +18,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+use super::prog_fun::handle_error;
 use colored::Colorize;
 use std::process::Command;
-use super::prog_fun::handle_error;
 
 /// installs software using pacman
 /// Takes a slice of string slices for package names.
@@ -34,7 +34,12 @@ pub fn software_setup(packages: &[&str]) -> i8 {
         .args(packages)
         .arg("--noconfirm");
 
-    println!("{}{}{}", "Running command: sudo pacman -Sy ".green(), packages.join(" "), " --noconfirm".green());
+    println!(
+        "Running command: {}{}{}",
+        "sudo pacman -Sy ".green(),
+        packages.join(" "),
+        " --noconfirm".green()
+    );
 
     let output = match command.output() {
         Ok(output) => output,

src/functionality/task.rs

@@ -27,4 +27,4 @@ pub fn validate_task_status(status: i8) {
         print_setup_status_failed();
         exit(status as i32);
     }
-}
+}

src/functionality/zram.rs

@@ -18,38 +18,28 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+use super::commands::run_sudo_command;
 use colored::Colorize;
-use std::process::Command;
 
-/// sets up zram swap configuration
+/// sets up zram swap configuration by copying the generator file
 pub fn zram_swap_setup() -> i8 {
-    let output = Command::new("sudo")
-        .arg("cp")
-        .arg("../configs/zram-generator.conf")
-        .arg("/etc/systemd/")
-        .output();
+    let source_config_path = "../configs/zram-generator.conf";
+    let destination_path = "/etc/systemd/zram-generator.conf";
 
-    match output {
-        Ok(output) => {
-            if output.status.success() {
-                println!("zram {}", "swap configuration copied successfully.".green());
-                return 0;
-            } else {
-                eprintln!(
-                    "{}{}",
-                    "error copying zram-generator.conf:".red(),
-                    String::from_utf8_lossy(&output.stderr).red()
-                );
-                return 1;
-            }
+    let result = run_sudo_command("cp", &[source_config_path, destination_path]);
+
+    match result {
+        Ok(()) => {
+            println!("zram {}", "swap configuration copied successfully.".green());
+            return 0;
         }
         Err(e) => {
             eprintln!(
-                "{}{}",
-                "error executing command:".red(),
-                e.to_string().red()
+                "{} failed to copy zram-generator.conf: {}",
+                "error:".red(),
+                e.red()
             );
-            return 2;
+            return 1;
         }
     }
 }

src/lib.rs

@@ -25,7 +25,8 @@ use functionality::{
     env::get_env_var,
     iptables::{iptables_file_setup, iptables_rules_setup},
     prog_fun::{
-        check_sw_install_type, default_sw_package, handle_error, print_license_info, print_setup_status_success, set_sw_list, validate_root_priviliges
+        check_sw_install_type, default_sw_package, handle_error, print_license_info,
+        print_setup_status_success, set_sw_list, validate_root_priviliges,
     },
     shell::{
         change_def_shell, install_omz, install_zsh_autosuggestions, install_zsh_syntax_highlighting,