Added the ability to restore chunks from a backup

+ Added `restore` subcommand
+ Needs more testing, but appears to be working
This commit is contained in:
zerohd committed 2020-11-03 21:46:16 -06:00
1 parent b9aad433ba
commit a94d0221c5
5 files changed
+176 -11

No files matched your search

+49 -2
View File
@@ -5,9 +5,11 @@ mod backup;
mod config;
mod discord;
mod region;
mod restore;
use crate::backup::{convert_backup_to_sp, do_backup};
use crate::config::AlbatrossConfig;
use crate::restore::{restore_range_from_backup, restore_chunk_from_backup};
#[derive(Debug, StructOpt)]
#[structopt(about = "Backup your Minecraft Server!")]
@@ -24,13 +26,13 @@ struct Albatross {
enum SubCommand {
/// Backup a server
Backup {
/// Output location override
/// Output path
#[structopt(short = "o", long = "ouptut", parse(from_os_str))]
output: Option<PathBuf>,
},
/// Export a backup as a single player world
Export {
/// Convert backup to singleplayer world
/// Backup to convert
#[structopt(parse(from_os_str))]
input_backup: PathBuf,
@@ -38,6 +40,19 @@ enum SubCommand {
#[structopt(parse(from_os_str))]
output: PathBuf,
},
/// Restore certain chunks from a backup
Restore {
/// Output server directory
#[structopt(short, long, parse(from_os_str))]
server_directory: Option<PathBuf>,
/// World to restore
world_name: String,
/// Backup to restore from
#[structopt(parse(from_os_str))]
backup_path: PathBuf,
/// Backup range can be a single chunk coordinate pair or a chunk range
chunk_range: Vec<i32>,
},
}
fn main() {
@@ -65,6 +80,38 @@ fn main() {
Err(e) => println!("Error exporting backup: {:?}", e),
};
}
SubCommand::Restore {
server_directory,
world_name,
backup_path,
chunk_range
} => {
println!("Starting restore");
let server_directory = match server_directory {
Some(dir) => dir,
None => cfg.backup.minecraft_dir
};
if chunk_range.len() > 2 {
let lower_x = chunk_range[0];
let lower_z = chunk_range[1];
let upper_x = chunk_range[2];
let upper_z = chunk_range[3];
match restore_range_from_backup(world_name.as_str(), lower_x, upper_x, lower_z, upper_z, &backup_path, &server_directory) {
Ok(count) => println!("Restored {} chunks!", count),
Err(e) => println!("Error restoring backup: {:?}", e),
};
}
else if chunk_range.len() == 2 {
let x = chunk_range[0];
let z = chunk_range[1];
match restore_chunk_from_backup(world_name.as_str(), x, z, &backup_path, &server_directory) {
Ok(_) => println!("Restored chunk!"),
Err(e) => println!("Error restoring backup: {:?}", e),
};
}
}
}
} else {
println!("No worlds specified in config file!")