Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2024-12-22 14:49:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: more strict [gupax_update_] deletion with regex

Browse source
This commit is contained in:
hinto-janaiyo 2022-11-14 22:11:00 -05:00
parent 4564070d92
commit c4311acdec
No known key found for this signature in database
GPG key ID: D7483F6CA27D1B1D
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main.rs
View file

@ -82,7 +82,7 @@ pub struct App {
p2pool: bool, // Is p2pool online? p2pool: bool, // Is p2pool online?
xmrig: bool, // Is xmrig online? xmrig: bool, // Is xmrig online?
// State from [--flags] // State from [--flags]
startup: bool, no_startup: bool,
reset: bool, reset: bool,
// Static stuff // Static stuff
now: Instant, // Internal timer now: Instant, // Internal timer
@ -121,7 +121,7 @@ impl App {
diff: false, diff: false,
p2pool: false, p2pool: false,
xmrig: false, xmrig: false,
startup: true, no_startup: false,
reset: false, reset: false,
now: Instant::now(), now: Instant::now(),
exe: "".to_string(), exe: "".to_string(),
@ -289,7 +289,12 @@ fn init_options() -> NativeOptions {
} }
fn init_auto(app: &App) { fn init_auto(app: &App) {
info!("Starting init_auto()..."); if app.no_startup {
info!("[--no-startup] flag passed, skipping init_auto()...");
return
} else {
info!("Starting init_auto()...");
}
// [Auto-Update] // [Auto-Update]
if app.state.gupax.auto_update { if app.state.gupax.auto_update {
let path_p2pool = app.og.lock().unwrap().gupax.absolute_p2pool_path.display().to_string(); let path_p2pool = app.og.lock().unwrap().gupax.absolute_p2pool_path.display().to_string();
@ -364,7 +369,7 @@ fn parse_args(mut app: App) -> App {
match arg.as_str() { match arg.as_str() {
"-l"|"--node-list" => { info!("Printing node list..."); print_disk_file(File::Node); } "-l"|"--node-list" => { info!("Printing node list..."); print_disk_file(File::Node); }
"-s"|"--state" => { info!("Printing state..."); print_disk_file(File::State); } "-s"|"--state" => { info!("Printing state..."); print_disk_file(File::State); }
"-n"|"--no-startup" => { info!("Disabling startup..."); app.startup = false; } "-n"|"--no-startup" => { info!("Disabling startup..."); app.no_startup = true; }
"-r"|"--reset" => { info!("Resetting state..."); app.reset = true; } "-r"|"--reset" => { info!("Resetting state..."); app.reset = true; }
_ => { eprintln!("[Gupax error] Invalid option: [{}]\nFor help, use: [--help]", arg); exit(1); }, _ => { eprintln!("[Gupax error] Invalid option: [{}]\nFor help, use: [--help]", arg); exit(1); },
} }
@ -388,12 +393,14 @@ pub fn get_exe_dir() -> Result<String, std::io::Error> {
} }
} }
// Clean any [gupax_tmp.*] directories // Clean any [gupax_update_.*] directories
// The trailing random bits must be exactly 10 alphanumeric characters
pub fn clean_dir() -> Result<(), anyhow::Error> { pub fn clean_dir() -> Result<(), anyhow::Error> {
let regex = Regex::new("^gupax_update_[A-Za-z0-9]{10}$").unwrap();
for entry in std::fs::read_dir(get_exe_dir()?)? { for entry in std::fs::read_dir(get_exe_dir()?)? {
let entry = entry?; let entry = entry?;
if ! entry.path().is_dir() { continue } if ! entry.path().is_dir() { continue }
if entry.file_name().to_str().ok_or(anyhow::Error::msg("Basename failed"))?.starts_with("gupax_update_") { if Regex::is_match(&regex, entry.file_name().to_str().ok_or(anyhow::Error::msg("Basename failed"))?) {
let path = entry.path(); let path = entry.path();
match std::fs::remove_dir_all(&path) { match std::fs::remove_dir_all(&path) {
Ok(_) => info!("Remove [{}] ... OK", path.display()), Ok(_) => info!("Remove [{}] ... OK", path.display()),

2
src/update.rs
View file

@ -245,7 +245,7 @@ impl Update {
// Get a temporary random folder for package download contents // Get a temporary random folder for package download contents
// This used to use [std::env::temp_dir()] but there were issues // This used to use [std::env::temp_dir()] but there were issues
// using [std::fs::rename()] on tmpfs -> disk (Invalid cross-device link (os error 18)). // using [std::fs::rename()] on tmpfs -> disk (Invalid cross-device link (os error 18)).
// So, uses the [Gupax] binary directory as a base, something like [/home/hinto/gupax/gupax_tmp_SG4xsDdVmr] // So, uses the [Gupax] binary directory as a base, something like [/home/hinto/gupax/gupax_update_SG4xsDdVmr]
pub fn get_tmp_dir() -> Result<String, anyhow::Error> { pub fn get_tmp_dir() -> Result<String, anyhow::Error> {
let rand_string: String = thread_rng() let rand_string: String = thread_rng()
.sample_iter(&Alphanumeric) .sample_iter(&Alphanumeric)