Beta bugs (#562)

* fixed bugs

* added logging for atlauncher

* draft: improving imports time

* more improvements

* more

* prettier, etc

* small changes

* emma suggested change

* rev

* removed atlauncher debug

theseus/src/api/mr_auth.rs

@@ -7,10 +7,13 @@ use crate::ErrorKind;
 pub async fn authenticate_begin_flow(provider: &str) -> crate::Result<String> {
     let state = crate::State::get().await?;
 
+    // Don't start an uncompleteable new flow if there's an existing locked one
+    let mut write: tokio::sync::RwLockWriteGuard<'_, Option<ModrinthAuthFlow>> =
+        state.modrinth_auth_flow.write().await;
+
     let mut flow = ModrinthAuthFlow::new(provider).await?;
     let url = flow.prepare_login_url().await?;
 
-    let mut write = state.modrinth_auth_flow.write().await;
     *write = Some(flow);
 
     Ok(url)

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

@@ -3,13 +3,12 @@ use std::{collections::HashMap, path::PathBuf};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    event::LoadingBarId,
     pack::{
         self,
         import::{self, copy_dotminecraft},
         install_from::CreatePackDescription,
     },
-    prelude::{ModLoader, ProfilePathId},
+    prelude::{ModLoader, Profile, ProfilePathId},
     state::{LinkedData, ProfileInstallStage},
     util::io,
     State,
@@ -33,8 +32,6 @@ pub struct ATLauncher {
     pub modrinth_project: Option<ATLauncherModrinthProject>,
     pub modrinth_version: Option<ATLauncherModrinthVersion>,
     pub modrinth_manifest: Option<pack::install_from::PackFormat>,
-
-    pub mods: Vec<ATLauncherMod>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -57,13 +54,9 @@ pub struct ATLauncherModrinthProject {
     pub slug: String,
     pub project_type: String,
     pub team: String,
-    pub title: String,
-    pub description: String,
-    pub body: String,
     pub client_side: Option<String>,
     pub server_side: Option<String>,
     pub categories: Vec<String>,
-    pub icon_url: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -110,7 +103,16 @@ pub async fn is_valid_atlauncher(instance_folder: PathBuf) -> bool {
             .unwrap_or("".to_string());
     let instance: Result<ATInstance, serde_json::Error> =
         serde_json::from_str::<ATInstance>(&instance);
-    instance.is_ok()
+    if let Err(e) = instance {
+        tracing::warn!(
+            "Could not parse instance.json at {}: {}",
+            instance_folder.display(),
+            e
+        );
+        false
+    } else {
+        true
+    }
 }
 
 #[tracing::instrument]
@@ -169,7 +171,6 @@ pub async fn import_atlauncher(
         backup_name,
         description,
         atinstance,
-        None,
     )
     .await?;
     Ok(())
@@ -181,7 +182,6 @@ async fn import_atlauncher_unmanaged(
     backup_name: String,
     description: CreatePackDescription,
     atinstance: ATInstance,
-    existing_loading_bar: Option<LoadingBarId>,
 ) -> crate::Result<()> {
     let mod_loader = format!(
         "\"{}\"",
@@ -230,19 +230,28 @@ async fn import_atlauncher_unmanaged(
 
     // Moves .minecraft folder over (ie: overrides such as resourcepacks, mods, etc)
     let state = State::get().await?;
-    copy_dotminecraft(
+    let loading_bar = copy_dotminecraft(
         profile_path.clone(),
         minecraft_folder,
         &state.io_semaphore,
+        None,
     )
     .await?;
 
     if let Some(profile_val) =
         crate::api::profile::get(&profile_path, None).await?
     {
-        crate::launcher::install_minecraft(&profile_val, existing_loading_bar)
+        crate::launcher::install_minecraft(&profile_val, Some(loading_bar))
             .await?;
-
+        {
+            let state = State::get().await?;
+            let mut file_watcher = state.file_watcher.write().await;
+            Profile::watch_fs(
+                &profile_val.get_profile_full_path().await?,
+                &mut file_watcher,
+            )
+            .await?;
+        }
         State::sync().await?;
     }
     Ok(())

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

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
+use crate::prelude::Profile;
 use crate::state::CredentialsStore;
 use crate::{
     prelude::{ModLoader, ProfilePathId},
@@ -187,18 +188,29 @@ pub async fn import_curseforge(
 
     // Copy in contained folders as overrides
     let state = State::get().await?;
-    copy_dotminecraft(
+    let loading_bar = copy_dotminecraft(
         profile_path.clone(),
         curseforge_instance_folder,
         &state.io_semaphore,
+        None,
     )
     .await?;
 
     if let Some(profile_val) =
         crate::api::profile::get(&profile_path, None).await?
     {
-        crate::launcher::install_minecraft(&profile_val, None).await?;
-
+        crate::launcher::install_minecraft(&profile_val, Some(loading_bar))
+            .await?;
+
+        {
+            let state = State::get().await?;
+            let mut file_watcher = state.file_watcher.write().await;
+            Profile::watch_fs(
+                &profile_val.get_profile_full_path().await?,
+                &mut file_watcher,
+            )
+            .await?;
+        }
         State::sync().await?;
     }
 

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

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    prelude::{ModLoader, ProfilePathId},
+    prelude::{ModLoader, Profile, ProfilePathId},
     state::ProfileInstallStage,
     util::io,
     State,
@@ -101,18 +101,28 @@ pub async fn import_gdlauncher(
 
     // Copy in contained folders as overrides
     let state = State::get().await?;
-    copy_dotminecraft(
+    let loading_bar = copy_dotminecraft(
         profile_path.clone(),
         gdlauncher_instance_folder,
         &state.io_semaphore,
+        None,
     )
     .await?;
 
     if let Some(profile_val) =
         crate::api::profile::get(&profile_path, None).await?
     {
-        crate::launcher::install_minecraft(&profile_val, None).await?;
-
+        crate::launcher::install_minecraft(&profile_val, Some(loading_bar))
+            .await?;
+        {
+            let state = State::get().await?;
+            let mut file_watcher = state.file_watcher.write().await;
+            Profile::watch_fs(
+                &profile_val.get_profile_full_path().await?,
+                &mut file_watcher,
+            )
+            .await?;
+        }
         State::sync().await?;
     }
 

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

@@ -7,7 +7,7 @@ use crate::{
         import::{self, copy_dotminecraft},
         install_from::{self, CreatePackDescription, PackDependency},
     },
-    prelude::ProfilePathId,
+    prelude::{Profile, ProfilePathId},
     util::io,
     State,
 };
@@ -119,6 +119,26 @@ pub struct MMCComponentRequirement {
     pub suggests: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "PascalCase")]
+#[serde(untagged)]
+enum MMCLauncherEnum {
+    General(MMCLauncherGeneral),
+    Instance(MMCLauncher),
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "PascalCase")]
+struct MMCLauncherGeneral {
+    pub general: MMCLauncher,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "PascalCase")]
+pub struct MMCLauncher {
+    instance_dir: String,
+}
+
 // Checks if if its a folder, and the folder contains instance.cfg and mmc-pack.json, and they both parse
 #[tracing::instrument]
 pub async fn is_valid_mmc(instance_folder: PathBuf) -> bool {
@@ -134,9 +154,19 @@ pub async fn is_valid_mmc(instance_folder: PathBuf) -> bool {
         && serde_json::from_str::<MMCPack>(&mmc_pack).is_ok()
 }
 
+#[tracing::instrument]
+pub async fn get_instances_subpath(config: PathBuf) -> Option<String> {
+    let launcher = io::read_to_string(&config).await.ok()?;
+    let launcher: MMCLauncherEnum = serde_ini::from_str(&launcher).ok()?;
+    match launcher {
+        MMCLauncherEnum::General(p) => Some(p.general.instance_dir),
+        MMCLauncherEnum::Instance(p) => Some(p.instance_dir),
+    }
+}
+
 // Loading the INI (instance.cfg) file
 async fn load_instance_cfg(file_path: &Path) -> crate::Result<MMCInstance> {
-    let instance_cfg = io::read_to_string(file_path).await?;
+    let instance_cfg: String = io::read_to_string(file_path).await?;
     let instance_cfg_enum: MMCInstanceEnum =
         serde_ini::from_str::<MMCInstanceEnum>(&instance_cfg)?;
     match instance_cfg_enum {
@@ -281,18 +311,28 @@ async fn import_mmc_unmanaged(
 
     // Moves .minecraft folder over (ie: overrides such as resourcepacks, mods, etc)
     let state = State::get().await?;
-    copy_dotminecraft(
+    let loading_bar = copy_dotminecraft(
         profile_path.clone(),
         minecraft_folder,
         &state.io_semaphore,
+        None,
     )
     .await?;
 
     if let Some(profile_val) =
         crate::api::profile::get(&profile_path, None).await?
     {
-        crate::launcher::install_minecraft(&profile_val, None).await?;
-
+        crate::launcher::install_minecraft(&profile_val, Some(loading_bar))
+            .await?;
+        {
+            let state = State::get().await?;
+            let mut file_watcher = state.file_watcher.write().await;
+            Profile::watch_fs(
+                &profile_val.get_profile_full_path().await?,
+                &mut file_watcher,
+            )
+            .await?;
+        }
         State::sync().await?;
     }
     Ok(())