neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-04 17:23:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MetadataWriter: add fallback to level.dat_old

Browse source 
Looking at inotify dumps, it appears like because of bad implementation
choices, Minecraft's level.dat may not exist for a brief moment between
moving the old file to level.dat_old and moving a new version into place.

Add a fallback to level.dat_old, so generation will not fail if were
unlucky enough to hit this moment.
This commit is contained in:
Matthias Schiffer 2025-02-13 20:10:50 +01:00
parent 971afea727
commit 37126f69fc
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/common.rs
View file

@ -139,6 +139,8 @@ pub struct Config {
pub region_dir: PathBuf, pub region_dir: PathBuf,
/// Path of input `level.dat` file /// Path of input `level.dat` file
pub level_dat_path: PathBuf, pub level_dat_path: PathBuf,
/// Path of input `level.dat_old` file
pub level_dat_old_path: PathBuf,
/// Base path for storage of rendered tile data /// Base path for storage of rendered tile data
pub output_dir: PathBuf, pub output_dir: PathBuf,
/// Path for storage of intermediate processed data files /// Path for storage of intermediate processed data files
@ -170,6 +172,9 @@ impl Config {
let region_dir = [&args.input_dir, Path::new("region")].iter().collect(); let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect(); let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
let level_dat_old_path = [&args.input_dir, Path::new("level.dat_old")]
.iter()
.collect();
let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect(); let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
let entities_dir: PathBuf = [&processed_dir, Path::new("entities")].iter().collect(); let entities_dir: PathBuf = [&processed_dir, Path::new("entities")].iter().collect();
let entities_path_final = [&entities_dir, Path::new("entities.bin")].iter().collect(); let entities_path_final = [&entities_dir, Path::new("entities.bin")].iter().collect();
@ -186,6 +191,7 @@ impl Config {
num_threads, num_threads,
region_dir, region_dir,
level_dat_path, level_dat_path,
level_dat_old_path,
output_dir: args.output_dir.clone(), output_dir: args.output_dir.clone(),
processed_dir, processed_dir,
entities_dir, entities_dir,

9
src/core/metadata_writer.rs
View file

@ -124,7 +124,14 @@ impl<'a> MetadataWriter<'a> {
/// Reads and deserializes the `level.dat` of the Minecraft save data /// Reads and deserializes the `level.dat` of the Minecraft save data
fn read_level_dat(&self) -> Result<de::LevelDat> { fn read_level_dat(&self) -> Result<de::LevelDat> {
crate::nbt::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat") let res = crate::nbt::data::from_file(&self.config.level_dat_path);
if res.is_err() {
if let Ok(level_dat_old) = crate::nbt::data::from_file(&self.config.level_dat_old_path)
{
return Ok(level_dat_old);
}
}
res.context("Failed to read level.dat")
} }
/// Generates [Spawn] data from a [de::LevelDat] /// Generates [Spawn] data from a [de::LevelDat]