Cleanup and fix curseforge importing

Author: Moulberry

crates/backend/src/install_content.rs

@@ -973,20 +973,7 @@ fn determine_loader_from_content(content: &[InstallFromContentLibrary]) -> Optio
                 }
             },
             ContentType::CurseforgeModpack { minecraft, .. } => {
-                return minecraft.mod_loaders.iter()
-                    .find(|loader| loader.primary)
-                    .or_else(|| minecraft.mod_loaders.first())
-                    .and_then(|loader| {
-                        if loader.id.starts_with("forge-") {
-                            Some(Loader::Forge)
-                        } else if loader.id.starts_with("neoforge-") {
-                            Some(Loader::NeoForge)
-                        } else if loader.id.starts_with("fabric-") {
-                            Some(Loader::Fabric)
-                        } else {
-                            None
-                        }
-                    });
+                return minecraft.get_loader();
             },
             ContentType::ResourcePack => {},
         }

crates/backend/src/launcher_import/curseforge.rs

@@ -1,48 +1,26 @@
 use std::{path::{Path, PathBuf}, sync::Arc};
 
 use bridge::{import::ImportFromOtherLauncherJob, modal_action::{ModalAction, ProgressTracker}};
-use schema::{instance::{InstanceConfiguration, InstanceMemoryConfiguration}, loader::Loader};
+use schema::{curseforge::CurseforgeModpackManifestJson, instance::{InstanceConfiguration, InstanceMemoryConfiguration}, loader::Loader};
 use serde::Deserialize;
 
 use crate::{BackendState, write_safe};
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct CurseforgeInstance {
-    manifest: CurseforgeManifest,
+    manifest: CurseforgeModpackManifestJson,
     is_memory_override: bool,
     allocated_memory: u32,
     // memory_allocated_type: u8,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CurseforgeManifest {
-    minecraft: CurseforgeManifestMinecraft,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CurseforgeManifestMinecraft {
-    version: String,
-    mod_loaders: Vec<CurseforgeModLoader>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CurseforgeModLoader {
-    id: String,
-    primary: bool,
-}
-
-
 fn try_load_from_curseforge(config_path: &Path) -> Option<InstanceConfiguration> {
     let instance_cfg_bytes = std::fs::read(config_path).ok()?;
     let instance_cfg = serde_json::from_slice::<CurseforgeInstance>(&instance_cfg_bytes).ok()?;
 
-    let loader_details = instance_cfg.manifest.minecraft.mod_loaders.iter().filter(|loader| loader.primary).nth(0)?;
-    let loader = Loader::from_name(&loader_details.id.split("-").next()?);
-    let mut configuration = InstanceConfiguration::new(instance_cfg.manifest.minecraft.version.into(), loader);
+    let loader = instance_cfg.manifest.minecraft.get_loader().unwrap_or(Loader::Vanilla);
+    let mut configuration = InstanceConfiguration::new(instance_cfg.manifest.minecraft.version?.into(), loader);
     if instance_cfg.is_memory_override {
         configuration.memory = Some(InstanceMemoryConfiguration {
             enabled: true,
@@ -126,13 +104,11 @@ pub fn import_instances_from_curseforge(backend: &BackendState, import_job: &Imp
         _ = std::fs::create_dir_all(&to_import.pandora_path);
         let target_dot_minecraft = to_import.pandora_path.join(".minecraft");
 
-        let copy_options = fs_extra::dir::CopyOptions::default().copy_inside(true);
-        _ = fs_extra::dir::copy_with_progress(to_import.folder, &target_dot_minecraft, &copy_options, |state| {
-            tracker.set_total(state.total_bytes as usize);
-            tracker.set_count(state.copied_bytes as usize);
+        _ = std::fs::create_dir_all(&target_dot_minecraft);
+        _ = crate::copy_content_recursive(&to_import.folder, &target_dot_minecraft, false, &|copied, total| {
+            tracker.set_total(total as usize);
+            tracker.set_count(copied as usize);
             tracker.notify();
-
-            fs_extra::dir::TransitProcessResult::ContinueOrAbort
         });
 
         // remove old configuration, rename icon path.

crates/bridge/src/message.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::BTreeMap, ffi::OsString, hash::Hash, path::{Path, PathBuf}, sync::{Arc, atomic::AtomicU8}
+    collections::BTreeMap, ffi::OsString, path::{Path, PathBuf}, sync::{Arc, atomic::AtomicU8}
 };
 
 use schema::{

crates/frontend/src/pages/instance/quickplay_subpage.rs

@@ -303,7 +303,7 @@ impl ListDelegate for ServersListDelegate {
     fn render_item(
         &mut self,
         ix: IndexPath,
-        window: &mut Window,
+        _window: &mut Window,
         cx: &mut Context<ListState<Self>>,
     ) -> Option<Self::Item> {
         let interface_config = InterfaceConfig::get(cx);

crates/schema/src/curseforge.rs

@@ -3,6 +3,8 @@ use std::sync::Arc;
 use serde::{Deserialize, Serialize};
 use ustr::Ustr;
 
+use crate::loader::Loader;
+
 pub const CURSEFORGE_SEARCH_URL: &str = "https://api.curseforge.com/v1/mods/search";
 pub const MINECRAFT_GAME_ID: u32 = 432;
 
@@ -263,6 +265,25 @@ pub struct CurseforgeModpackMinecraft {
     pub recommended_ram: Option<u32>,
 }
 
+impl CurseforgeModpackMinecraft {
+    pub fn get_loader(&self) -> Option<Loader> {
+        self.mod_loaders.iter()
+            .find(|loader| loader.primary)
+            .or_else(|| self.mod_loaders.first())
+            .and_then(|loader| {
+                if loader.id.starts_with("forge-") {
+                    Some(Loader::Forge)
+                } else if loader.id.starts_with("neoforge-") {
+                    Some(Loader::NeoForge)
+                } else if loader.id.starts_with("fabric-") {
+                    Some(Loader::Fabric)
+                } else {
+                    None
+                }
+            })
+    }
+}
+
 #[derive(Deserialize, Debug)]
 pub struct CurseforgeModpackModLoader {
     pub id: Arc<str>,