Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix importing newer Prism instances (#3129)

Browse Source 
* Fix importing newer Prism instances and clean up import code a bit

* cargo fmt

---------

Co-authored-by: Jai Agrawal <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
Josiah Glosson 2025-01-15 17:34:21 -06:00 committed by GitHub
parent e4cc8ef509
commit 0d7934e3b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/app-lib/src/api/pack/import/mmc.rs
View File

@ -180,9 +180,8 @@ pub async fn import_mmc(
instance_folder: String, // instance folder in mmc_base_path instance_folder: String, // instance folder in mmc_base_path
profile_path: &str, // path to profile profile_path: &str, // path to profile
) -> crate::Result<()> { ) -> crate::Result<()> {
let mmc_instance_path = mmc_base_path let mmc_instance_path =
.join("instances") mmc_base_path.join("instances").join(instance_folder);
.join(instance_folder.clone());
let mmc_pack = let mmc_pack =
io::read_to_string(&mmc_instance_path.join("mmc-pack.json")).await?; io::read_to_string(&mmc_instance_path.join("mmc-pack.json")).await?;
@ -209,9 +208,18 @@ pub async fn import_mmc(
profile_path: profile_path.to_string(), profile_path: profile_path.to_string(),
}; };
// Managed pack let mut minecraft_folder = mmc_instance_path.join("minecraft");
let backup_name = "Imported Modpack".to_string(); if !minecraft_folder.is_dir() {
minecraft_folder = mmc_instance_path.join(".minecraft");
if !minecraft_folder.is_dir() {
return Err(crate::ErrorKind::InputError(
"Instance is missing Minecraft directory".to_string(),
)
.into());
}
}
// Managed pack
if instance_cfg.managed_pack.unwrap_or(false) { if instance_cfg.managed_pack.unwrap_or(false) {
match instance_cfg.managed_pack_type { match instance_cfg.managed_pack_type {
Some(MMCManagedPackType::Modrinth) => { Some(MMCManagedPackType::Modrinth) => {
@ -220,38 +228,26 @@ pub async fn import_mmc(
// Modrinth Managed Pack // Modrinth Managed Pack
// Kept separate as we may in the future want to add special handling for modrinth managed packs // Kept separate as we may in the future want to add special handling for modrinth managed packs
let backup_name = "Imported Modrinth Modpack".to_string(); import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modrinth Modpack".to_string(), description, mmc_pack).await?;
let minecraft_folder = mmc_base_path.join("instances").join(instance_folder).join(".minecraft");
import_mmc_unmanaged(profile_path, minecraft_folder, backup_name, description, mmc_pack).await?;
} }
Some(MMCManagedPackType::Flame) | Some(MMCManagedPackType::ATLauncher) => { Some(MMCManagedPackType::Flame) | Some(MMCManagedPackType::ATLauncher) => {
// For flame/atlauncher managed packs // For flame/atlauncher managed packs
// Treat as unmanaged, but with 'minecraft' folder instead of '.minecraft' // Treat as unmanaged, but with 'minecraft' folder instead of '.minecraft'
let minecraft_folder = mmc_base_path.join("instances").join(instance_folder).join("minecraft"); import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modpack".to_string(), description, mmc_pack).await?;
import_mmc_unmanaged(profile_path, minecraft_folder, backup_name, description, mmc_pack).await?;
}, },
Some(_) => { Some(_) => {
// For managed packs that aren't modrinth, flame, atlauncher // For managed packs that aren't modrinth, flame, atlauncher
// Treat as unmanaged // Treat as unmanaged
let backup_name = "ImportedModpack".to_string(); import_mmc_unmanaged(profile_path, minecraft_folder, "ImportedModpack".to_string(), description, mmc_pack).await?;
let minecraft_folder = mmc_base_path.join("instances").join(instance_folder).join(".minecraft");
import_mmc_unmanaged(profile_path, minecraft_folder, backup_name, description, mmc_pack).await?;
}, },
_ => return Err(crate::ErrorKind::InputError({ _ => return Err(crate::ErrorKind::InputError("Instance is managed, but managed pack type not specified in instance.cfg".to_string()).into())
"Instance is managed, but managed pack type not specified in instance.cfg".to_string()
}).into())
} }
} else { } else {
// Direclty import unmanaged pack // Direclty import unmanaged pack
let backup_name = "Imported Modpack".to_string();
let minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder)
.join(".minecraft");
import_mmc_unmanaged( import_mmc_unmanaged(
profile_path, profile_path,
minecraft_folder, minecraft_folder,
backup_name, "Imported Modpack".to_string(),
description, description,
mmc_pack, mmc_pack,
) )