fixes (#449)

* fixes

* prettier

* more bugs

* changes

* more fixes

* prettier, fmt, clippy

* fix regressed error

* println, console.log

* fix imports

---------

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
Co-authored-by: Jai A <jaiagr+gpg@pm.me>

theseus/src/api/pack/import/curseforge.rs

@@ -5,11 +5,14 @@ use serde::{Deserialize, Serialize};
 use crate::{
     prelude::{ModLoader, ProfilePathId},
     state::ProfileInstallStage,
-    util::io,
+    util::{
+        fetch::{fetch, write_cached_icon},
+        io,
+    },
     State,
 };
 
-use super::copy_dotminecraft;
+use super::{copy_dotminecraft, recache_icon};
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -31,12 +34,20 @@ pub struct FlameModLoader {
     pub primary: bool,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MinecraftInstance {
     pub name: Option<String>,
+    pub profile_image_path: Option<PathBuf>,
+    pub installed_modpack: Option<InstalledModpack>,
     pub game_version: String, // Minecraft game version. Non-prioritized, use this if Vanilla
 }
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+
+pub struct InstalledModpack {
+    pub thumbnail_url: Option<String>,
+}
 
 // Check if folder has a minecraftinstance.json that parses
 pub async fn is_valid_curseforge(instance_folder: PathBuf) -> bool {
@@ -53,9 +64,6 @@ pub async fn import_curseforge(
     curseforge_instance_folder: PathBuf, // instance's folder
     profile_path: ProfilePathId,         // path to profile
 ) -> crate::Result<()> {
-    // TODO: recache curseforge instance icon
-    let icon: Option<PathBuf> = None;
-
     // Load minecraftinstance.json
     let minecraft_instance: String = io::read_to_string(
         &curseforge_instance_folder.join("minecraftinstance.json"),
@@ -72,6 +80,32 @@ pub async fn import_curseforge(
             .unwrap_or("Unknown".to_string())
     );
 
+    let state = State::get().await?;
+    // Recache Curseforge Icon if it exists
+    let mut icon = None;
+
+    if let Some(icon_path) = minecraft_instance.profile_image_path.clone() {
+        icon = recache_icon(icon_path).await?;
+    } else if let Some(InstalledModpack {
+        thumbnail_url: Some(thumbnail_url),
+    }) = minecraft_instance.installed_modpack.clone()
+    {
+        let icon_bytes =
+            fetch(&thumbnail_url, None, &state.fetch_semaphore).await?;
+        let filename = thumbnail_url.rsplit('/').last();
+        if let Some(filename) = filename {
+            icon = Some(
+                write_cached_icon(
+                    filename,
+                    &state.directories.caches_dir(),
+                    icon_bytes,
+                    &state.io_semaphore,
+                )
+                .await?,
+            );
+        }
+    }
+
     // Curseforge vanilla profile may not have a manifest.json, so we allow it to not exist
     if curseforge_instance_folder.join("manifest.json").exists() {
         // Load manifest.json
@@ -146,7 +180,13 @@ pub async fn import_curseforge(
     }
 
     // Copy in contained folders as overrides
-    copy_dotminecraft(profile_path.clone(), curseforge_instance_folder).await?;
+    let state = State::get().await?;
+    copy_dotminecraft(
+        profile_path.clone(),
+        curseforge_instance_folder,
+        &state.io_semaphore,
+    )
+    .await?;
 
     if let Some(profile_val) =
         crate::api::profile::get(&profile_path, None).await?