warren/MCModpackManager
1
0
Fork 0
mirror of https://github.com/WarrenHood/MCModpackManager.git synced 2025-11-04 01:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Canonicalise paths passed in to profile commands

Browse source
This commit is contained in:
Warren Hood 2024-10-08 17:52:48 +02:00
parent 7afa514783
commit 5b5dc0f4df
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mcmpmgr/src/main.rs
View file

@ -484,7 +484,7 @@ async fn main() -> anyhow::Result<()> {
instance_directory,
} => {
let mut userdata = profiles::Data::load()?;
let profile = Profile::new(&instance_directory, pack_source, side);
let profile = Profile::new(&instance_directory, pack_source, side)?;
userdata.add_profile(&name, profile);
userdata.save()?;
println!("Saved profile '{name}'");

19
mcmpmgr/src/profiles.rs
View file

@ -26,8 +26,11 @@ impl FromStr for PackSource {
let url = s.trim_start_matches("git+").to_string();
Ok(PackSource::Git { url })
} else {
let path = PathBuf::from(s);
Ok(PackSource::Local { path })
let path = PathBuf::from(s).canonicalize();
match path {
Ok(path) => Ok(PackSource::Local { path }),
Err(e) => Err(e.to_string())
}
}
}
}
@ -49,12 +52,16 @@ pub struct Profile {
}
impl Profile {
pub fn new(instance_folder: &Path, pack_source: PackSource, side: DownloadSide) -> Self {
Self {
instance_folder: instance_folder.into(),
pub fn new(
instance_folder: &Path,
pack_source: PackSource,
side: DownloadSide,
) -> Result<Self> {
Ok(Self {
instance_folder: instance_folder.canonicalize()?,
pack_source,
side,
}
})
}
pub async fn install(&self) -> Result<()> {

3
mmm/src/main.rs
View file

@ -84,7 +84,8 @@ impl TryFrom<ProfileSettings> for profiles::Profile {
&instance_dir,
profiles::PackSource::from_str(&pack_source)?,
value.side,
))
)
.map_err(|e| e.to_string())?)
}
}