🐛⬆️ Fix a few bugs & bump dependencies

Cargo.toml

@@ -5,21 +5,21 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0"
-clap = { version = "4.4", features = ["derive", "cargo"] }
+clap = { version = "4.5", features = ["derive", "cargo"] }
 console = "0.15"
 derive_more = "0.99"
 edit = "0.1"
-env_logger = { version = "0.10", default-features = false }
+env_logger = { version = "0.11", default-features = false }
 fastanvil = "0"
 fastnbt = "2"
 flate2 = "1.0"
 globset = "0.4"
 ignore = "0.4"
 indicatif = { version = "0.17", features = ["rayon"] }
-inquire = { version = "0.6", features = ["console"], default-features = false }
+inquire = { version = "0.7", features = ["console"], default-features = false }
 log = "0.4"
 path-absolutize = "3.1"
-rayon = "1.7"
+rayon = "1.10"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 zip = { version = "0.6", features = ["deflate", "time"], default-features = false }

src/config.rs

@@ -2,6 +2,7 @@ use std::path::{Path, PathBuf};
 
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use ignore::overrides::{Override, OverrideBuilder};
+use path_absolutize::Absolutize;
 use serde::{Deserialize, Deserializer};
 
 use crate::entries::ExtraEntry;
@@ -85,6 +86,15 @@ where
 
 impl Config {
     pub fn load(path: &Path, noprompt: bool) -> Option<Self> {
+        let conf_path = path.absolutize().unwrap();
+        let current_dir = std::env::current_dir().expect("could not get working dir");
+        std::env::set_current_dir(path.parent()?).expect("could not set working dir");
+        let config = Self::try_load(&conf_path, noprompt);
+        std::env::set_current_dir(current_dir).expect("could not set working dir");
+        config
+    }
+
+    fn try_load(path: &Path, noprompt: bool) -> Option<Self> {
         std::fs::read_to_string(path).map_or_else(|err| {
             log::error!("could not read the config file ({err})");
             Self::try_edit(path, include_str!("../config.yaml"), noprompt)

src/entries/datapack.rs

@@ -1,4 +1,4 @@
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use crate::utils;
 use super::*;
 

src/entries/extra.rs

@@ -5,6 +5,7 @@ use serde::Deserialize;
 use super::*;
 
 #[derive(Clone, Debug, Deserialize, From)]
+#[serde(untagged)]
 pub enum ExtraEntry {
     Short(PathBuf),
     Full(PathBuf, PathBuf),

src/entries/file.rs

@@ -1,4 +1,4 @@
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use super::*;
 
 #[derive(Clone, Debug, Deref, From)]

src/entries/level.rs

@@ -1,5 +1,5 @@
 use crate::formats::{Level, NbtFormat};
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use super::*;
 
 #[derive(Clone, Debug, Deref, From)]

src/entries/region.rs

@@ -1,5 +1,5 @@
 use crate::formats::Region;
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use super::*;
 
 #[derive(Clone, Debug, Deref, From)]

src/entries/resourcepack.rs

@@ -1,4 +1,4 @@
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use crate::utils;
 use super::*;
 

src/entries/scoreboard.rs

@@ -1,5 +1,5 @@
 use crate::formats::{NbtFormat, Scoreboard};
-use crate::utils::PrefixPath;
+use crate::utils::PathUtils;
 use super::*;
 
 #[derive(Clone, Debug, Deref, From)]

src/storage/zip.rs

@@ -26,6 +26,10 @@ impl InMemoryStorage for ZipStorage<Cursor<Vec<u8>>> {
 
 impl FilesystemStorage for ZipStorage<File> {
     fn new(path: &Path) -> Self {
+        if let Some(parent) = path.parent() {
+            std::fs::create_dir_all(parent).unwrap();
+        }
+
         Self {
             path: Some(path.to_owned()),
             writer: Mutex::new(ZipWriter::new(File::create(path).unwrap())),

src/utils.rs

@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::{Component, Path, PathBuf};
 use std::str::FromStr;
 use std::time::Duration;
 
@@ -9,13 +9,37 @@ use inquire::{Confirm, CustomUserError, Text};
 
 use crate::storage::{InMemoryStorage, Storage, ZipStorage};
 
-pub trait PrefixPath {
+pub trait PathUtils {
     fn prefix<P: AsRef<Path>>(&self, prefix: Option<P>) -> PathBuf;
+    fn normalize(&self) -> PathBuf;
 }
 
-impl PrefixPath for PathBuf {
+impl PathUtils for PathBuf {
     fn prefix<P: AsRef<Path>>(&self, prefix: Option<P>) -> PathBuf {
-        prefix.map_or_else(|| self.to_owned(), |p| p.as_ref().join(self))
+        match prefix {
+            Some(p) => p.as_ref().join(self),
+            None => self.to_owned(),
+        }.normalize()
+    }
+
+    fn normalize(&self) -> PathBuf {
+        let mut components = self.components().peekable();
+        let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
+            components.next();
+            PathBuf::from(c.as_os_str())
+        } else {
+            PathBuf::new()
+        };
+        for component in components {
+            match component {
+                Component::Prefix(..) => unreachable!(),
+                Component::RootDir => ret.push(component.as_os_str()),
+                Component::CurDir => {}
+                Component::ParentDir => {ret.pop();},
+                Component::Normal(c) => ret.push(c),
+            }
+        }
+        ret
     }
 }