Cleanup and modernize

+ Bump to rust 2024
+ Cleaned up old code
+ Added more fail safes in case certain files are missing
This commit is contained in:
zerohd committed 2025-07-26 13:14:52 -06:00
1 parent 8378f2ead3
commit a9cf1d5c6f
13 files changed
+1999 -864

No files matched your search

+18 -12
View File
@@ -1,3 +1,4 @@
use log::{LevelFilter, info};
use std::path::PathBuf;
use structopt::StructOpt;
@@ -63,6 +64,11 @@ enum SubCommand {
}
fn main() {
env_logger::builder()
.filter_level(LevelFilter::Info)
.parse_default_env()
.build();
let opt = Albatross::from_args();
let cfg = AlbatrossConfig::new(opt.config_path.into_os_string().to_str().unwrap())
@@ -71,20 +77,20 @@ fn main() {
if cfg.world_config.is_some() {
match opt.sub_command {
SubCommand::Backup { output } => {
println!("Starting backup");
info!("Starting backup");
match do_backup(cfg, output) {
Ok(_) => println!("Backup complete!"),
Err(e) => println!("Error doing backup: {:?}", e),
Ok(_) => info!("Backup complete!"),
Err(e) => info!("Error doing backup: {e:?}"),
};
}
SubCommand::Export {
input_backup,
output,
} => {
println!("Starting export");
info!("Starting export");
match convert_backup_to_sp(&cfg, &input_backup, &output) {
Ok(_) => println!("Export complete!"),
Err(e) => println!("Error exporting backup: {:?}", e),
Ok(_) => info!("Export complete!"),
Err(e) => info!("Error exporting backup: {e:?}"),
};
}
SubCommand::Restore {
@@ -94,7 +100,7 @@ fn main() {
chunk,
upper_bound,
} => {
println!("Starting restore");
info!("Starting restore");
let server_directory = match server_directory {
Some(dir) => dir,
@@ -109,8 +115,8 @@ fn main() {
&backup_path,
&server_directory,
) {
Ok(count) => println!("Restored {} chunks!", count),
Err(e) => println!("Error restoring backup: {:?}", e),
Ok(count) => info!("Restored {count} chunks!"),
Err(e) => info!("Error restoring backup: {e:?}"),
};
} else {
match restore_chunk_from_backup(
@@ -119,13 +125,13 @@ fn main() {
&backup_path,
&server_directory,
) {
Ok(_) => println!("Restored chunk!"),
Err(e) => println!("Error restoring backup: {:?}", e),
Ok(_) => info!("Restored chunk!"),
Err(e) => info!("Error restoring backup: {e:?}"),
};
}
}
}
} else {
println!("No worlds specified in config file!")
info!("No worlds specified in config file!")
}
}