mirror of
https://github.com/neocturne/MinedMap.git
synced 2025-03-05 01:24:53 +01:00
main: build processed_dir path outside of RegionProcessor::new()
This commit is contained in:
parent
ea604b88f2
commit
a2ba7e4738
1 changed files with 7 additions and 6 deletions
13
src/main.rs
13
src/main.rs
|
@ -19,16 +19,16 @@ struct Args {
|
||||||
type RegionCoords = (i32, i32);
|
type RegionCoords = (i32, i32);
|
||||||
|
|
||||||
/// Type with methods for processing the regions of a Minecraft save directory
|
/// Type with methods for processing the regions of a Minecraft save directory
|
||||||
struct RegionProcessor {
|
struct RegionProcessor<'a> {
|
||||||
block_types: resource::BlockTypeMap,
|
block_types: resource::BlockTypeMap,
|
||||||
processed_dir: PathBuf,
|
processed_dir: &'a Path,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RegionProcessor {
|
impl<'a> RegionProcessor<'a> {
|
||||||
fn new(output_dir: &Path) -> Self {
|
fn new(processed_dir: &'a Path) -> Self {
|
||||||
RegionProcessor {
|
RegionProcessor {
|
||||||
block_types: resource::block_types(),
|
block_types: resource::block_types(),
|
||||||
processed_dir: [output_dir, Path::new("processed")].iter().collect(),
|
processed_dir,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,8 +148,9 @@ fn main() -> Result<()> {
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
|
|
||||||
let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
|
let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
|
||||||
|
let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
|
||||||
|
|
||||||
let region_processor = RegionProcessor::new(&args.output_dir);
|
let region_processor = RegionProcessor::new(&processed_dir);
|
||||||
region_processor.process_region_dir(®ion_dir)?;
|
region_processor.process_region_dir(®ion_dir)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
Loading…
Add table
Reference in a new issue