diff --git a/src/apis/mod.rs b/src/apis/mod.rs deleted file mode 100644 index f4da7e8..0000000 --- a/src/apis/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod pacman; diff --git a/src/main.rs b/src/main.rs index fe7dec9..542aa09 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,10 +13,10 @@ use colored::{ColoredString, Colorize}; -use apis::pacman; +use wrappers::pacman; -mod apis; mod shell_commands; +mod wrappers; fn main() { println!("{}", copyright_notice()); @@ -50,6 +50,12 @@ fn main() { return; } + notice_println("Clearing Cache"); + if let Err(e) = pacman::clean_cache() { + error_println(e.to_string()); + return; + } + notice_println("\nUpdate process complete!"); } diff --git a/src/wrappers/mod.rs b/src/wrappers/mod.rs new file mode 100644 index 0000000..3b08948 --- /dev/null +++ b/src/wrappers/mod.rs @@ -0,0 +1,14 @@ +/* + Rust Arch Linux Updater + Copyright (C) 2024 Luke Harding + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License along with this program. If not, see . +*/ + +/* + wrappers/mod.rs + Just makes pacman accessible +*/ + +pub mod pacman; diff --git a/src/apis/pacman.rs b/src/wrappers/pacman.rs similarity index 85% rename from src/apis/pacman.rs rename to src/wrappers/pacman.rs index 0f7f4a0..40d42a9 100644 --- a/src/apis/pacman.rs +++ b/src/wrappers/pacman.rs @@ -7,13 +7,14 @@ */ /* - pacman_api.rs - This module provides an api to make working with Pacman much easier. + wrappers/pacman.rs + This module provides a wrapper to make working with Pacman much easier. */ use std::{error, fmt, result}; use std::fmt::Formatter; use std::path::Path; +use std::process::ExitStatus; use crate::shell_commands; @@ -64,16 +65,7 @@ pub fn check() -> Result<()> { pub fn update_all() -> Result<()> { let exit_status = shell_commands::execute_in_sh("sudo pacman -Syu")?; - if !exit_status.success() { - let exit_code = match exit_status.code() { - Some(exit_code) => exit_code, - None => return Err(PacmanError::Other("No Exit Code Found").into()), - }; - - return Err(PacmanError::ExitCode(exit_code).into()); - } - - Ok(()) + check_exit_code(exit_status) } pub fn get_unused() -> Result> { @@ -90,9 +82,26 @@ pub fn remove_unused(packages: Vec) -> Result<()> { let package_string = packages.join(" "); let command = format!("sudo pacman -Rns {}", package_string); - let out = shell_commands::execute_in_sh(command)?; + let exit_status = shell_commands::execute_in_sh(command)?; - dbg!(&out); + check_exit_code(exit_status) +} + +pub fn clean_cache() -> Result<()> { + let exit_status = shell_commands::execute_in_sh("sudo pacman -Scc")?; + + check_exit_code(exit_status) +} + +fn check_exit_code(exit_status: ExitStatus) -> Result<()> { + if !exit_status.success() { + let exit_code = match exit_status.code() { + Some(exit_code) => exit_code, + None => return Err(PacmanError::Other("No Exit Code Found").into()), + }; + + return Err(PacmanError::ExitCode(exit_code).into()); + } Ok(()) }