Add cache cleaning (#13)
All checks were successful
Build on Release / cargo-build (push) Successful in 10s

Reviewed-on: #13

Increment Version
This commit is contained in:
Luke Harding 2024-04-30 21:50:31 +00:00
parent 842dba73ac
commit ef2134a00b
6 changed files with 47 additions and 19 deletions

2
Cargo.lock generated
View File

@ -20,7 +20,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "rust-archlinux-update" name = "rust-archlinux-update"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"colored", "colored",
] ]

View File

@ -1,6 +1,6 @@
[package] [package]
name = "rust-archlinux-update" name = "rust-archlinux-update"
version = "0.1.0" version = "0.1.1"
edition = "2021" edition = "2021"
license = "GPL-3" license = "GPL-3"

View File

@ -1 +0,0 @@
pub mod pacman;

View File

@ -13,10 +13,10 @@
use colored::{ColoredString, Colorize}; use colored::{ColoredString, Colorize};
use apis::pacman; use wrappers::pacman;
mod apis;
mod shell_commands; mod shell_commands;
mod wrappers;
fn main() { fn main() {
println!("{}", copyright_notice()); println!("{}", copyright_notice());
@ -50,6 +50,12 @@ fn main() {
return; return;
} }
notice_println("Clearing Cache");
if let Err(e) = pacman::clean_cache() {
error_println(e.to_string());
return;
}
notice_println("\nUpdate process complete!"); notice_println("\nUpdate process complete!");
} }

14
src/wrappers/mod.rs Normal file
View File

@ -0,0 +1,14 @@
/*
Rust Arch Linux Updater
Copyright (C) 2024 Luke Harding <luke@lukeh990.io>
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 <https://www.gnu.org/licenses/>.
*/
/*
wrappers/mod.rs
Just makes pacman accessible
*/
pub mod pacman;

View File

@ -7,13 +7,14 @@
*/ */
/* /*
pacman_api.rs wrappers/pacman.rs
This module provides an api to make working with Pacman much easier. This module provides a wrapper to make working with Pacman much easier.
*/ */
use std::{error, fmt, result}; use std::{error, fmt, result};
use std::fmt::Formatter; use std::fmt::Formatter;
use std::path::Path; use std::path::Path;
use std::process::ExitStatus;
use crate::shell_commands; use crate::shell_commands;
@ -64,16 +65,7 @@ pub fn check() -> Result<()> {
pub fn update_all() -> Result<()> { pub fn update_all() -> Result<()> {
let exit_status = shell_commands::execute_in_sh("sudo pacman -Syu")?; let exit_status = shell_commands::execute_in_sh("sudo pacman -Syu")?;
if !exit_status.success() { check_exit_code(exit_status)
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(())
} }
pub fn get_unused() -> Result<Vec<String>> { pub fn get_unused() -> Result<Vec<String>> {
@ -90,9 +82,26 @@ pub fn remove_unused(packages: Vec<String>) -> Result<()> {
let package_string = packages.join(" "); let package_string = packages.join(" ");
let command = format!("sudo pacman -Rns {}", package_string); 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(()) Ok(())
} }