From 893610d9a4939927bfdfc3fe1498b2a35b86d63f Mon Sep 17 00:00:00 2001 From: Wyatt Date: Tue, 4 Jul 2023 18:33:08 -0700 Subject: [PATCH 01/10] profiles use names, projects use relative, rename/deletion events --- theseus/src/api/profile.rs | 17 ++-- theseus/src/api/profile_create.rs | 2 +- theseus/src/state/mod.rs | 26 ++++-- theseus/src/state/profiles.rs | 114 ++++++++++++++++++----- theseus/src/state/projects.rs | 46 +++++---- theseus_gui/src/pages/instance/Index.vue | 6 ++ 6 files changed, 157 insertions(+), 54 deletions(-) diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs index e4de2b372..1bfaca61e 100644 --- a/theseus/src/api/profile.rs +++ b/theseus/src/api/profile.rs @@ -58,7 +58,9 @@ pub async fn get( path: &Path, clear_projects: Option, ) -> crate::Result> { + tracing::debug!("Getting profile: {}", path.display()); let state = State::get().await?; + let profiles = state.profiles.read().await; let mut profile = profiles.0.get(path).cloned(); @@ -316,6 +318,8 @@ pub async fn update_all( } } +/// Updates a project to the latest version +/// Uses and returns the relative path to the project #[tracing::instrument] #[theseus_macros::debug_pin] pub async fn update_project( @@ -382,6 +386,7 @@ pub async fn update_project( } /// Add a project from a version +/// Returns the relative path to the project #[tracing::instrument] pub async fn add_project_from_version( profile_path: &Path, @@ -409,6 +414,7 @@ pub async fn add_project_from_version( } /// Add a project from an FS path +/// Uses and returns the relative path to the project #[tracing::instrument] pub async fn add_project_from_path( profile_path: &Path, @@ -450,6 +456,8 @@ pub async fn add_project_from_path( } /// Toggle whether a project is disabled or not +/// Project path should be relative to the profile +/// returns the new state, relative to the profile #[tracing::instrument] pub async fn toggle_disable_project( profile: &Path, @@ -477,6 +485,7 @@ pub async fn toggle_disable_project( } /// Remove a project from a profile +/// Uses and returns the relative path to the project #[tracing::instrument] pub async fn remove_project( profile: &Path, @@ -832,17 +841,11 @@ pub fn create_mrpack_json( .map(|(k, v)| (k, sanitize_loader_version_string(&v).to_string())) .collect::>(); - let base_path = &profile.path; let files: Result, crate::ErrorKind> = profile .projects .iter() .filter_map(|(mod_path, project)| { - let path = match mod_path.strip_prefix(base_path) { - Ok(path) => path.to_string_lossy().to_string(), - Err(e) => { - return Some(Err(e.into())); - } - }; + let path = mod_path.to_string_lossy().to_string(); // Only Modrinth projects have a modrinth metadata field for the modrinth.json Some(Ok(match project.metadata { diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index 88a802b61..313fec475 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -36,7 +36,7 @@ pub async fn profile_create( trace!("Creating new profile. {}", name); let state = State::get().await?; let uuid = Uuid::new_v4(); - let path = state.directories.profiles_dir().join(uuid.to_string()); + let path = state.directories.profiles_dir().join(&name); if path.exists() { if !path.is_dir() { return Err(ProfileCreationError::NotFolder.into()); diff --git a/theseus/src/state/mod.rs b/theseus/src/state/mod.rs index 76b4623c9..aa1bc60b1 100644 --- a/theseus/src/state/mod.rs +++ b/theseus/src/state/mod.rs @@ -248,6 +248,7 @@ async fn init_watcher() -> crate::Result> { None, move |res: DebounceEventResult| { futures::executor::block_on(async { + tracing::info!("File watcher event: {:?}", res); tx.send(res).await.unwrap(); }) }, @@ -256,13 +257,16 @@ async fn init_watcher() -> crate::Result> { tokio::task::spawn(async move { while let Some(res) = rx.next().await { match res { - Ok(events) => { + Ok(mut events) => { let mut visited_paths = Vec::new(); - events.iter().for_each(|e| { + // sort events by e.path + events.sort_by(|a, b| a.path.cmp(&b.path)); + events.iter().for_each(|e| { + tracing::debug!("File watcher event: {:?}", serde_json::to_string(&e.path).unwrap()); let mut new_path = PathBuf::new(); + let mut components_iterator = e.path.components(); let mut found = false; - - for component in e.path.components() { + while let Some(component) = components_iterator.next() { new_path.push(component); if found { break; @@ -271,6 +275,8 @@ async fn init_watcher() -> crate::Result> { found = true; } } + // if any remain, it's a subfile + let subfile = components_iterator.next().is_some(); if e.path .components() @@ -282,8 +288,16 @@ async fn init_watcher() -> crate::Result> { { Profile::crash_task(new_path); } else if !visited_paths.contains(&new_path) { - Profile::sync_projects_task(new_path.clone()); - visited_paths.push(new_path); + if subfile { + Profile::sync_projects_task(new_path.clone()); + visited_paths.push(new_path); + } else { + tracing::warn!("No subfile found "); + + Profiles::sync_available_profiles_task( + new_path.clone(), + ); + } } }); } diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index 97001fc8f..080710bcc 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -19,6 +19,7 @@ use notify::{RecommendedWatcher, RecursiveMode}; use notify_debouncer_mini::Debouncer; use reqwest::Method; use serde::{Deserialize, Serialize}; +use tracing::info; use std::io::Cursor; use std::{ collections::HashMap, @@ -183,6 +184,11 @@ impl Profile { }) } + #[inline] + pub fn name(&self) -> String { + self.metadata.name.clone() + } + #[tracing::instrument(skip(self, semaphore, icon))] pub async fn set_icon<'a>( &'a mut self, @@ -224,12 +230,16 @@ impl Profile { pub fn sync_projects_task(path: PathBuf) { tokio::task::spawn(async move { + let span = + tracing::span!(tracing::Level::INFO, "sync_projects_task"); + info!(parent: &span, "Syncing projects for profile {}", path.display()); let res = async { + let _span = span.enter(); let state = State::get().await?; let profile = crate::api::profile::get(&path, None).await?; if let Some(profile) = profile { - let paths = profile.get_profile_project_paths()?; + let paths = profile.get_profile_full_project_paths()?; let projects = crate::state::infer_data_from_files( profile.clone(), @@ -251,6 +261,7 @@ impl Profile { ProfilePayloadType::Synced, ) .await?; + tracing::info!("Done syncing"); } else { tracing::warn!( "Unable to fetch single profile projects: path {path:?} invalid", @@ -269,7 +280,9 @@ impl Profile { }); } - pub fn get_profile_project_paths(&self) -> crate::Result> { + /// Gets paths to projects as their full paths, not just their relative paths + pub fn get_profile_full_project_paths(&self) -> crate::Result> { + tracing::info!("Getting profile project paths, profile path: {}", self.path.display()); let mut files = Vec::new(); let mut read_paths = |path: &str| { let new_path = self.path.join(path); @@ -416,8 +429,9 @@ impl Profile { } }; - let state = State::get().await?; - let path = self.path.join(project_type.get_folder()).join(file_name); + let state: std::sync::Arc = State::get().await?; + let relative_name = PathBuf::new().join(project_type.get_folder()).join(file_name); + let path = self.path.join(relative_name.clone()); write(&path, &bytes, &state.io_semaphore).await?; let hash = get_hash(bytes).await?; @@ -438,32 +452,34 @@ impl Profile { } } - Ok(path) + Ok(relative_name) } + /// Toggle a project's disabled state. + /// 'path' should be relative to the profile's path. #[tracing::instrument(skip(self))] #[theseus_macros::debug_pin] pub async fn toggle_disable_project( &self, - path: &Path, + relative_path: &Path, ) -> crate::Result { let state = State::get().await?; if let Some(mut project) = { - let mut profiles = state.profiles.write().await; + let mut profiles: tokio::sync::RwLockWriteGuard<'_, Profiles> = state.profiles.write().await; if let Some(profile) = profiles.0.get_mut(&self.path) { - profile.projects.remove(path) + profile.projects.remove(relative_path) } else { None } } { - let path = path.to_path_buf(); - let mut new_path = path.clone(); + let relative_path = relative_path.to_path_buf(); + let mut new_path = relative_path.clone(); - if path.extension().map_or(false, |ext| ext == "disabled") { + if relative_path.extension().map_or(false, |ext| ext == "disabled") { project.disabled = false; new_path.set_file_name( - path.file_name() + relative_path.file_name() .unwrap_or_default() .to_string_lossy() .replace(".disabled", ""), @@ -471,12 +487,14 @@ impl Profile { } else { new_path.set_file_name(format!( "{}.disabled", - path.file_name().unwrap_or_default().to_string_lossy() + relative_path.file_name().unwrap_or_default().to_string_lossy() )); project.disabled = true; } - fs::rename(path, &new_path).await?; + let true_path = self.path.join(&relative_path); + let true_new_path = self.path.join(&new_path); + fs::rename(true_path, &true_new_path).await?; let mut profiles = state.profiles.write().await; if let Some(profile) = profiles.0.get_mut(&self.path) { @@ -488,7 +506,7 @@ impl Profile { } else { Err(crate::ErrorKind::InputError(format!( "Project path does not exist: {:?}", - path + relative_path )) .into()) } @@ -496,24 +514,24 @@ impl Profile { pub async fn remove_project( &self, - path: &Path, + relative_path: &Path, dont_remove_arr: Option, ) -> crate::Result<()> { let state = State::get().await?; - if self.projects.contains_key(path) { - fs::remove_file(path).await?; + if self.projects.contains_key(relative_path) { + fs::remove_file(self.path.join(relative_path)).await?; if !dont_remove_arr.unwrap_or(false) { let mut profiles = state.profiles.write().await; if let Some(profile) = profiles.0.get_mut(&self.path) { - profile.projects.remove(path); + profile.projects.remove(relative_path); profile.metadata.date_modified = Utc::now(); } } } else { return Err(crate::ErrorKind::InputError(format!( "Project path does not exist: {:?}", - path + relative_path )) .into()); } @@ -531,6 +549,11 @@ impl Profiles { ) -> crate::Result { let mut profiles = HashMap::new(); fs::create_dir_all(dirs.profiles_dir()).await?; + + file_watcher + .watcher() + .watch(&dirs.profiles_dir(), RecursiveMode::NonRecursive)?; + let mut entries = fs::read_dir(dirs.profiles_dir()).await?; while let Some(entry) = entries.next_entry().await? { let path = entry.path(); @@ -566,7 +589,7 @@ impl Profiles { { let profiles = state.profiles.read().await; for (_profile_path, profile) in profiles.0.iter() { - let paths = profile.get_profile_project_paths()?; + let paths = profile.get_profile_full_project_paths()?; files.push((profile.clone(), paths)); } @@ -661,6 +684,7 @@ impl Profiles { stream::iter(self.0.iter()) .map(Ok::<_, crate::Error>) .try_for_each_concurrent(None, |(path, profile)| async move { + tracing::info!("Syncing profile: {:?}", path); let json = serde_json::to_vec(&profile)?; let json_path = Path::new(&path.to_string_lossy().to_string()) @@ -674,10 +698,56 @@ impl Profiles { Ok(self) } - async fn read_profile_from_dir(path: &Path) -> crate::Result { + async fn read_profile_from_dir(path: &Path) -> crate::Result { let json = fs::read(path.join(PROFILE_JSON_PATH)).await?; let mut profile = serde_json::from_slice::(&json)?; profile.path = PathBuf::from(path); Ok(profile) } + + pub fn sync_available_profiles_task(path: PathBuf) { + tokio::task::spawn(async move { + let span = tracing::span!( + tracing::Level::INFO, + "sync_available_profiles_task" + ); + let res = async { + let _span = span.enter(); + let state = State::get().await?; + + let mut profiles = state.profiles.write().await; + + tracing::info!("Updating: {path}", path = path.display()); + if let Some(profile) = profiles.0.get_mut(&path) { + if !path.exists() { + // if path exists in the state but no longer in the filesystem, remove it from the state list + emit_profile( + profile.uuid, + profile.path.clone(), + &profile.metadata.name, + ProfilePayloadType::Removed, + ) + .await?; + tracing::debug!("Removed!"); + profiles.0.remove(&path); + } + } else if path.exists() { + // if it exists in the filesystem but no longer in the state, add it to the state list + profiles + .insert(Self::read_profile_from_dir(&path).await?) + .await?; + Profile::sync_projects_task(path); + } + Ok::<(), crate::Error>(()) + } + .await; + + match res { + Ok(()) => {} + Err(err) => { + tracing::warn!("Unable to fetch all profiles: {err}") + } + }; + }); + } } diff --git a/theseus/src/state/projects.rs b/theseus/src/state/projects.rs index ba8bdc14e..38c70f434 100644 --- a/theseus/src/state/projects.rs +++ b/theseus/src/state/projects.rs @@ -252,11 +252,15 @@ async fn read_icon_from_file( Ok(None) } + +// Creates Project data from the existing files in the file system, for a given Profile +// Paths must be the full paths to the files in the FS, and not the relative paths +// eg: with get_profile_full_project_paths #[tracing::instrument(skip(profile, io_semaphore, fetch_semaphore))] #[theseus_macros::debug_pin] pub async fn infer_data_from_files( profile: Profile, - paths: Vec, + paths: Vec, cache_dir: PathBuf, io_semaphore: &IoSemaphore, fetch_semaphore: &FetchSemaphore, @@ -339,7 +343,7 @@ pub async fn infer_data_from_files( .flatten() .collect(); - let mut return_projects = HashMap::new(); + let mut return_projects: Vec<(PathBuf, Project)> = Vec::new(); let mut further_analyze_projects: Vec<(String, PathBuf)> = Vec::new(); for (hash, path) in file_path_hashes { @@ -353,7 +357,7 @@ pub async fn infer_data_from_files( .to_string_lossy() .to_string(); - return_projects.insert( + return_projects.push(( path, Project { disabled: file_name.ends_with(".disabled"), @@ -389,7 +393,7 @@ pub async fn infer_data_from_files( sha512: hash, file_name, }, - ); + )); continue; } } @@ -409,7 +413,7 @@ pub async fn infer_data_from_files( { zip_file_reader } else { - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -417,7 +421,7 @@ pub async fn infer_data_from_files( metadata: ProjectMetadata::Unknown, file_name, }, - ); + )); continue; }; let zip_index_option = zip_file_reader @@ -463,7 +467,7 @@ pub async fn infer_data_from_files( ) .await?; - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -488,7 +492,7 @@ pub async fn infer_data_from_files( project_type: Some("mod".to_string()), }, }, - ); + )); continue; } } @@ -530,7 +534,7 @@ pub async fn infer_data_from_files( ) .await?; - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -549,7 +553,7 @@ pub async fn infer_data_from_files( project_type: Some("mod".to_string()), }, }, - ); + )); continue; } } @@ -596,7 +600,7 @@ pub async fn infer_data_from_files( ) .await?; - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -618,7 +622,7 @@ pub async fn infer_data_from_files( project_type: Some("mod".to_string()), }, }, - ); + )); continue; } } @@ -662,7 +666,7 @@ pub async fn infer_data_from_files( ) .await?; - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -694,7 +698,7 @@ pub async fn infer_data_from_files( project_type: Some("mod".to_string()), }, }, - ); + )); continue; } } @@ -728,7 +732,7 @@ pub async fn infer_data_from_files( io_semaphore, ) .await?; - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -743,13 +747,13 @@ pub async fn infer_data_from_files( project_type: None, }, }, - ); + )); continue; } } } - return_projects.insert( + return_projects.push(( path.clone(), Project { sha512: hash, @@ -757,8 +761,14 @@ pub async fn infer_data_from_files( file_name, metadata: ProjectMetadata::Unknown, }, - ); + )); } + // Project paths should be relative + let return_projects: HashMap = return_projects.into_iter().map(|(h, v)| { + let h = h.strip_prefix(profile.path.clone())?.to_path_buf(); + Ok::<_,crate::Error>((h,v)) + }).collect::>>()?; + Ok(return_projects) } diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue index 8db75a1e3..6ee1e6bfb 100644 --- a/theseus_gui/src/pages/instance/Index.vue +++ b/theseus_gui/src/pages/instance/Index.vue @@ -261,6 +261,12 @@ const handleOptionsClick = async (args) => { const unlistenProfiles = await profile_listener(async (event) => { if (event.path === route.params.id) { + if (event.event === 'removed') { + await router.push({ + path: '/', + }) + return + } instance.value = await get(route.params.id).catch(handleError) } }) From 238ab7fca2075ab8e400a22c7375d747b2be6133 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Wed, 5 Jul 2023 23:28:56 -0700 Subject: [PATCH 02/10] config switch draft --- theseus/src/api/jre.rs | 2 +- theseus/src/api/logs.rs | 43 ++++- theseus/src/api/pack/install_from.rs | 2 +- theseus/src/api/process.rs | 3 +- theseus/src/api/profile.rs | 23 ++- theseus/src/api/profile_create.rs | 7 +- theseus/src/api/settings.rs | 78 ++++++++ theseus/src/launcher/download.rs | 16 +- theseus/src/launcher/mod.rs | 31 ++-- theseus/src/state/children.rs | 16 +- theseus/src/state/dirs.rs | 128 ++++++++------ theseus/src/state/java_globals.rs | 4 + theseus/src/state/metadata.rs | 4 +- theseus/src/state/mod.rs | 167 ++++++++++-------- theseus/src/state/profiles.rs | 48 +++-- theseus/src/state/settings.rs | 61 ++++--- theseus/src/state/tags.rs | 4 +- theseus/src/state/users.rs | 4 +- theseus/src/util/fetch.rs | 2 + theseus/src/util/jre.rs | 2 +- theseus_cli/src/subcommands/user.rs | 2 +- theseus_gui/src-tauri/src/api/logs.rs | 8 +- theseus_gui/src-tauri/src/api/profile.rs | 2 + theseus_gui/src-tauri/src/api/settings.rs | 13 +- theseus_gui/src-tauri/src/api/utils.rs | 13 +- theseus_gui/src/App.vue | 11 +- theseus_gui/src/components/ui/Instance.vue | 6 +- .../components/ui/InstanceCreationModal.vue | 6 +- .../components/ui/InstanceInstallModal.vue | 8 +- theseus_gui/src/helpers/cache.js | 15 ++ theseus_gui/src/helpers/settings.js | 8 + theseus_gui/src/pages/Browse.vue | 6 +- theseus_gui/src/pages/instance/Index.vue | 6 +- theseus_gui/src/pages/instance/Logs.vue | 6 +- theseus_gui/src/pages/instance/Mods.vue | 6 +- theseus_gui/src/pages/instance/Options.vue | 8 +- theseus_gui/src/pages/project/Index.vue | 6 +- 37 files changed, 522 insertions(+), 253 deletions(-) create mode 100644 theseus_gui/src/helpers/cache.js diff --git a/theseus/src/api/jre.rs b/theseus/src/api/jre.rs index 1d1d3d37f..bad0269c2 100644 --- a/theseus/src/api/jre.rs +++ b/theseus/src/api/jre.rs @@ -111,7 +111,7 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result { ) .await?; - let path = state.directories.java_versions_dir(); + let path = state.directories.java_versions_dir().await; if path.exists() { tokio::fs::remove_dir_all(&path).await?; diff --git a/theseus/src/api/logs.rs b/theseus/src/api/logs.rs index 0936ad0c1..21441fbe0 100644 --- a/theseus/src/api/logs.rs +++ b/theseus/src/api/logs.rs @@ -1,3 +1,5 @@ +use std::path::Path; + use crate::State; use serde::{Deserialize, Serialize}; use tokio::fs::read_to_string; @@ -9,7 +11,7 @@ pub struct Logs { } impl Logs { async fn build( - profile_uuid: uuid::Uuid, + profile_subpath: &Path, datetime_string: String, clear_contents: Option, ) -> crate::Result { @@ -18,7 +20,7 @@ impl Logs { None } else { Some( - get_output_by_datetime(profile_uuid, &datetime_string) + get_output_by_datetime(profile_subpath, &datetime_string) .await?, ) }, @@ -33,7 +35,13 @@ pub async fn get_logs( clear_contents: Option, ) -> crate::Result> { let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(profile_uuid); + let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { + p.path + } else { + return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + }; + + let logs_folder = state.directories.profile_logs_dir(&profile_path).await; let mut logs = Vec::new(); if logs_folder.exists() { for entry in std::fs::read_dir(logs_folder)? { @@ -43,7 +51,7 @@ pub async fn get_logs( if let Some(datetime_string) = path.file_name() { logs.push( Logs::build( - profile_uuid, + &profile_path, datetime_string.to_string_lossy().to_string(), clear_contents, ) @@ -64,9 +72,14 @@ pub async fn get_logs_by_datetime( profile_uuid: uuid::Uuid, datetime_string: String, ) -> crate::Result { + let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { + p.path + } else { + return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + }; Ok(Logs { output: Some( - get_output_by_datetime(profile_uuid, &datetime_string).await?, + get_output_by_datetime(&profile_path, &datetime_string).await?, ), datetime_string, }) @@ -74,11 +87,11 @@ pub async fn get_logs_by_datetime( #[tracing::instrument] pub async fn get_output_by_datetime( - profile_uuid: uuid::Uuid, + profile_subpath: &Path, datetime_string: &str, ) -> crate::Result { let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(profile_uuid); + let logs_folder = state.directories.profile_logs_dir(profile_subpath).await; Ok( read_to_string(logs_folder.join(datetime_string).join("stdout.log")) .await?, @@ -87,8 +100,14 @@ pub async fn get_output_by_datetime( #[tracing::instrument] pub async fn delete_logs(profile_uuid: uuid::Uuid) -> crate::Result<()> { + let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { + p.path + } else { + return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + }; + let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(profile_uuid); + let logs_folder = state.directories.profile_logs_dir(&profile_path).await; for entry in std::fs::read_dir(logs_folder)? { let entry = entry?; let path = entry.path(); @@ -104,8 +123,14 @@ pub async fn delete_logs_by_datetime( profile_uuid: uuid::Uuid, datetime_string: &str, ) -> crate::Result<()> { + let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { + p.path + } else { + return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + }; + let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(profile_uuid); + let logs_folder = state.directories.profile_logs_dir(&profile_path).await; std::fs::remove_dir_all(logs_folder.join(datetime_string))?; Ok(()) } diff --git a/theseus/src/api/pack/install_from.rs b/theseus/src/api/pack/install_from.rs index 419bbf1f6..720d9a4ec 100644 --- a/theseus/src/api/pack/install_from.rs +++ b/theseus/src/api/pack/install_from.rs @@ -232,7 +232,7 @@ pub async fn generate_pack_from_version_id( Some( write_cached_icon( filename, - &state.directories.caches_dir(), + &state.directories.caches_dir().await, icon_bytes, &state.io_semaphore, ) diff --git a/theseus/src/api/process.rs b/theseus/src/api/process.rs index ef455a19c..c0d6901f3 100644 --- a/theseus/src/api/process.rs +++ b/theseus/src/api/process.rs @@ -56,7 +56,8 @@ pub async fn get_all_running_profile_paths() -> crate::Result> { pub async fn get_all_running_profiles() -> crate::Result> { let state = State::get().await?; let children = state.children.read().await; - children.running_profiles().await + let ret = children.running_profiles().await?; + Ok(ret) } // Gets the UUID of each stored process in the state by profile path diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs index 1bfaca61e..d6a81bb62 100644 --- a/theseus/src/api/profile.rs +++ b/theseus/src/api/profile.rs @@ -58,7 +58,6 @@ pub async fn get( path: &Path, clear_projects: Option, ) -> crate::Result> { - tracing::debug!("Getting profile: {}", path.display()); let state = State::get().await?; let profiles = state.profiles.read().await; @@ -73,6 +72,26 @@ pub async fn get( Ok(profile) } +/// Get a profile by uuid +#[tracing::instrument] +pub async fn get_by_uuid( + uuid: uuid::Uuid, + clear_projects: Option, +) -> crate::Result> { + let state = State::get().await?; + + let profiles = state.profiles.read().await; + let mut profile = profiles.0.values().find(|x| x.uuid == uuid).cloned(); + + if clear_projects.unwrap_or(false) { + if let Some(profile) = &mut profile { + profile.projects = HashMap::new(); + } + } + + Ok(profile) +} + /// Edit a profile using a given asynchronous closure pub async fn edit( path: &Path, @@ -121,7 +140,7 @@ pub async fn edit_icon( Some(ref mut profile) => { profile .set_icon( - &state.directories.caches_dir(), + &state.directories.caches_dir().await, &state.io_semaphore, bytes::Bytes::from(bytes), &icon.to_string_lossy(), diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index 313fec475..5ddc1fbfd 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -36,7 +36,7 @@ pub async fn profile_create( trace!("Creating new profile. {}", name); let state = State::get().await?; let uuid = Uuid::new_v4(); - let path = state.directories.profiles_dir().join(&name); + let path = state.directories.profiles_dir().await.join(&name); if path.exists() { if !path.is_dir() { return Err(ProfileCreationError::NotFolder.into()); @@ -80,10 +80,11 @@ pub async fn profile_create( Profile::new(uuid, name, game_version, path.clone()).await?; let result = async { if let Some(ref icon) = icon { - let bytes = tokio::fs::read(icon).await?; + let caches_dir = state.directories.caches_dir().await; + let bytes = tokio::fs::read(caches_dir.join(icon)).await?; profile .set_icon( - &state.directories.caches_dir(), + &state.directories.caches_dir().await, &state.io_semaphore, bytes::Bytes::from(bytes), &icon.to_string_lossy(), diff --git a/theseus/src/api/settings.rs b/theseus/src/api/settings.rs index e5486d57c..2d053e4c8 100644 --- a/theseus/src/api/settings.rs +++ b/theseus/src/api/settings.rs @@ -1,5 +1,10 @@ //! Theseus profile management interface +use std::path::PathBuf; + +use tokio::{fs, sync::RwLock}; + +use crate::{prelude::DirectoryInfo, state::{self, Profiles}}; pub use crate::{ state::{ Hooks, JavaSettings, MemorySettings, Profile, Settings, WindowSize, @@ -19,6 +24,14 @@ pub async fn get() -> crate::Result { #[tracing::instrument] pub async fn set(settings: Settings) -> crate::Result<()> { let state = State::get().await?; + + if settings.loaded_config_dir != state.settings.read().await.loaded_config_dir { + return Err(crate::ErrorKind::OtherError( + "Cannot change config directory as setting".to_string(), + ) + .as_error()); + } + let (reset_io, reset_fetch) = async { let read = state.settings.read().await; ( @@ -42,3 +55,68 @@ pub async fn set(settings: Settings) -> crate::Result<()> { State::sync().await?; Ok(()) } + +/// Sets the new config dir, the location of all Theseus data except for the settings.json itself +/// Takes control of the entire state and blocks until completion +pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { + + tracing::info!("Setting new config dir: {}", new_config_dir.display()); + if !new_config_dir.is_dir() { + return Err(crate::ErrorKind::FSError( + format!("New config dir is not a folder: {}", new_config_dir.display()), + ) + .as_error()); + } + + // Take control of the state + let mut state_write = State::get_write().await?; + let old_config_dir = state_write.directories.config_dir.read().await.clone(); + + // Set load config dir setting + let settings = { + let mut settings = state_write.settings.write().await; + settings.loaded_config_dir = Some(new_config_dir.clone()); + + // Some java paths are hardcoded to within our config dir, so we need to update them + for key in settings.java_globals.keys() { + if let Some(java) = settings.java_globals.get_mut(&key) { + // If the path is within the old config dir path, update it to the new config dir + if let Ok(relative_path) = PathBuf::from(java.path.clone()).strip_prefix(&old_config_dir) { + java.path = new_config_dir.join(relative_path).to_string_lossy().to_string(); + } + } + } + settings.sync(&state_write.directories.settings_file()).await?; + settings.clone() + }; + + // Set new state information + state_write.directories = DirectoryInfo::init(&settings)?; + + // Move all files over from state_write.directories.config_dir to new_config_dir + + let mut entries = fs::read_dir(old_config_dir).await?; + while let Some(entry) = entries.next_entry().await? { + let entry_path = entry.path(); + if let Some(file_name) = entry_path.file_name() { + // Ignore settings.json + if file_name == "settings.json" { + continue; + } + let new_path = new_config_dir.join(file_name); + fs::rename(entry_path, new_path).await?; + } + } + + // Reset file watcher + let mut file_watcher = state::init_watcher().await?; + + // Reset profiles (for filepaths, file watcher, etc) + state_write.profiles = RwLock::new(Profiles::init(&state_write.directories, &mut file_watcher).await?); + state_write.file_watcher = RwLock::new(file_watcher); + + // TODO: need to be able to safely error out of this function, reverting the changes + + Ok(()) +} + diff --git a/theseus/src/launcher/download.rs b/theseus/src/launcher/download.rs index 67e32cfd5..5a93c416c 100644 --- a/theseus/src/launcher/download.rs +++ b/theseus/src/launcher/download.rs @@ -68,6 +68,7 @@ pub async fn download_version_info( let path = st .directories .version_dir(&version_id) + .await .join(format!("{version_id}.json")); let res = if path.exists() && !force.unwrap_or(false) { @@ -118,6 +119,7 @@ pub async fn download_client( let path = st .directories .version_dir(version) + .await .join(format!("{version}.jar")); if !path.exists() { @@ -149,7 +151,7 @@ pub async fn download_assets_index( let path = st .directories .assets_index_dir() - .join(format!("{}.json", &version.asset_index.id)); + .await.join(format!("{}.json", &version.asset_index.id)); let res = if path.exists() { fs::read(path) @@ -192,7 +194,7 @@ pub async fn download_assets( None, |(name, asset)| async move { let hash = &asset.hash; - let resource_path = st.directories.object_dir(hash); + let resource_path = st.directories.object_dir(hash).await; let url = format!( "https://resources.download.minecraft.net/{sub_hash}/{hash}", sub_hash = &hash[..2] @@ -215,7 +217,7 @@ pub async fn download_assets( let resource = fetch_cell .get_or_try_init(|| fetch(&url, Some(hash), &st.fetch_semaphore)) .await?; - let resource_path = st.directories.legacy_assets_dir().join( + let resource_path = st.directories.legacy_assets_dir().await.join( name.replace('/', &String::from(std::path::MAIN_SEPARATOR)) ); write(&resource_path, resource, &st.io_semaphore).await?; @@ -245,8 +247,8 @@ pub async fn download_libraries( tracing::debug!("Loading libraries"); tokio::try_join! { - fs::create_dir_all(st.directories.libraries_dir()), - fs::create_dir_all(st.directories.version_natives_dir(version)) + fs::create_dir_all(st.directories.libraries_dir().await), + fs::create_dir_all(st.directories.version_natives_dir(version).await) }?; let num_files = libraries.len(); loading_try_for_each_concurrent( @@ -262,7 +264,7 @@ pub async fn download_libraries( tokio::try_join! { async { let artifact_path = d::get_path_from_artifact(&library.name)?; - let path = st.directories.libraries_dir().join(&artifact_path); + let path = st.directories.libraries_dir().await.join(&artifact_path); match library.downloads { _ if path.exists() => Ok(()), @@ -314,7 +316,7 @@ pub async fn download_libraries( let data = fetch(&native.url, Some(&native.sha1), &st.fetch_semaphore).await?; let reader = std::io::Cursor::new(&data); if let Ok(mut archive) = zip::ZipArchive::new(reader) { - match archive.extract(&st.directories.version_natives_dir(version)) { + match archive.extract(&st.directories.version_natives_dir(version).await) { Ok(_) => tracing::info!("Fetched native {}", &library.name), Err(err) => tracing::error!("Failed extracting native {}. err: {}", &library.name, err) } diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index eacd54c5d..bc22285e8 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -177,8 +177,11 @@ pub async fn install_minecraft( let client_path = state .directories .version_dir(&version_jar) + .await .join(format!("{version_jar}.jar")); + let libraries_dir = state.directories.libraries_dir().await; + if let Some(ref mut data) = version_info.data { processor_rules! { data; @@ -195,7 +198,7 @@ pub async fn install_minecraft( client => instance_path.to_string_lossy(), server => ""; "LIBRARY_DIR": - client => state.directories.libraries_dir().to_string_lossy(), + client => libraries_dir.to_string_lossy(), server => ""; } @@ -218,13 +221,13 @@ pub async fn install_minecraft( let child = Command::new(&java_version.path) .arg("-cp") .arg(args::get_class_paths_jar( - &state.directories.libraries_dir(), + &libraries_dir, &cp, &java_version.architecture, )?) .arg( args::get_processor_main_class(args::get_lib_path( - &state.directories.libraries_dir(), + &libraries_dir, &processor.jar, false, )?) @@ -237,7 +240,7 @@ pub async fn install_minecraft( })?, ) .args(args::get_processor_arguments( - &state.directories.libraries_dir(), + &libraries_dir, &processor.args, data, )?) @@ -282,7 +285,7 @@ pub async fn install_minecraft( Ok(()) } -#[tracing::instrument] +#[tracing::instrument(skip(profile))] #[theseus_macros::debug_pin] #[allow(clippy::too_many_arguments)] pub async fn launch_minecraft( @@ -310,7 +313,9 @@ pub async fn launch_minecraft( let state = State::get().await?; let metadata = state.metadata.read().await; - let instance_path = &canonicalize(&profile.path)?; + + let instance_path = state.directories.profiles_dir().await.join(&profile.path); + let instance_path = &canonicalize(instance_path)?; let version = metadata .minecraft @@ -350,6 +355,7 @@ pub async fn launch_minecraft( let client_path = state .directories .version_dir(&version_jar) + .await .join(format!("{version_jar}.jar")); let args = version_info.arguments.clone().unwrap_or_default(); @@ -379,10 +385,10 @@ pub async fn launch_minecraft( args::get_jvm_arguments( args.get(&d::minecraft::ArgumentType::Jvm) .map(|x| x.as_slice()), - &state.directories.version_natives_dir(&version_jar), - &state.directories.libraries_dir(), + &state.directories.version_natives_dir(&version_jar).await, + &state.directories.libraries_dir().await, &args::get_class_paths( - &state.directories.libraries_dir(), + &state.directories.libraries_dir().await, version_info.libraries.as_slice(), &client_path, &java_version.architecture, @@ -405,7 +411,7 @@ pub async fn launch_minecraft( &version.id, &version_info.asset_index.id, instance_path, - &state.directories.assets_dir(), + &state.directories.assets_dir().await, &version.type_, *resolution, &java_version.architecture, @@ -430,7 +436,8 @@ pub async fn launch_minecraft( let logs_dir = { let st = State::get().await?; st.directories - .profile_logs_dir(profile.uuid) + .profile_logs_dir(&profile.path) + .await .join(&datetime_string) }; fs::create_dir_all(&logs_dir)?; @@ -490,7 +497,7 @@ pub async fn launch_minecraft( state_children .insert_process( Uuid::new_v4(), - instance_path.to_path_buf(), + profile.path.clone(), stdout_log_path, command, post_exit_hook, diff --git a/theseus/src/state/children.rs b/theseus/src/state/children.rs index bbb7163d4..2634980d8 100644 --- a/theseus/src/state/children.rs +++ b/theseus/src/state/children.rs @@ -24,7 +24,7 @@ pub struct Children(HashMap>>); #[derive(Debug)] pub struct MinecraftChild { pub uuid: Uuid, - pub profile_path: PathBuf, //todo: make UUID when profiles are recognized by UUID + pub profile_relative_path: PathBuf, pub manager: Option>>, // None when future has completed and been handled pub current_child: Arc>, pub output: SharedOutput, @@ -39,12 +39,12 @@ impl Children { // The threads for stdout and stderr are spawned here // Unlike a Hashmap's 'insert', this directly returns the reference to the MinecraftChild rather than any previously stored MinecraftChild that may exist - #[tracing::instrument(skip(self))] + #[tracing::instrument(skip(self, mc_command, post_command, censor_strings))] #[theseus_macros::debug_pin] pub async fn insert_process( &mut self, uuid: Uuid, - profile_path: PathBuf, + profile_relative_path: PathBuf, log_path: PathBuf, mut mc_command: Command, post_command: Option, // Command to run after minecraft. @@ -56,7 +56,7 @@ impl Children { // Create std watcher threads for stdout and stderr let shared_output = SharedOutput::build(&log_path, censor_strings).await?; - if let Some(child_stdout) = child.stdout.take() { + if let Some(child_stdout) = child.stdout.take() { let stdout_clone = shared_output.clone(); tokio::spawn(async move { if let Err(e) = stdout_clone.read_stdout(child_stdout).await { @@ -98,7 +98,7 @@ impl Children { // Create MinecraftChild let mchild = MinecraftChild { uuid, - profile_path, + profile_relative_path, current_child, output: shared_output, manager, @@ -243,7 +243,7 @@ impl Children { if let Some(child) = self.get(&key) { let child = child.clone(); let child = child.read().await; - if child.profile_path == profile_path { + if child.profile_relative_path == profile_path { keys.push(key); } } @@ -259,7 +259,7 @@ impl Children { let child = child.clone(); let child = child.write().await; if child.current_child.write().await.try_wait()?.is_none() { - profiles.push(child.profile_path.clone()); + profiles.push(child.profile_relative_path.clone()); } } } @@ -276,7 +276,7 @@ impl Children { let child = child.write().await; if child.current_child.write().await.try_wait()?.is_none() { if let Some(prof) = crate::api::profile::get( - &child.profile_path.clone(), + &child.profile_relative_path.clone(), None, ) .await? diff --git a/theseus/src/state/dirs.rs b/theseus/src/state/dirs.rs index f564e7d79..fd30cf977 100644 --- a/theseus/src/state/dirs.rs +++ b/theseus/src/state/dirs.rs @@ -1,17 +1,38 @@ //! Theseus directory information use std::fs; -use std::path::PathBuf; +use std::path::{PathBuf, Path}; + +use tokio::sync::RwLock; + +use super::Settings; #[derive(Debug)] pub struct DirectoryInfo { - pub config_dir: PathBuf, + pub settings_dir: PathBuf, + pub config_dir: RwLock, pub working_dir: PathBuf, } impl DirectoryInfo { + + // Get the settings directory + // init() is not needed for this function + pub fn get_initial_settings_dir() -> Option { + Self::env_path("THESEUS_CONFIG_DIR") + .or_else(|| Some(dirs::config_dir()?.join("com.modrinth.theseus"))) + } + + #[inline] + pub fn get_initial_settings_file() -> crate::Result { + let settings_dir = Self::get_initial_settings_dir().ok_or(crate::ErrorKind::FSError( + "Could not find valid config dir".to_string(), + ))?; + Ok(settings_dir.join("settings.json")) + } + /// Get all paths needed for Theseus to operate properly #[tracing::instrument] - pub fn init() -> crate::Result { + pub fn init(settings : &Settings) -> crate::Result { // Working directory let working_dir = std::env::current_dir().map_err(|err| { crate::ErrorKind::FSError(format!( @@ -19,143 +40,148 @@ impl DirectoryInfo { )) })?; - // Config directory - let config_dir = Self::env_path("THESEUS_CONFIG_DIR") - .or_else(|| Some(dirs::config_dir()?.join("com.modrinth.theseus"))) - .ok_or(crate::ErrorKind::FSError( - "Could not find valid config dir".to_string(), - ))?; + let settings_dir = Self::get_initial_settings_dir() .ok_or(crate::ErrorKind::FSError( + "Could not find valid settings dir".to_string(), + ))?; - fs::create_dir_all(&config_dir).map_err(|err| { + fs::create_dir_all(&settings_dir).map_err(|err| { crate::ErrorKind::FSError(format!( "Error creating Theseus config directory: {err}" )) })?; + // config directory (for instances, etc.) + // by default this is the same as the settings directory + let config_dir = settings.loaded_config_dir.clone().ok_or(crate::ErrorKind::FSError( + "Could not find valid config dir".to_string(), + ))?; + Ok(Self { - config_dir, + settings_dir, + // config_dir: RwLock::new(config_dir), + config_dir: RwLock::new(config_dir), working_dir, }) } /// Get the Minecraft instance metadata directory #[inline] - pub fn metadata_dir(&self) -> PathBuf { - self.config_dir.join("meta") + pub async fn metadata_dir(&self) -> PathBuf { + self.config_dir.read().await.join("meta") } /// Get the Minecraft java versions metadata directory #[inline] - pub fn java_versions_dir(&self) -> PathBuf { - self.metadata_dir().join("java_versions") + pub async fn java_versions_dir(&self) -> PathBuf { + self.metadata_dir().await.join("java_versions") } /// Get the Minecraft versions metadata directory #[inline] - pub fn versions_dir(&self) -> PathBuf { - self.metadata_dir().join("versions") + pub async fn versions_dir(&self) -> PathBuf { + self.metadata_dir().await.join("versions") } /// Get the metadata directory for a given version #[inline] - pub fn version_dir(&self, version: &str) -> PathBuf { - self.versions_dir().join(version) + pub async fn version_dir(&self, version: &str) -> PathBuf { + self.versions_dir().await.join(version) } /// Get the Minecraft libraries metadata directory #[inline] - pub fn libraries_dir(&self) -> PathBuf { - self.metadata_dir().join("libraries") + pub async fn libraries_dir(&self) -> PathBuf { + self.metadata_dir().await.join("libraries") } /// Get the Minecraft assets metadata directory #[inline] - pub fn assets_dir(&self) -> PathBuf { - self.metadata_dir().join("assets") + pub async fn assets_dir(&self) -> PathBuf { + self.metadata_dir().await.join("assets") } /// Get the assets index directory #[inline] - pub fn assets_index_dir(&self) -> PathBuf { - self.assets_dir().join("indexes") + pub async fn assets_index_dir(&self) -> PathBuf { + self.assets_dir().await.join("indexes") } /// Get the assets objects directory #[inline] - pub fn objects_dir(&self) -> PathBuf { - self.assets_dir().join("objects") + pub async fn objects_dir(&self) -> PathBuf { + self.assets_dir().await.join("objects") } /// Get the directory for a specific object #[inline] - pub fn object_dir(&self, hash: &str) -> PathBuf { - self.objects_dir().join(&hash[..2]).join(hash) + pub async fn object_dir(&self, hash: &str) -> PathBuf { + self.objects_dir().await.join(&hash[..2]).join(hash) } /// Get the Minecraft legacy assets metadata directory #[inline] - pub fn legacy_assets_dir(&self) -> PathBuf { - self.metadata_dir().join("resources") + pub async fn legacy_assets_dir(&self) -> PathBuf { + self.metadata_dir().await.join("resources") } /// Get the Minecraft legacy assets metadata directory #[inline] - pub fn natives_dir(&self) -> PathBuf { - self.metadata_dir().join("natives") + pub async fn natives_dir(&self) -> PathBuf { + self.metadata_dir().await.join("natives") } /// Get the natives directory for a version of Minecraft #[inline] - pub fn version_natives_dir(&self, version: &str) -> PathBuf { - self.natives_dir().join(version) + pub async fn version_natives_dir(&self, version: &str) -> PathBuf { + self.natives_dir().await.join(version) } /// Get the directory containing instance icons #[inline] - pub fn icon_dir(&self) -> PathBuf { - self.config_dir.join("icons") + pub async fn icon_dir(&self) -> PathBuf { + self.config_dir.read().await.join("icons") } /// Get the profiles directory for created profiles #[inline] - pub fn profiles_dir(&self) -> PathBuf { - self.config_dir.join("profiles") + pub async fn profiles_dir(&self) -> PathBuf { + self.config_dir.read().await.join("profiles") } /// Gets the logs dir for a given profile #[inline] - pub fn profile_logs_dir(&self, profile: uuid::Uuid) -> PathBuf { - self.profiles_dir() - .join(profile.to_string()) + pub async fn profile_logs_dir(&self, profile_relative_path: &Path) -> PathBuf { + self.profiles_dir().await + .join(profile_relative_path) .join("modrinth_logs") } #[inline] - pub fn launcher_logs_dir(&self) -> PathBuf { - self.config_dir.join("launcher_logs") + pub async fn launcher_logs_dir(&self) -> PathBuf { + self.config_dir.read().await.join("launcher_logs") } /// Get the file containing the global database #[inline] - pub fn database_file(&self) -> PathBuf { - self.config_dir.join("data.bin") + pub async fn database_file(&self) -> PathBuf { + self.config_dir.read().await.join("data.bin") } /// Get the settings file for Theseus #[inline] pub fn settings_file(&self) -> PathBuf { - self.config_dir.join("settings.json") + self.settings_dir.join("settings.json") } /// Get the cache directory for Theseus #[inline] - pub fn caches_dir(&self) -> PathBuf { - self.config_dir.join("caches") + pub async fn caches_dir(&self) -> PathBuf { + self.config_dir.read().await.join("caches") } #[inline] - pub fn caches_meta_dir(&self) -> PathBuf { - self.config_dir.join("caches").join("metadata") + pub async fn caches_meta_dir(&self) -> PathBuf { + self.config_dir.read().await.join("caches").join("metadata") } /// Get path from environment variable diff --git a/theseus/src/state/java_globals.rs b/theseus/src/state/java_globals.rs index 9ef33bc17..10b8071e2 100644 --- a/theseus/src/state/java_globals.rs +++ b/theseus/src/state/java_globals.rs @@ -35,6 +35,10 @@ impl JavaGlobals { self.0.len() } + pub fn keys(&self) -> Vec { + self.0.keys().cloned().collect() + } + // Validates that every path here is a valid Java version and that the version matches the version stored here // If false, when checked, the user should be prompted to reselect the Java version pub async fn is_all_valid(&self) -> bool { diff --git a/theseus/src/state/metadata.rs b/theseus/src/state/metadata.rs index 388300889..b32a32519 100644 --- a/theseus/src/state/metadata.rs +++ b/theseus/src/state/metadata.rs @@ -61,7 +61,7 @@ impl Metadata { io_semaphore: &IoSemaphore, ) -> crate::Result { let mut metadata = None; - let metadata_path = dirs.caches_meta_dir().join("metadata.json"); + let metadata_path = dirs.caches_meta_dir().await.join("metadata.json"); if let Ok(metadata_json) = read_json::(&metadata_path, io_semaphore).await @@ -107,7 +107,7 @@ impl Metadata { let state = State::get().await?; let metadata_path = - state.directories.caches_meta_dir().join("metadata.json"); + state.directories.caches_meta_dir().await.join("metadata.json"); write( &metadata_path, diff --git a/theseus/src/state/mod.rs b/theseus/src/state/mod.rs index aa1bc60b1..0b192a6bf 100644 --- a/theseus/src/state/mod.rs +++ b/theseus/src/state/mod.rs @@ -49,7 +49,8 @@ mod safe_processes; pub use self::safe_processes::*; // Global state -static LAUNCHER_STATE: OnceCell> = OnceCell::const_new(); +// RwLock on state only has concurrent reads, except for config dir change +static LAUNCHER_STATE:OnceCell> = OnceCell::const_new(); pub struct State { /// Information on the location of files used in the launcher pub directories: DirectoryInfo, @@ -86,85 +87,97 @@ pub struct State { impl State { /// Get the current launcher state, initializing it if needed + pub async fn get() -> crate::Result>> { + Ok(Arc::new(LAUNCHER_STATE + .get_or_try_init(Self::initialize_state) + .await?.read().await)) + } + + /// Get the current launcher state, initializing it if needed + /// Takes writing control of the state, blocking all other uses of it + /// Only used for state change such as changing the config directory + pub async fn get_write() -> crate::Result> { + Ok(LAUNCHER_STATE + .get_or_try_init(Self::initialize_state) + .await?.write().await) + } + #[tracing::instrument] #[theseus_macros::debug_pin] - pub async fn get() -> crate::Result> { - LAUNCHER_STATE - .get_or_try_init(|| { - async { - let loading_bar = init_loading_unsafe( - LoadingBarType::StateInit, - 100.0, - "Initializing launcher", - ) - .await?; - - let mut file_watcher = init_watcher().await?; - - let directories = DirectoryInfo::init()?; - emit_loading(&loading_bar, 10.0, None).await?; - - // Settings - let settings = - Settings::init(&directories.settings_file()).await?; - let fetch_semaphore = FetchSemaphore(RwLock::new( - Semaphore::new(settings.max_concurrent_downloads), - )); - let io_semaphore = IoSemaphore(RwLock::new( - Semaphore::new(settings.max_concurrent_writes), - )); - emit_loading(&loading_bar, 10.0, None).await?; - - let metadata_fut = - Metadata::init(&directories, &io_semaphore); - let profiles_fut = - Profiles::init(&directories, &mut file_watcher); - let tags_fut = Tags::init( - &directories, - &io_semaphore, - &fetch_semaphore, - ); - let users_fut = Users::init(&directories, &io_semaphore); - // Launcher data - let (metadata, profiles, tags, users) = loading_join! { - Some(&loading_bar), 70.0, Some("Loading metadata"); - metadata_fut, - profiles_fut, - tags_fut, - users_fut, - }?; - - let children = Children::new(); - let auth_flow = AuthTask::new(); - let safety_processes = SafeProcesses::new(); - emit_loading(&loading_bar, 10.0, None).await?; - - Ok(Arc::new(Self { - directories, - fetch_semaphore, - fetch_semaphore_max: RwLock::new( - settings.max_concurrent_downloads as u32, - ), - io_semaphore, - io_semaphore_max: RwLock::new( - settings.max_concurrent_writes as u32, - ), - metadata: RwLock::new(metadata), - settings: RwLock::new(settings), - profiles: RwLock::new(profiles), - users: RwLock::new(users), - children: RwLock::new(children), - auth_flow: RwLock::new(auth_flow), - tags: RwLock::new(tags), - safety_processes: RwLock::new(safety_processes), - file_watcher: RwLock::new(file_watcher), - })) - } - }) - .await - .map(Arc::clone) + async fn initialize_state() -> crate::Result> { + let loading_bar = init_loading_unsafe( + LoadingBarType::StateInit, + 100.0, + "Initializing launcher", + ) + .await?; + + // Settings + let settings = + Settings::init(&DirectoryInfo::get_initial_settings_file()?).await?; + + let directories = DirectoryInfo::init(&settings)?; + + emit_loading(&loading_bar, 10.0, None).await?; + + let mut file_watcher = init_watcher().await?; + + let fetch_semaphore = FetchSemaphore(RwLock::new( + Semaphore::new(settings.max_concurrent_downloads), + )); + let io_semaphore = IoSemaphore(RwLock::new( + Semaphore::new(settings.max_concurrent_writes), + )); + emit_loading(&loading_bar, 10.0, None).await?; + + let metadata_fut = + Metadata::init(&directories, &io_semaphore); + let profiles_fut = + Profiles::init(&directories, &mut file_watcher); + let tags_fut = Tags::init( + &directories, + &io_semaphore, + &fetch_semaphore, + ); + let users_fut = Users::init(&directories, &io_semaphore); + // Launcher data + let (metadata, profiles, tags, users) = loading_join! { + Some(&loading_bar), 70.0, Some("Loading metadata"); + metadata_fut, + profiles_fut, + tags_fut, + users_fut, + }?; + + let children = Children::new(); + let auth_flow = AuthTask::new(); + let safety_processes = SafeProcesses::new(); + emit_loading(&loading_bar, 10.0, None).await?; + + Ok::, crate::Error>(RwLock::new(Self { + directories, + fetch_semaphore, + fetch_semaphore_max: RwLock::new( + settings.max_concurrent_downloads as u32, + ), + io_semaphore, + io_semaphore_max: RwLock::new( + settings.max_concurrent_writes as u32, + ), + metadata: RwLock::new(metadata), + settings: RwLock::new(settings), + profiles: RwLock::new(profiles), + users: RwLock::new(users), + children: RwLock::new(children), + auth_flow: RwLock::new(auth_flow), + tags: RwLock::new(tags), + safety_processes: RwLock::new(safety_processes), + file_watcher: RwLock::new(file_watcher), + })) + } + /// Updates state with data from the web pub fn update() { tokio::task::spawn(Metadata::update()); @@ -240,7 +253,7 @@ impl State { } } -async fn init_watcher() -> crate::Result> { +pub async fn init_watcher() -> crate::Result> { let (mut tx, mut rx) = channel(1); let file_watcher = new_debouncer( diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index 080710bcc..d71cf6d13 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -241,10 +241,11 @@ impl Profile { if let Some(profile) = profile { let paths = profile.get_profile_full_project_paths()?; + let caches_dir = state.directories.caches_dir().await; let projects = crate::state::infer_data_from_files( profile.clone(), paths, - state.directories.caches_dir(), + caches_dir, &state.io_semaphore, &state.fetch_semaphore, ) @@ -261,7 +262,6 @@ impl Profile { ProfilePayloadType::Synced, ) .await?; - tracing::info!("Done syncing"); } else { tracing::warn!( "Unable to fetch single profile projects: path {path:?} invalid", @@ -282,7 +282,6 @@ impl Profile { /// Gets paths to projects as their full paths, not just their relative paths pub fn get_profile_full_project_paths(&self) -> crate::Result> { - tracing::info!("Getting profile project paths, profile path: {}", self.path.display()); let mut files = Vec::new(); let mut read_paths = |path: &str| { let new_path = self.path.join(path); @@ -429,7 +428,7 @@ impl Profile { } }; - let state: std::sync::Arc = State::get().await?; + let state = State::get().await?; let relative_name = PathBuf::new().join(project_type.get_folder()).join(file_name); let path = self.path.join(relative_name.clone()); write(&path, &bytes, &state.io_semaphore).await?; @@ -548,19 +547,21 @@ impl Profiles { file_watcher: &mut Debouncer, ) -> crate::Result { let mut profiles = HashMap::new(); - fs::create_dir_all(dirs.profiles_dir()).await?; + let profiles_dir = dirs.profiles_dir().await; + fs::create_dir_all(&profiles_dir).await?; file_watcher .watcher() - .watch(&dirs.profiles_dir(), RecursiveMode::NonRecursive)?; + .watch(&profiles_dir, RecursiveMode::NonRecursive)?; - let mut entries = fs::read_dir(dirs.profiles_dir()).await?; + let mut entries = fs::read_dir(dirs.profiles_dir().await).await?; while let Some(entry) = entries.next_entry().await? { let path = entry.path(); if path.is_dir() { - let prof = match Self::read_profile_from_dir(&path).await { + let prof = match Self::read_profile_from_dir(&path, &dirs).await { Ok(prof) => Some(prof), Err(err) => { + tracing::warn!( "Error loading profile: {err}. Skipping..." ); @@ -570,7 +571,7 @@ impl Profiles { if let Some(profile) = prof { let path = canonicalize(path)?; Profile::watch_fs(&path, file_watcher).await?; - profiles.insert(path, profile); + profiles.insert(profile.path.clone(), profile); } } } @@ -595,13 +596,14 @@ impl Profiles { } } + let caches_dir = state.directories.caches_dir().await; future::try_join_all(files.into_iter().map( |(profile, files)| async { let profile_path = profile.path.clone(); let inferred = super::projects::infer_data_from_files( profile, files, - state.directories.caches_dir(), + caches_dir.clone(), &state.io_semaphore, &state.fetch_semaphore, ) @@ -681,14 +683,14 @@ impl Profiles { #[tracing::instrument(skip_all)] pub async fn sync(&self) -> crate::Result<&Self> { + let state = State::get().await?; + let profiles_dir = &state.directories.profiles_dir().await; stream::iter(self.0.iter()) .map(Ok::<_, crate::Error>) .try_for_each_concurrent(None, |(path, profile)| async move { - tracing::info!("Syncing profile: {:?}", path); let json = serde_json::to_vec(&profile)?; - let json_path = Path::new(&path.to_string_lossy().to_string()) - .join(PROFILE_JSON_PATH); + let json_path = profiles_dir.join(&path).join(PROFILE_JSON_PATH); fs::write(json_path, json).await?; Ok::<_, crate::Error>(()) @@ -698,10 +700,21 @@ impl Profiles { Ok(self) } - async fn read_profile_from_dir(path: &Path) -> crate::Result { + async fn read_profile_from_dir(path: &Path, dirs : &DirectoryInfo) -> crate::Result { let json = fs::read(path.join(PROFILE_JSON_PATH)).await?; let mut profile = serde_json::from_slice::(&json)?; - profile.path = PathBuf::from(path); + + profile.path = PathBuf::from(path.strip_prefix(dirs.profiles_dir().await)?); + + // Cache icons were changed to be relative in v0.2.3. This strips the cache dir from the icon path if it exists. + let cache_dir = dirs.caches_dir().await; + if let Some(icon) = &mut profile.metadata.icon { + *icon = match icon.strip_prefix(cache_dir) { + Ok(path) => path.to_path_buf(), + Err(_) => icon.clone(), + }; + } + Ok(profile) } @@ -714,10 +727,9 @@ impl Profiles { let res = async { let _span = span.enter(); let state = State::get().await?; - + let dirs = &state.directories; let mut profiles = state.profiles.write().await; - tracing::info!("Updating: {path}", path = path.display()); if let Some(profile) = profiles.0.get_mut(&path) { if !path.exists() { // if path exists in the state but no longer in the filesystem, remove it from the state list @@ -734,7 +746,7 @@ impl Profiles { } else if path.exists() { // if it exists in the filesystem but no longer in the state, add it to the state list profiles - .insert(Self::read_profile_from_dir(&path).await?) + .insert(Self::read_profile_from_dir(&path, &dirs).await?) .await?; Profile::sync_projects_task(path); } diff --git a/theseus/src/state/settings.rs b/theseus/src/state/settings.rs index c1de10697..678ee8262 100644 --- a/theseus/src/state/settings.rs +++ b/theseus/src/state/settings.rs @@ -4,10 +4,10 @@ use crate::{ State, }; use serde::{Deserialize, Serialize}; -use std::path::Path; +use std::path::{Path, PathBuf}; use tokio::fs; -use super::JavaGlobals; +use super::{JavaGlobals, DirectoryInfo}; // TODO: convert to semver? const CURRENT_FORMAT_VERSION: u32 = 1; @@ -15,7 +15,6 @@ const CURRENT_FORMAT_VERSION: u32 = 1; // Types /// Global Theseus settings #[derive(Serialize, Deserialize, Debug, Clone)] -#[serde(default)] pub struct Settings { pub theme: Theme, pub memory: MemorySettings, @@ -41,31 +40,8 @@ pub struct Settings { pub advanced_rendering: bool, #[serde(default)] pub onboarded: bool, -} - -impl Default for Settings { - fn default() -> Self { - Self { - theme: Theme::Dark, - memory: MemorySettings::default(), - game_resolution: WindowSize::default(), - custom_java_args: Vec::new(), - custom_env_args: Vec::new(), - java_globals: JavaGlobals::new(), - default_user: None, - hooks: Hooks::default(), - max_concurrent_downloads: 10, - max_concurrent_writes: 10, - version: CURRENT_FORMAT_VERSION, - collapsed_navigation: false, - hide_on_process: false, - default_page: DefaultPage::Home, - developer_mode: false, - opt_out_analytics: false, - advanced_rendering: true, - onboarded: false, - } - } + #[serde(default = "DirectoryInfo::get_initial_settings_dir")] + pub loaded_config_dir: Option, } impl Settings { @@ -85,7 +61,29 @@ impl Settings { .map_err(crate::Error::from) }) } else { - Ok(Settings::default()) + Ok(Self { + theme: Theme::Dark, + memory: MemorySettings::default(), + game_resolution: WindowSize::default(), + custom_java_args: Vec::new(), + custom_env_args: Vec::new(), + java_globals: JavaGlobals::new(), + default_user: None, + hooks: Hooks::default(), + max_concurrent_downloads: 10, + max_concurrent_writes: 10, + version: CURRENT_FORMAT_VERSION, + collapsed_navigation: false, + hide_on_process: false, + default_page: DefaultPage::Home, + developer_mode: false, + opt_out_analytics: false, + advanced_rendering: true, + onboarded: false, + + // By default, the config directory is the same as the settings directory + loaded_config_dir: DirectoryInfo::get_initial_settings_dir(), + }) } } @@ -123,6 +121,11 @@ impl Settings { }; } + // #[inline] + // pub fn get_config_dir(&self) -> crate::Result { + // self.config_dir.clone() + // } + #[tracing::instrument(skip(self))] pub async fn sync(&self, to: &Path) -> crate::Result<()> { fs::write(to, serde_json::to_vec(self)?) diff --git a/theseus/src/state/tags.rs b/theseus/src/state/tags.rs index dab2762cd..01ce8c452 100644 --- a/theseus/src/state/tags.rs +++ b/theseus/src/state/tags.rs @@ -28,7 +28,7 @@ impl Tags { fetch_semaphore: &FetchSemaphore, ) -> crate::Result { let mut tags = None; - let tags_path = dirs.caches_meta_dir().join("tags.json"); + let tags_path = dirs.caches_meta_dir().await.join("tags.json"); if let Ok(tags_json) = read_json::(&tags_path, io_semaphore).await { @@ -60,7 +60,7 @@ impl Tags { let tags_fetch = Tags::fetch(&state.fetch_semaphore).await?; let tags_path = - state.directories.caches_meta_dir().join("tags.json"); + state.directories.caches_meta_dir().await.join("tags.json"); write( &tags_path, diff --git a/theseus/src/state/users.rs b/theseus/src/state/users.rs index 6d402a6da..ec0878cbe 100644 --- a/theseus/src/state/users.rs +++ b/theseus/src/state/users.rs @@ -17,7 +17,7 @@ impl Users { dirs: &DirectoryInfo, io_semaphore: &IoSemaphore, ) -> crate::Result { - let users_path = dirs.caches_meta_dir().join(USERS_JSON); + let users_path = dirs.caches_meta_dir().await.join(USERS_JSON); let users = read_json(&users_path, io_semaphore).await.ok(); if let Some(users) = users { @@ -29,7 +29,7 @@ impl Users { pub async fn save(&self) -> crate::Result<()> { let state = State::get().await?; - let users_path = state.directories.caches_meta_dir().join(USERS_JSON); + let users_path = state.directories.caches_meta_dir().await.join(USERS_JSON); write( &users_path, &serde_json::to_vec(&self.0)?, diff --git a/theseus/src/util/fetch.rs b/theseus/src/util/fetch.rs index b60fe1f1e..f65a04f22 100644 --- a/theseus/src/util/fetch.rs +++ b/theseus/src/util/fetch.rs @@ -218,6 +218,7 @@ pub async fn write<'a>( Ok(()) } +// Writes a icon to the cache and returns the *relative* path of the icon within the cache directory #[tracing::instrument(skip(bytes, semaphore))] pub async fn write_cached_icon( icon_path: &str, @@ -236,6 +237,7 @@ pub async fn write_cached_icon( write(&path, &bytes, semaphore).await?; let path = dunce::canonicalize(path)?; + let path = path.strip_prefix(cache_dir)?.to_path_buf(); Ok(path) } diff --git a/theseus/src/util/jre.rs b/theseus/src/util/jre.rs index 05e57d86c..882abe30b 100644 --- a/theseus/src/util/jre.rs +++ b/theseus/src/util/jre.rs @@ -201,7 +201,7 @@ async fn get_all_autoinstalled_jre_path() -> Result, JREError> let state = State::get().await.map_err(|_| JREError::StateError)?; let mut jre_paths = HashSet::new(); - let base_path = state.directories.java_versions_dir(); + let base_path = state.directories.java_versions_dir().await; if base_path.is_dir() { if let Ok(dir) = std::fs::read_dir(base_path) { diff --git a/theseus_cli/src/subcommands/user.rs b/theseus_cli/src/subcommands/user.rs index e866b982f..a6e7ec641 100644 --- a/theseus_cli/src/subcommands/user.rs +++ b/theseus_cli/src/subcommands/user.rs @@ -151,7 +151,7 @@ impl UserDefault { ) -> Result<()> { info!("Setting user {} as default", self.user.as_hyphenated()); - let state: std::sync::Arc = State::get().await?; + let state = State::get().await?; let mut settings = state.settings.write().await; if settings.default_user == Some(self.user) { diff --git a/theseus_gui/src-tauri/src/api/logs.rs b/theseus_gui/src-tauri/src/api/logs.rs index c81dbe039..b76b3db41 100644 --- a/theseus_gui/src-tauri/src/api/logs.rs +++ b/theseus_gui/src-tauri/src/api/logs.rs @@ -50,7 +50,13 @@ pub async fn logs_get_output_by_datetime( profile_uuid: Uuid, datetime_string: String, ) -> Result { - Ok(logs::get_output_by_datetime(profile_uuid, &datetime_string).await?) + let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { + p.path + } else { + return Err(theseus::Error::from(theseus::ErrorKind::UnmanagedProfileError(profile_uuid.to_string())).into()); + }; + + Ok(logs::get_output_by_datetime(&profile_path, &datetime_string).await?) } /// Delete all logs for a profile by profile id diff --git a/theseus_gui/src-tauri/src/api/profile.rs b/theseus_gui/src-tauri/src/api/profile.rs index c2650932b..82fa10c05 100644 --- a/theseus_gui/src-tauri/src/api/profile.rs +++ b/theseus_gui/src-tauri/src/api/profile.rs @@ -228,6 +228,8 @@ pub async fn profile_run_credentials( ) -> Result { let minecraft_child = profile::run_credentials(path, &credentials).await?; let uuid = minecraft_child.read().await.uuid; + + Ok(uuid) } diff --git a/theseus_gui/src-tauri/src/api/settings.rs b/theseus_gui/src-tauri/src/api/settings.rs index 9b90cf80d..7a6341013 100644 --- a/theseus_gui/src-tauri/src/api/settings.rs +++ b/theseus_gui/src-tauri/src/api/settings.rs @@ -1,3 +1,5 @@ +use std::path::PathBuf; + use crate::api::Result; use serde::{Deserialize, Serialize}; use theseus::prelude::*; @@ -22,7 +24,7 @@ pub struct FrontendSettings { pub fn init() -> tauri::plugin::TauriPlugin { tauri::plugin::Builder::new("settings") - .invoke_handler(tauri::generate_handler![settings_get, settings_set,]) + .invoke_handler(tauri::generate_handler![settings_get, settings_set, settings_change_config_dir]) .build() } @@ -41,3 +43,12 @@ pub async fn settings_set(settings: Settings) -> Result<()> { settings::set(settings).await?; Ok(()) } + +// Change config directory +// Seizes the entire State to do it +// invoke('plugin:settings|settings_change_config_dir', new_dir) +#[tauri::command] +pub async fn settings_change_config_dir(new_config_dir: PathBuf) -> Result<()> { + settings::set_config_dir(new_config_dir).await?; + Ok(()) +} diff --git a/theseus_gui/src-tauri/src/api/utils.rs b/theseus_gui/src-tauri/src/api/utils.rs index e3dfcb25f..08be69908 100644 --- a/theseus_gui/src-tauri/src/api/utils.rs +++ b/theseus_gui/src-tauri/src/api/utils.rs @@ -1,7 +1,7 @@ use theseus::{handler, prelude::CommandPayload, State}; use crate::api::Result; -use std::{env, process::Command}; +use std::{env, process::Command, path::PathBuf}; pub fn init() -> tauri::plugin::TauriPlugin { tauri::plugin::Builder::new("utils") @@ -12,6 +12,7 @@ pub fn init() -> tauri::plugin::TauriPlugin { safety_check_safe_loading_bars, get_opening_command, await_sync, + get_cache_path ]) .build() } @@ -122,6 +123,14 @@ pub async fn handle_command(command: String) -> Result<()> { #[tauri::command] pub async fn await_sync() -> Result<()> { State::sync().await?; - tracing::info!("State synced"); + tracing::debug!("State synced"); Ok(()) } + +// Get cached path from relative path +// Returns "%CACHE_DIR%/relative_path" +#[tauri::command] +pub async fn get_cache_path() -> Result { + let state = theseus::State::get().await?; + Ok(state.directories.caches_dir().await) +} diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index 298206330..b474f3de5 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -14,7 +14,7 @@ import { import { useLoading, useTheming } from '@/store/state' import AccountsCard from '@/components/ui/AccountsCard.vue' import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue' -import { get } from '@/helpers/settings' +import { get, change_config_dir } from '@/helpers/settings' import Breadcrumbs from '@/components/ui/Breadcrumbs.vue' import RunningAppBar from '@/components/ui/RunningAppBar.vue' import SplashScreen from '@/components/ui/SplashScreen.vue' @@ -96,6 +96,12 @@ const handleClose = async () => { window.getCurrent().close() } +const do_change = async () => { + console.log("123") + await change_config_dir('/home/thesuzerain/newone') + console.log("456") +} + window.getCurrent().listen(TauriEvent.WINDOW_CLOSE_REQUESTED, async () => { await handleClose() }) @@ -151,6 +157,9 @@ const accounts = ref(null) +
diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue index 5627af754..7d6182416 100644 --- a/theseus_gui/src/components/ui/Instance.vue +++ b/theseus_gui/src/components/ui/Instance.vue @@ -2,7 +2,6 @@ import { onUnmounted, ref, watch } from 'vue' import { useRouter } from 'vue-router' import { Card, DownloadIcon, StopCircleIcon, Avatar, AnimatedLogo, PlayIcon } from 'omorphia' -import { convertFileSrc } from '@tauri-apps/api/tauri' import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue' import { install as pack_install } from '@/helpers/pack' import { list, run } from '@/helpers/profile' @@ -17,6 +16,7 @@ import { handleError } from '@/store/state.js' import { showInFolder } from '@/helpers/utils.js' import InstanceInstallModal from '@/components/ui/InstanceInstallModal.vue' import mixpanel from 'mixpanel-browser' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const props = defineProps({ instance: { @@ -176,6 +176,8 @@ defineExpose({ instance: props.instance, }) +const cacheDir = await getCacheDir(); + const unlisten = await process_listener((e) => { if (e.event === 'finished' && e.uuid === uuid.value) playing.value = false }) @@ -193,7 +195,7 @@ onUnmounted(() => unlisten()) ? !props.instance.metadata.icon || (props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http')) ? props.instance.metadata.icon - : convertFileSrc(props.instance.metadata?.icon) + : convertCachedFileSrc(cacheDir,props.instance.metadata?.icon) : props.instance.icon_url " alt="Mod card" diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue index 9f99cc1c1..5eafb9d02 100644 --- a/theseus_gui/src/components/ui/InstanceCreationModal.vue +++ b/theseus_gui/src/components/ui/InstanceCreationModal.vue @@ -107,7 +107,6 @@ import { computed, ref, shallowRef } from 'vue' import { get_loaders } from '@/helpers/tags' import { create } from '@/helpers/profile' import { open } from '@tauri-apps/api/dialog' -import { tauri } from '@tauri-apps/api' import { get_game_versions, get_fabric_versions, @@ -120,6 +119,7 @@ import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/state.js' import { listen } from '@tauri-apps/api/event' import { install_from_file } from '@/helpers/pack.js' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const themeStore = useTheming() @@ -236,7 +236,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = tauri.convertFileSrc(icon.value) + display_icon.value = convertCachedFileSrc(cacheDir,icon.value) } const reset_icon = () => { @@ -244,6 +244,8 @@ const reset_icon = () => { display_icon.value = null } +const cacheDir = await getCacheDir(); + const selectable_versions = computed(() => { if (game_version.value) { if (loader.value === 'fabric') { diff --git a/theseus_gui/src/components/ui/InstanceInstallModal.vue b/theseus_gui/src/components/ui/InstanceInstallModal.vue index a0b3a3c16..c0f274988 100644 --- a/theseus_gui/src/components/ui/InstanceInstallModal.vue +++ b/theseus_gui/src/components/ui/InstanceInstallModal.vue @@ -18,14 +18,13 @@ import { get, list, } from '@/helpers/profile' -import { tauri } from '@tauri-apps/api' import { open } from '@tauri-apps/api/dialog' -import { convertFileSrc } from '@tauri-apps/api/tauri' import { create } from '@/helpers/profile' import { installVersionDependencies } from '@/helpers/utils' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const themeStore = useTheming() @@ -61,6 +60,7 @@ defineExpose({ }) const profiles = ref([]) +const cacheDir = await getCacheDir(); async function install(instance) { instance.installing = true @@ -142,7 +142,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = tauri.convertFileSrc(icon.value) + display_icon.value = convertCachedFileSrc(cacheDir, icon.value) } const reset_icon = () => { @@ -227,7 +227,7 @@ const check_valid = computed(() => { !profile.metadata.icon || (profile.metadata.icon && profile.metadata.icon.startsWith('http')) ? profile.metadata.icon - : convertFileSrc(profile.metadata?.icon) + : convertCachedFileSrc(cacheDir, profile.metadata?.icon) " class="profile-image" /> diff --git a/theseus_gui/src/helpers/cache.js b/theseus_gui/src/helpers/cache.js new file mode 100644 index 000000000..f2089872d --- /dev/null +++ b/theseus_gui/src/helpers/cache.js @@ -0,0 +1,15 @@ + +// Wrapper around convertFileSrc, which converts a filepath to a loadable URL + +import { invoke } from "@tauri-apps/api" +import { convertFileSrc } from "@tauri-apps/api/tauri" + +// This converts a relative cached filepath (ie: 'icons/1234.png') to a loadable URL by appending the cache directory first +export function convertCachedFileSrc(cacheDir,src) { + return convertFileSrc(cacheDir + "/" + src) +} + +export async function getCacheDir() { + return await invoke('plugin:utils|get_cache_path', { }) +} + diff --git a/theseus_gui/src/helpers/settings.js b/theseus_gui/src/helpers/settings.js index 44495cb20..ebe80553f 100644 --- a/theseus_gui/src/helpers/settings.js +++ b/theseus_gui/src/helpers/settings.js @@ -37,3 +37,11 @@ export async function get() { export async function set(settings) { return await invoke('plugin:settings|settings_set', { settings }) } + + +// Changes the config dir +// Seizes the entire application state until its done +export async function change_config_dir(newConfigDir) { + console.log("tedst") + return await invoke('plugin:settings|settings_change_config_dir', { newConfigDir }) +} \ No newline at end of file diff --git a/theseus_gui/src/pages/Browse.vue b/theseus_gui/src/pages/Browse.vue index 8bbd1c6d1..cbb49305e 100644 --- a/theseus_gui/src/pages/Browse.vue +++ b/theseus_gui/src/pages/Browse.vue @@ -30,7 +30,7 @@ import SplashScreen from '@/components/ui/SplashScreen.vue' import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue' import { useFetch } from '@/helpers/fetch.js' import { check_installed, get as getInstance } from '@/helpers/profile.js' -import { convertFileSrc } from '@tauri-apps/api/tauri' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const router = useRouter() const route = useRoute() @@ -70,6 +70,8 @@ const pageCount = computed(() => results.value ? Math.ceil(results.value.total_hits / results.value.limit) : 1 ) +const cacheDir = await getCacheDir(); + function getArrayOrString(x) { if (typeof x === 'string' || x instanceof String) { return [x] @@ -482,7 +484,7 @@ const showLoaders = computed( !instanceContext.metadata.icon || (instanceContext.metadata.icon && instanceContext.metadata.icon.startsWith('http')) ? instanceContext.metadata.icon - : convertFileSrc(instanceContext.metadata.icon) + : convertCachedFileSrc(cacheDir, instanceContext.metadata.icon) " :alt="instanceContext.metadata.name" size="sm" diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue index 6ee1e6bfb..1cd55ef7e 100644 --- a/theseus_gui/src/pages/instance/Index.vue +++ b/theseus_gui/src/pages/instance/Index.vue @@ -8,7 +8,7 @@ !instance.metadata.icon || (instance.metadata.icon && instance.metadata.icon.startsWith('http')) ? instance.metadata.icon - : convertFileSrc(instance.metadata?.icon) + : convertCachedFileSrc(cacheDir, instance.metadata?.icon) " />
@@ -130,13 +130,13 @@ import { import { process_listener, profile_listener } from '@/helpers/events' import { useRoute, useRouter } from 'vue-router' import { ref, onUnmounted } from 'vue' -import { convertFileSrc } from '@tauri-apps/api/tauri' import { handleError, useBreadcrumbs, useLoading } from '@/store/state' import { showInFolder } from '@/helpers/utils.js' import ContextMenu from '@/components/ui/ContextMenu.vue' import mixpanel from 'mixpanel-browser' import { PackageIcon } from '@/assets/icons/index.js' import ExportModal from '@/components/ui/ExportModal.vue' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const route = useRoute() @@ -155,6 +155,8 @@ breadcrumbs.setContext({ const loadingBar = useLoading() +const cacheDir = await getCacheDir(); + const uuid = ref(null) const playing = ref(false) const loading = ref(false) diff --git a/theseus_gui/src/pages/instance/Logs.vue b/theseus_gui/src/pages/instance/Logs.vue index c9eaa1636..5b57e965c 100644 --- a/theseus_gui/src/pages/instance/Logs.vue +++ b/theseus_gui/src/pages/instance/Logs.vue @@ -87,7 +87,7 @@ async function getLiveLog() { } async function getLogs() { - return (await get_logs(props.instance.uuid, true).catch(handleError)).reverse().map((log) => { + return (await get_logs(props.instance.path, true).catch(handleError)).reverse().map((log) => { log.name = dayjs( log.datetime_string.slice(0, 8) + 'T' + log.datetime_string.slice(9) ).calendar() @@ -121,7 +121,7 @@ watch(selectedLogIndex, async (newIndex) => { if (newIndex !== 0) { logs.value[newIndex].stdout = 'Loading...' logs.value[newIndex].stdout = await get_output_by_datetime( - props.instance.uuid, + props.instance.path, logs.value[newIndex].datetime_string ).catch(handleError) } @@ -136,7 +136,7 @@ const deleteLog = async () => { let deleteIndex = selectedLogIndex.value selectedLogIndex.value = deleteIndex - 1 await delete_logs_by_datetime( - props.instance.uuid, + props.instance.path, logs.value[deleteIndex].datetime_string ).catch(handleError) await setLogs() diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue index cb1353cb8..436e2b05c 100644 --- a/theseus_gui/src/pages/instance/Mods.vue +++ b/theseus_gui/src/pages/instance/Mods.vue @@ -221,7 +221,6 @@ import { CheckCircleIcon, } from 'omorphia' import { computed, ref, watch } from 'vue' -import { convertFileSrc } from '@tauri-apps/api/tauri' import { useRouter } from 'vue-router' import { add_project_from_path, @@ -235,6 +234,7 @@ import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { open } from '@tauri-apps/api/dialog' import { listen } from '@tauri-apps/api/event' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const router = useRouter() @@ -281,7 +281,7 @@ const initProjects = (initInstance) => { author: project.metadata.authors[0], version: project.metadata.version, file_name: project.file_name, - icon: project.metadata.icon ? convertFileSrc(project.metadata.icon) : null, + icon: project.metadata.icon ? convertCachedFileSrc(cacheDir, project.metadata.icon) : null, disabled: project.disabled, outdated: false, project_type: project.metadata.project_type, @@ -317,6 +317,8 @@ const selected = computed(() => projects.value.filter((mod) => mod.selected)) const deleteWarning = ref(null) const hideNonSelected = ref(false) +const cacheDir = await getCacheDir(); + const selectableProjectTypes = computed(() => { const obj = { All: 'all' } diff --git a/theseus_gui/src/pages/instance/Options.vue b/theseus_gui/src/pages/instance/Options.vue index a0dee07ca..964bb6d53 100644 --- a/theseus_gui/src/pages/instance/Options.vue +++ b/theseus_gui/src/pages/instance/Options.vue @@ -62,7 +62,7 @@
@@ -334,13 +334,13 @@ import { computed, readonly, ref, shallowRef, watch } from 'vue' import { get_max_memory } from '@/helpers/jre.js' import { get } from '@/helpers/settings.js' import JavaSelector from '@/components/ui/JavaSelector.vue' -import { convertFileSrc } from '@tauri-apps/api/tauri' import { open } from '@tauri-apps/api/dialog' import { get_fabric_versions, get_forge_versions, get_quilt_versions } from '@/helpers/metadata.js' import { get_game_versions, get_loaders } from '@/helpers/tags.js' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const router = useRouter() @@ -357,6 +357,10 @@ const title = ref(props.instance.metadata.name) const icon = ref(props.instance.metadata.icon) const groups = ref(props.instance.metadata.groups) +const cacheDir = await getCacheDir(); + + + const instancesList = Object.values(await list(true)) const availableGroups = ref([ ...new Set( diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue index 4f3043ed8..d2fea87b5 100644 --- a/theseus_gui/src/pages/project/Index.vue +++ b/theseus_gui/src/pages/project/Index.vue @@ -8,7 +8,7 @@ !instance.metadata.icon || (instance.metadata.icon && instance.metadata.icon.startsWith('http')) ? instance.metadata.icon - : convertFileSrc(instance.metadata?.icon) + : convertCachedFileSrc(cacheDir, instance.metadata?.icon) " :alt="instance.metadata.name" size="sm" @@ -273,9 +273,9 @@ import { useBreadcrumbs } from '@/store/breadcrumbs' import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue' import { useFetch } from '@/helpers/fetch.js' import { handleError } from '@/store/notifications.js' -import { convertFileSrc } from '@tauri-apps/api/tauri' import ContextMenu from '@/components/ui/ContextMenu.vue' import mixpanel from 'mixpanel-browser' +import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' const route = useRoute() const breadcrumbs = useBreadcrumbs() @@ -296,6 +296,8 @@ const instance = ref(null) const installed = ref(false) const installedVersion = ref(null) +const cacheDir = await getCacheDir(); + async function fetchProjectData() { ;[ data.value, From 4c2767b98b26c68ea9c1362673cabd036006f1bd Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 6 Jul 2023 12:37:00 -0700 Subject: [PATCH 03/10] fixed bugs, added newtypes for project and profile ids --- theseus/src/api/logs.rs | 61 ++-- theseus/src/api/mod.rs | 1 + theseus/src/api/pack/install.rs | 45 ++- theseus/src/api/pack/install_from.rs | 21 +- theseus/src/api/process.rs | 8 +- theseus/src/api/profile.rs | 188 +++++------ theseus/src/api/profile_create.rs | 27 +- theseus/src/api/settings.rs | 65 ++-- theseus/src/error.rs | 2 +- theseus/src/launcher/download.rs | 5 +- theseus/src/launcher/mod.rs | 22 +- theseus/src/state/children.rs | 21 +- theseus/src/state/dirs.rs | 46 +-- theseus/src/state/metadata.rs | 7 +- theseus/src/state/mod.rs | 184 ++++++----- theseus/src/state/profiles.rs | 309 +++++++++++++----- theseus/src/state/projects.rs | 21 +- theseus/src/state/settings.rs | 4 +- theseus/src/state/users.rs | 3 +- theseus/src/util/fetch.rs | 3 +- theseus_cli/src/subcommands/profile.rs | 9 +- theseus_gui/src-tauri/src/api/logs.rs | 11 +- theseus_gui/src-tauri/src/api/pack.rs | 6 +- theseus_gui/src-tauri/src/api/process.rs | 7 +- theseus_gui/src-tauri/src/api/profile.rs | 91 +++--- .../src-tauri/src/api/profile_create.rs | 2 +- theseus_gui/src-tauri/src/api/settings.rs | 6 +- theseus_gui/src-tauri/src/api/utils.rs | 11 +- theseus_gui/src/App.vue | 9 - theseus_gui/src/components/ui/ExportModal.vue | 2 - theseus_gui/src/components/ui/Instance.vue | 6 +- .../components/ui/InstanceCreationModal.vue | 6 +- .../components/ui/InstanceInstallModal.vue | 7 +- theseus_gui/src/helpers/cache.js | 12 +- theseus_gui/src/helpers/settings.js | 4 +- theseus_gui/src/pages/Browse.vue | 6 +- theseus_gui/src/pages/instance/Index.vue | 6 +- theseus_gui/src/pages/instance/Mods.vue | 6 +- theseus_gui/src/pages/instance/Options.vue | 8 +- theseus_gui/src/pages/project/Index.vue | 6 +- theseus_playground/src/main.rs | 3 +- 41 files changed, 729 insertions(+), 538 deletions(-) diff --git a/theseus/src/api/logs.rs b/theseus/src/api/logs.rs index 21441fbe0..c26151a11 100644 --- a/theseus/src/api/logs.rs +++ b/theseus/src/api/logs.rs @@ -1,6 +1,4 @@ -use std::path::Path; - -use crate::State; +use crate::{state::ProfilePathId, State}; use serde::{Deserialize, Serialize}; use tokio::fs::read_to_string; @@ -11,7 +9,7 @@ pub struct Logs { } impl Logs { async fn build( - profile_subpath: &Path, + profile_subpath: &ProfilePathId, datetime_string: String, clear_contents: Option, ) -> crate::Result { @@ -35,13 +33,18 @@ pub async fn get_logs( clear_contents: Option, ) -> crate::Result> { let state = State::get().await?; - let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.path + let profile_path = if let Some(p) = + crate::profile::get_by_uuid(profile_uuid, None).await? + { + p.name_as_path_id() } else { - return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + return Err(crate::ErrorKind::UnmanagedProfileError( + profile_uuid.to_string(), + ) + .into()); }; - let logs_folder = state.directories.profile_logs_dir(&profile_path).await; + let logs_folder = state.directories.profile_logs_dir(&profile_path).await?; let mut logs = Vec::new(); if logs_folder.exists() { for entry in std::fs::read_dir(logs_folder)? { @@ -72,10 +75,15 @@ pub async fn get_logs_by_datetime( profile_uuid: uuid::Uuid, datetime_string: String, ) -> crate::Result { - let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.path + let profile_path = if let Some(p) = + crate::profile::get_by_uuid(profile_uuid, None).await? + { + p.name_as_path_id() } else { - return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + return Err(crate::ErrorKind::UnmanagedProfileError( + profile_uuid.to_string(), + ) + .into()); }; Ok(Logs { output: Some( @@ -87,11 +95,12 @@ pub async fn get_logs_by_datetime( #[tracing::instrument] pub async fn get_output_by_datetime( - profile_subpath: &Path, + profile_subpath: &ProfilePathId, datetime_string: &str, ) -> crate::Result { let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(profile_subpath).await; + let logs_folder = + state.directories.profile_logs_dir(profile_subpath).await?; Ok( read_to_string(logs_folder.join(datetime_string).join("stdout.log")) .await?, @@ -100,14 +109,19 @@ pub async fn get_output_by_datetime( #[tracing::instrument] pub async fn delete_logs(profile_uuid: uuid::Uuid) -> crate::Result<()> { - let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.path + let profile_path = if let Some(p) = + crate::profile::get_by_uuid(profile_uuid, None).await? + { + p.name_as_path_id() } else { - return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + return Err(crate::ErrorKind::UnmanagedProfileError( + profile_uuid.to_string(), + ) + .into()); }; let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(&profile_path).await; + let logs_folder = state.directories.profile_logs_dir(&profile_path).await?; for entry in std::fs::read_dir(logs_folder)? { let entry = entry?; let path = entry.path(); @@ -123,14 +137,19 @@ pub async fn delete_logs_by_datetime( profile_uuid: uuid::Uuid, datetime_string: &str, ) -> crate::Result<()> { - let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.path + let profile_path = if let Some(p) = + crate::profile::get_by_uuid(profile_uuid, None).await? + { + p.name_as_path_id() } else { - return Err(crate::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()).into()); + return Err(crate::ErrorKind::UnmanagedProfileError( + profile_uuid.to_string(), + ) + .into()); }; let state = State::get().await?; - let logs_folder = state.directories.profile_logs_dir(&profile_path).await; + let logs_folder = state.directories.profile_logs_dir(&profile_path).await?; std::fs::remove_dir_all(logs_folder.join(datetime_string))?; Ok(()) } diff --git a/theseus/src/api/mod.rs b/theseus/src/api/mod.rs index ce1d77d2c..6ec31cf83 100644 --- a/theseus/src/api/mod.rs +++ b/theseus/src/api/mod.rs @@ -29,6 +29,7 @@ pub mod prelude { profile::{self, Profile}, profile_create, settings, state::JavaGlobals, + state::{ProfilePathId, ProjectPathId}, util::jre::JavaVersion, State, }; diff --git a/theseus/src/api/pack/install.rs b/theseus/src/api/pack/install.rs index 097e2ea9c..47088190c 100644 --- a/theseus/src/api/pack/install.rs +++ b/theseus/src/api/pack/install.rs @@ -4,7 +4,7 @@ use crate::event::emit::{ }; use crate::event::LoadingBarType; use crate::pack::install_from::{EnvType, PackFile, PackFileHash}; -use crate::state::{LinkedData, ProfileInstallStage, SideType}; +use crate::state::{LinkedData, ProfileInstallStage, ProfilePathId, SideType}; use crate::util::fetch::{fetch_mirrors, write}; use crate::State; use async_zip::tokio::read::seek::ZipFileReader; @@ -20,8 +20,8 @@ use super::install_from::{ #[theseus_macros::debug_pin] pub async fn install_pack( location: CreatePackLocation, - profile: PathBuf, -) -> crate::Result { + profile_path: ProfilePathId, +) -> crate::Result { // Get file from description let description: CreatePackDescription = match location { CreatePackLocation::FromVersionId { @@ -31,12 +31,16 @@ pub async fn install_pack( icon_url, } => { generate_pack_from_version_id( - project_id, version_id, title, icon_url, profile, + project_id, + version_id, + title, + icon_url, + profile_path, ) .await? } CreatePackLocation::FromFile { path } => { - generate_pack_from_file(path, profile).await? + generate_pack_from_file(path, profile_path).await? } }; @@ -46,7 +50,7 @@ pub async fn install_pack( let project_id = description.project_id; let version_id = description.version_id; let existing_loading_bar = description.existing_loading_bar; - let profile = description.profile; + let profile_path = description.profile_path; let state = &State::get().await?; @@ -125,7 +129,7 @@ pub async fn install_pack( loader_version.cloned(), ) .await?; - crate::api::profile::edit(&profile, |prof| { + crate::api::profile::edit(&profile_path, |prof| { prof.metadata.name = override_title.clone().unwrap_or_else(|| pack.name.clone()); prof.install_stage = ProfileInstallStage::PackInstalling; @@ -142,12 +146,15 @@ pub async fn install_pack( }) .await?; - let profile = profile.clone(); + let profile_path = profile_path.clone(); let result = async { let loading_bar = init_or_edit_loading( existing_loading_bar, LoadingBarType::PackDownload { - profile_path: profile.clone(), + profile_path: profile_path + .get_full_path() + .await? + .clone(), pack_name: pack.name.clone(), icon, pack_id: project_id, @@ -169,7 +176,7 @@ pub async fn install_pack( num_files, None, |project| { - let profile = profile.clone(); + let profile_path = profile_path.clone(); async move { //TODO: Future update: prompt user for optional files in a modpack if let Some(env) = project.env { @@ -203,7 +210,10 @@ pub async fn install_pack( match path { Component::CurDir | Component::Normal(_) => { - let path = profile.join(project.path); + let path = profile_path + .get_full_path() + .await? + .join(project.path); write( &path, &file, @@ -265,7 +275,10 @@ pub async fn install_pack( if new_path.file_name().is_some() { write( - &profile.join(new_path), + &profile_path + .get_full_path() + .await? + .join(new_path), &content, &state.io_semaphore, ) @@ -285,7 +298,7 @@ pub async fn install_pack( } if let Some(profile_val) = - crate::api::profile::get(&profile, None).await? + crate::api::profile::get(&profile_path, None).await? { crate::launcher::install_minecraft( &profile_val, @@ -296,14 +309,14 @@ pub async fn install_pack( State::sync().await?; } - Ok::(profile.clone()) + Ok::(profile_path.clone()) } .await; match result { Ok(profile) => Ok(profile), Err(err) => { - let _ = crate::api::profile::remove(&profile).await; + let _ = crate::api::profile::remove(&profile_path).await; Err(err) } @@ -319,7 +332,7 @@ pub async fn install_pack( match result { Ok(profile) => Ok(profile), Err(err) => { - let _ = crate::api::profile::remove(&profile).await; + let _ = crate::api::profile::remove(&profile_path).await; Err(err) } diff --git a/theseus/src/api/pack/install_from.rs b/theseus/src/api/pack/install_from.rs index 720d9a4ec..f062747fd 100644 --- a/theseus/src/api/pack/install_from.rs +++ b/theseus/src/api/pack/install_from.rs @@ -2,7 +2,9 @@ use crate::config::MODRINTH_API_URL; use crate::data::ModLoader; use crate::event::emit::{emit_loading, init_loading}; use crate::event::{LoadingBarId, LoadingBarType}; -use crate::state::{LinkedData, ModrinthProject, ModrinthVersion, SideType}; +use crate::state::{ + LinkedData, ModrinthProject, ModrinthVersion, ProfilePathId, SideType, +}; use crate::util::fetch::{ fetch, fetch_advanced, fetch_json, write_cached_icon, }; @@ -71,7 +73,7 @@ pub enum PackDependency { Minecraft, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "camelCase", tag = "type")] pub enum CreatePackLocation { FromVersionId { @@ -98,6 +100,7 @@ pub struct CreatePackProfile { pub skip_install_profile: Option, } +#[derive(Debug)] pub struct CreatePackDescription { pub file: bytes::Bytes, pub icon: Option, @@ -105,7 +108,7 @@ pub struct CreatePackDescription { pub project_id: Option, pub version_id: Option, pub existing_loading_bar: Option, - pub profile: PathBuf, + pub profile_path: ProfilePathId, } pub fn get_profile_from_pack( @@ -158,13 +161,13 @@ pub async fn generate_pack_from_version_id( version_id: String, title: String, icon_url: Option, - profile: PathBuf, + profile_path: ProfilePathId, ) -> crate::Result { let state = State::get().await?; let loading_bar = init_loading( LoadingBarType::PackFileDownload { - profile_path: profile.clone(), + profile_path: profile_path.get_full_path().await?, pack_name: title, icon: icon_url, pack_version: version_id.clone(), @@ -232,7 +235,7 @@ pub async fn generate_pack_from_version_id( Some( write_cached_icon( filename, - &state.directories.caches_dir().await, + &state.directories.caches_dir(), icon_bytes, &state.io_semaphore, ) @@ -253,7 +256,7 @@ pub async fn generate_pack_from_version_id( project_id: Some(project_id), version_id: Some(version_id), existing_loading_bar: Some(loading_bar), - profile, + profile_path, }) } @@ -261,7 +264,7 @@ pub async fn generate_pack_from_version_id( #[theseus_macros::debug_pin] pub async fn generate_pack_from_file( path: PathBuf, - profile: PathBuf, + profile_path: ProfilePathId, ) -> crate::Result { let file = fs::read(&path).await?; Ok(CreatePackDescription { @@ -271,6 +274,6 @@ pub async fn generate_pack_from_file( project_id: None, version_id: None, existing_loading_bar: None, - profile, + profile_path, }) } diff --git a/theseus/src/api/process.rs b/theseus/src/api/process.rs index c0d6901f3..a57316895 100644 --- a/theseus/src/api/process.rs +++ b/theseus/src/api/process.rs @@ -1,9 +1,8 @@ //! Theseus process management interface -use std::path::{Path, PathBuf}; use uuid::Uuid; -use crate::state::MinecraftChild; +use crate::state::{MinecraftChild, ProfilePathId}; pub use crate::{ state::{ Hooks, JavaSettings, MemorySettings, Profile, Settings, WindowSize, @@ -45,7 +44,8 @@ pub async fn get_all_running_uuids() -> crate::Result> { // Gets the Profile paths of each *running* stored process in the state #[tracing::instrument] -pub async fn get_all_running_profile_paths() -> crate::Result> { +pub async fn get_all_running_profile_paths() -> crate::Result> +{ let state = State::get().await?; let children = state.children.read().await; children.running_profile_paths().await @@ -63,7 +63,7 @@ pub async fn get_all_running_profiles() -> crate::Result> { // Gets the UUID of each stored process in the state by profile path #[tracing::instrument] pub async fn get_uuids_by_profile_path( - profile_path: &Path, + profile_path: ProfilePathId, ) -> crate::Result> { let state = State::get().await?; let children = state.children.read().await; diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs index d6a81bb62..c8b3eebb1 100644 --- a/theseus/src/api/profile.rs +++ b/theseus/src/api/profile.rs @@ -7,7 +7,7 @@ use crate::pack::install_from::{ EnvType, PackDependency, PackFile, PackFileHash, PackFormat, }; use crate::prelude::JavaVersion; -use crate::state::ProjectMetadata; +use crate::state::{ProfilePathId, ProjectMetadata, ProjectPathId}; use crate::{ auth::{self, refresh}, @@ -35,14 +35,14 @@ use tokio::{ /// Remove a profile #[tracing::instrument] -pub async fn remove(path: &Path) -> crate::Result<()> { +pub async fn remove(path: &ProfilePathId) -> crate::Result<()> { let state = State::get().await?; let mut profiles = state.profiles.write().await; if let Some(profile) = profiles.remove(path).await? { emit_profile( profile.uuid, - profile.path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Removed, ) @@ -52,10 +52,10 @@ pub async fn remove(path: &Path) -> crate::Result<()> { Ok(()) } -/// Get a profile by path, +/// Get a profile by relative path (or, name) #[tracing::instrument] pub async fn get( - path: &Path, + path: &ProfilePathId, clear_projects: Option, ) -> crate::Result> { let state = State::get().await?; @@ -94,7 +94,7 @@ pub async fn get_by_uuid( /// Edit a profile using a given asynchronous closure pub async fn edit( - path: &Path, + path: &ProfilePathId, action: impl Fn(&mut Profile) -> Fut, ) -> crate::Result<()> where @@ -109,7 +109,7 @@ where emit_profile( profile.uuid, - profile.path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -117,16 +117,14 @@ where Ok(()) } - None => Err(crate::ErrorKind::UnmanagedProfileError( - path.display().to_string(), - ) - .as_error()), + None => Err(crate::ErrorKind::UnmanagedProfileError(path.to_string()) + .as_error()), } } /// Edits a profile's icon pub async fn edit_icon( - path: &Path, + path: &ProfilePathId, icon_path: Option<&Path>, ) -> crate::Result<()> { let state = State::get().await?; @@ -140,7 +138,7 @@ pub async fn edit_icon( Some(ref mut profile) => { profile .set_icon( - &state.directories.caches_dir().await, + &state.directories.caches_dir(), &state.io_semaphore, bytes::Bytes::from(bytes), &icon.to_string_lossy(), @@ -149,7 +147,7 @@ pub async fn edit_icon( emit_profile( profile.uuid, - profile.path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -158,10 +156,10 @@ pub async fn edit_icon( Ok(()) } - None => Err(crate::ErrorKind::UnmanagedProfileError( - path.display().to_string(), - ) - .as_error()), + None => { + Err(crate::ErrorKind::UnmanagedProfileError(path.to_string()) + .as_error()) + } } } else { edit(path, |profile| { @@ -179,7 +177,7 @@ pub async fn edit_icon( // Generally this would be used for profile_create, to get the optimal JRE key // this can be overwritten by the user a profile-by-profile basis pub async fn get_optimal_jre_key( - path: &Path, + path: &ProfilePathId, ) -> crate::Result> { let state = State::get().await?; @@ -217,10 +215,8 @@ pub async fn get_optimal_jre_key( Ok(version) } else { - Err( - crate::ErrorKind::UnmanagedProfileError(path.display().to_string()) - .as_error(), - ) + Err(crate::ErrorKind::UnmanagedProfileError(path.to_string()) + .as_error()) } } @@ -228,7 +224,7 @@ pub async fn get_optimal_jre_key( #[tracing::instrument] pub async fn list( clear_projects: Option, -) -> crate::Result> { +) -> crate::Result> { let state = State::get().await?; let profiles = state.profiles.read().await; Ok(profiles @@ -247,14 +243,12 @@ pub async fn list( /// Installs/Repairs a profile #[tracing::instrument] -pub async fn install(path: &Path) -> crate::Result<()> { +pub async fn install(path: &ProfilePathId) -> crate::Result<()> { if let Some(profile) = get(path, None).await? { crate::launcher::install_minecraft(&profile, None).await?; } else { - return Err(crate::ErrorKind::UnmanagedProfileError( - path.display().to_string(), - ) - .as_error()); + return Err(crate::ErrorKind::UnmanagedProfileError(path.to_string()) + .as_error()); } State::sync().await?; Ok(()) @@ -263,12 +257,12 @@ pub async fn install(path: &Path) -> crate::Result<()> { #[tracing::instrument] #[theseus_macros::debug_pin] pub async fn update_all( - profile_path: &Path, -) -> crate::Result> { + profile_path: &ProfilePathId, +) -> crate::Result> { if let Some(profile) = get(profile_path, None).await? { let loading_bar = init_loading( LoadingBarType::ProfileUpdate { - profile_path: profile.path.clone(), + profile_path: profile.get_profile_full_path().await?, profile_name: profile.metadata.name.clone(), }, 100.0, @@ -276,6 +270,7 @@ pub async fn update_all( ) .await?; + let profile_base_path = profile.get_profile_full_path().await?; let keys = profile .projects .into_iter() @@ -296,7 +291,7 @@ pub async fn update_all( use futures::StreamExt; loading_try_for_each_concurrent( - futures::stream::iter(keys).map(Ok::), + futures::stream::iter(keys).map(Ok::), None, Some(&loading_bar), 100.0, @@ -321,7 +316,7 @@ pub async fn update_all( emit_profile( profile.uuid, - profile.path, + profile_base_path, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -330,10 +325,10 @@ pub async fn update_all( Ok(Arc::try_unwrap(map).unwrap().into_inner()) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile_path.display().to_string(), + Err( + crate::ErrorKind::UnmanagedProfileError(profile_path.to_string()) + .as_error(), ) - .as_error()) } } @@ -342,10 +337,10 @@ pub async fn update_all( #[tracing::instrument] #[theseus_macros::debug_pin] pub async fn update_project( - profile_path: &Path, - project_path: &Path, + profile_path: &ProfilePathId, + project_path: &ProjectPathId, skip_send_event: Option, -) -> crate::Result { +) -> crate::Result { if let Some(profile) = get(profile_path, None).await? { if let Some(project) = profile.projects.get(project_path) { if let ProjectMetadata::Modrinth { @@ -357,13 +352,13 @@ pub async fn update_project( .add_project_version(update_version.id.clone()) .await?; - if path != project_path { + if path != project_path.clone() { profile.remove_project(project_path, Some(true)).await?; } let state = State::get().await?; let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(project_path) { + if let Some(profile) = profiles.0.get_mut(profile_path) { let value = profile.projects.remove(project_path); if let Some(mut project) = value { if let ProjectMetadata::Modrinth { @@ -380,7 +375,7 @@ pub async fn update_project( if !skip_send_event.unwrap_or(false) { emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -397,26 +392,26 @@ pub async fn update_project( ) .as_error()) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile_path.display().to_string(), + Err( + crate::ErrorKind::UnmanagedProfileError(profile_path.to_string()) + .as_error(), ) - .as_error()) } } /// Add a project from a version -/// Returns the relative path to the project +/// Returns the relative path to the project as a ProjectPathId #[tracing::instrument] pub async fn add_project_from_version( - profile_path: &Path, + profile_path: &ProfilePathId, version_id: String, -) -> crate::Result { +) -> crate::Result { if let Some(profile) = get(profile_path, None).await? { let (path, _) = profile.add_project_version(version_id).await?; emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -425,21 +420,21 @@ pub async fn add_project_from_version( Ok(path) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile_path.display().to_string(), + Err( + crate::ErrorKind::UnmanagedProfileError(profile_path.to_string()) + .as_error(), ) - .as_error()) } } /// Add a project from an FS path -/// Uses and returns the relative path to the project +/// Uses and returns the relative path to the project as a ProjectPathId #[tracing::instrument] pub async fn add_project_from_path( - profile_path: &Path, + profile_path: &ProfilePathId, path: &Path, project_type: Option, -) -> crate::Result { +) -> crate::Result { if let Some(profile) = get(profile_path, None).await? { let file = fs::read(path).await?; let file_name = path @@ -458,7 +453,7 @@ pub async fn add_project_from_path( emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -467,10 +462,10 @@ pub async fn add_project_from_path( Ok(path) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile_path.display().to_string(), + Err( + crate::ErrorKind::UnmanagedProfileError(profile_path.to_string()) + .as_error(), ) - .as_error()) } } @@ -479,15 +474,15 @@ pub async fn add_project_from_path( /// returns the new state, relative to the profile #[tracing::instrument] pub async fn toggle_disable_project( - profile: &Path, - project: &Path, -) -> crate::Result { + profile: &ProfilePathId, + project: &ProjectPathId, +) -> crate::Result { if let Some(profile) = get(profile, None).await? { let res = profile.toggle_disable_project(project).await?; emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -496,10 +491,8 @@ pub async fn toggle_disable_project( Ok(res) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile.display().to_string(), - ) - .as_error()) + Err(crate::ErrorKind::UnmanagedProfileError(profile.to_string()) + .as_error()) } } @@ -507,15 +500,15 @@ pub async fn toggle_disable_project( /// Uses and returns the relative path to the project #[tracing::instrument] pub async fn remove_project( - profile: &Path, - project: &Path, + profile: &ProfilePathId, + project: &ProjectPathId, ) -> crate::Result<()> { if let Some(profile) = get(profile, None).await? { profile.remove_project(project, None).await?; emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Edited, ) @@ -524,10 +517,8 @@ pub async fn remove_project( Ok(()) } else { - Err(crate::ErrorKind::UnmanagedProfileError( - profile.display().to_string(), - ) - .as_error()) + Err(crate::ErrorKind::UnmanagedProfileError(profile.to_string()) + .as_error()) } } @@ -536,7 +527,7 @@ pub async fn remove_project( #[tracing::instrument(skip_all)] #[theseus_macros::debug_pin] pub async fn export_mrpack( - profile_path: &Path, + profile_path: &ProfilePathId, export_path: PathBuf, included_overrides: Vec, // which folders to include in the overrides version_id: Option, @@ -547,18 +538,18 @@ pub async fn export_mrpack( let profile = get(profile_path, None).await?.ok_or_else(|| { crate::ErrorKind::OtherError(format!( "Tried to export a nonexistent or unloaded profile at path {}!", - profile_path.display() + profile_path )) })?; - let profile_base_path = &profile.path; + let profile_base_path = &profile.get_profile_full_path().await?; let mut file = File::create(export_path).await?; let mut writer = ZipFileWriter::new(&mut file); // Create mrpack json configuration file let version_id = version_id.unwrap_or("1.0.0".to_string()); - let packfile = create_mrpack_json(&profile, version_id)?; + let packfile = create_mrpack_json(&profile, version_id).await?; let modrinth_path_list = get_modrinth_pack_list(&packfile); // Build vec of all files in the folder @@ -568,7 +559,7 @@ pub async fn export_mrpack( // Initialize loading bar let loading_bar = init_loading( LoadingBarType::ZipExtract { - profile_path: profile.path.to_path_buf(), + profile_path: profile.get_profile_full_path().await?, profile_name: profile.metadata.name.clone(), }, path_list.len() as f64, @@ -653,21 +644,24 @@ pub async fn export_mrpack( // => [folder1, folder2] #[tracing::instrument] pub async fn get_potential_override_folders( - profile_path: PathBuf, + profile_path: ProfilePathId, ) -> crate::Result> { // First, get a dummy mrpack json for the files within let profile: Profile = get(&profile_path, None).await?.ok_or_else(|| { crate::ErrorKind::OtherError(format!( "Tried to export a nonexistent or unloaded profile at path {}!", - profile_path.display() + profile_path )) })?; - let mrpack = create_mrpack_json(&profile, "0".to_string())?; + // dummy mrpack to get pack list + let mrpack = create_mrpack_json(&profile, "0".to_string()).await?; let mrpack_files = get_modrinth_pack_list(&mrpack); let mut path_list: Vec = Vec::new(); - let mut read_dir = fs::read_dir(&profile_path).await?; + + let profile_base_dir = profile.get_profile_full_path().await?; + let mut read_dir = fs::read_dir(&profile_base_dir).await?; while let Some(entry) = read_dir.next_entry().await? { let path: PathBuf = entry.path(); if path.is_dir() { @@ -675,14 +669,14 @@ pub async fn get_potential_override_folders( let mut read_dir = fs::read_dir(&path).await?; while let Some(entry) = read_dir.next_entry().await? { let path: PathBuf = entry.path(); - let name = path.strip_prefix(&profile_path)?.to_path_buf(); + let name = path.strip_prefix(&profile_base_dir)?.to_path_buf(); if !mrpack_files.contains(&name.to_string_lossy().to_string()) { path_list.push(name); } } } else { // One layer of files/folders if its a file - let name = path.strip_prefix(&profile_path)?.to_path_buf(); + let name = path.strip_prefix(&profile_base_dir)?.to_path_buf(); if !mrpack_files.contains(&name.to_string_lossy().to_string()) { path_list.push(name); } @@ -694,7 +688,9 @@ pub async fn get_potential_override_folders( /// Run Minecraft using a profile and the default credentials, logged in credentials, /// failing with an error if no credentials are available #[tracing::instrument] -pub async fn run(path: &Path) -> crate::Result>> { +pub async fn run( + path: &ProfilePathId, +) -> crate::Result>> { let state = State::get().await?; // Get default account and refresh credentials (preferred way to log in) @@ -719,7 +715,7 @@ pub async fn run(path: &Path) -> crate::Result>> { #[tracing::instrument(skip(credentials))] #[theseus_macros::debug_pin] pub async fn run_credentials( - path: &Path, + path: &ProfilePathId, credentials: &auth::Credentials, ) -> crate::Result>> { let state = State::get().await?; @@ -727,7 +723,7 @@ pub async fn run_credentials( let profile = get(path, None).await?.ok_or_else(|| { crate::ErrorKind::OtherError(format!( "Tried to run a nonexistent or unloaded profile at path {}!", - path.display() + path )) })?; @@ -739,7 +735,7 @@ pub async fn run_credentials( if let Some(command) = cmd.next() { let result = Command::new(command) .args(&cmd.collect::>()) - .current_dir(path) + .current_dir(path.get_full_path().await?) .spawn()? .wait() .await?; @@ -782,7 +778,9 @@ pub async fn run_credentials( let mut cmd = hook.split(' '); if let Some(command) = cmd.next() { let mut command = Command::new(command); - command.args(&cmd.collect::>()).current_dir(path); + command + .args(&cmd.collect::>()) + .current_dir(path.get_full_path().await?); Some(command) } else { None @@ -821,7 +819,7 @@ fn get_modrinth_pack_list(packfile: &PackFormat) -> Vec { /// Creates a json configuration for a .mrpack zipped file // Version ID of uploaded version (ie 1.1.5), not the unique identifying ID of the version (nvrqJg44) #[tracing::instrument(skip_all)] -pub fn create_mrpack_json( +pub async fn create_mrpack_json( profile: &Profile, version_id: String, ) -> crate::Result { @@ -860,11 +858,15 @@ pub fn create_mrpack_json( .map(|(k, v)| (k, sanitize_loader_version_string(&v).to_string())) .collect::>(); + let profile_base_path = profile.get_profile_full_path().await?; let files: Result, crate::ErrorKind> = profile .projects .iter() .filter_map(|(mod_path, project)| { - let path = mod_path.to_string_lossy().to_string(); + let path: String = profile_base_path + .join(mod_path.0.clone()) + .to_string_lossy() + .to_string(); // Only Modrinth projects have a modrinth metadata field for the modrinth.json Some(Ok(match project.metadata { diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index 5ddc1fbfd..60304e4fe 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -1,5 +1,5 @@ //! Theseus profile management interface -use crate::state::LinkedData; +use crate::state::{LinkedData, ProfilePathId}; use crate::{ event::{emit::emit_profile, ProfilePayloadType}, prelude::ModLoader, @@ -18,8 +18,8 @@ use tokio_stream::wrappers::ReadDirStream; use tracing::{info, trace}; use uuid::Uuid; -// Creates a profile at the given filepath and adds it to the in-memory state -// Returns filepath at which it can be accessed in the State +// Creates a profile of a given name and adds it to the in-memory state +// Returns relative filepath as ProfilePathId which can be used to access it in the State #[tracing::instrument] #[theseus_macros::debug_pin] #[allow(clippy::too_many_arguments)] @@ -32,7 +32,7 @@ pub async fn profile_create( icon_url: Option, // the URL icon for a profile (ONLY USED FOR TEMPORARY PROFILES) linked_data: Option, // the linked project ID (mainly for modpacks)- used for updating skip_install_profile: Option, -) -> crate::Result { +) -> crate::Result { trace!("Creating new profile. {}", name); let state = State::get().await?; let uuid = Uuid::new_v4(); @@ -74,17 +74,15 @@ pub async fn profile_create( None }; - // Fully canonicalize now that its created for storing purposes - let path = canonicalize(&path)?; - let mut profile = - Profile::new(uuid, name, game_version, path.clone()).await?; + let mut profile = Profile::new(uuid, name, game_version).await?; let result = async { if let Some(ref icon) = icon { - let caches_dir = state.directories.caches_dir().await; - let bytes = tokio::fs::read(caches_dir.join(icon)).await?; + let bytes = + tokio::fs::read(state.directories.caches_dir().join(icon)) + .await?; profile .set_icon( - &state.directories.caches_dir().await, + &state.directories.caches_dir(), &state.io_semaphore, bytes::Bytes::from(bytes), &icon.to_string_lossy(), @@ -102,7 +100,7 @@ pub async fn profile_create( emit_profile( uuid, - path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Created, ) @@ -118,14 +116,15 @@ pub async fn profile_create( } State::sync().await?; - Ok(path) + Ok(profile.name_as_path_id()) } .await; match result { Ok(profile) => Ok(profile), Err(err) => { - let _ = crate::api::profile::remove(&profile.path).await; + let _ = + crate::api::profile::remove(&profile.name_as_path_id()).await; Err(err) } diff --git a/theseus/src/api/settings.rs b/theseus/src/api/settings.rs index 2d053e4c8..b5149eca9 100644 --- a/theseus/src/api/settings.rs +++ b/theseus/src/api/settings.rs @@ -4,7 +4,10 @@ use std::path::PathBuf; use tokio::{fs, sync::RwLock}; -use crate::{prelude::DirectoryInfo, state::{self, Profiles}}; +use crate::{ + prelude::DirectoryInfo, + state::{self, Profiles}, +}; pub use crate::{ state::{ Hooks, JavaSettings, MemorySettings, Profile, Settings, WindowSize, @@ -25,7 +28,9 @@ pub async fn get() -> crate::Result { pub async fn set(settings: Settings) -> crate::Result<()> { let state = State::get().await?; - if settings.loaded_config_dir != state.settings.read().await.loaded_config_dir { + if settings.loaded_config_dir + != state.settings.read().await.loaded_config_dir + { return Err(crate::ErrorKind::OtherError( "Cannot change config directory as setting".to_string(), ) @@ -56,21 +61,21 @@ pub async fn set(settings: Settings) -> crate::Result<()> { Ok(()) } -/// Sets the new config dir, the location of all Theseus data except for the settings.json itself +/// Sets the new config dir, the location of all Theseus data except for the settings.json and caches /// Takes control of the entire state and blocks until completion pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { - - tracing::info!("Setting new config dir: {}", new_config_dir.display()); if !new_config_dir.is_dir() { - return Err(crate::ErrorKind::FSError( - format!("New config dir is not a folder: {}", new_config_dir.display()), - ) + return Err(crate::ErrorKind::FSError(format!( + "New config dir is not a folder: {}", + new_config_dir.display() + )) .as_error()); } // Take control of the state let mut state_write = State::get_write().await?; - let old_config_dir = state_write.directories.config_dir.read().await.clone(); + let old_config_dir = + state_write.directories.config_dir.read().await.clone(); // Set load config dir setting let settings = { @@ -78,45 +83,61 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { settings.loaded_config_dir = Some(new_config_dir.clone()); // Some java paths are hardcoded to within our config dir, so we need to update them - for key in settings.java_globals.keys() { + for key in settings.java_globals.keys() { if let Some(java) = settings.java_globals.get_mut(&key) { // If the path is within the old config dir path, update it to the new config dir - if let Ok(relative_path) = PathBuf::from(java.path.clone()).strip_prefix(&old_config_dir) { - java.path = new_config_dir.join(relative_path).to_string_lossy().to_string(); + if let Ok(relative_path) = PathBuf::from(java.path.clone()) + .strip_prefix(&old_config_dir) + { + java.path = new_config_dir + .join(relative_path) + .to_string_lossy() + .to_string(); } } } - settings.sync(&state_write.directories.settings_file()).await?; + settings + .sync(&state_write.directories.settings_file()) + .await?; settings.clone() }; - // Set new state information + // Set new state information state_write.directories = DirectoryInfo::init(&settings)?; // Move all files over from state_write.directories.config_dir to new_config_dir - let mut entries = fs::read_dir(old_config_dir).await?; - while let Some(entry) = entries.next_entry().await? { + while let Some(entry) = entries.next_entry().await? { let entry_path = entry.path(); - if let Some(file_name) = entry_path.file_name() { + if let Some(file_name) = entry_path.file_name() { // Ignore settings.json if file_name == "settings.json" { continue; } + // Ignore caches folder + if file_name == "caches" { + continue; + } + let new_path = new_config_dir.join(file_name); - fs::rename(entry_path, new_path).await?; + fs::rename(entry_path, new_path).await?; } } // Reset file watcher - let mut file_watcher = state::init_watcher().await?; + let mut file_watcher = state::init_watcher().await?; // Reset profiles (for filepaths, file watcher, etc) - state_write.profiles = RwLock::new(Profiles::init(&state_write.directories, &mut file_watcher).await?); - state_write.file_watcher = RwLock::new(file_watcher); + state_write.profiles = RwLock::new( + Profiles::init(&state_write.directories, &mut file_watcher).await?, + ); + state_write.file_watcher = RwLock::new(file_watcher); // TODO: need to be able to safely error out of this function, reverting the changes + tracing::info!( + "Successfully switched config folder to: {}", + new_config_dir.display() + ); Ok(()) } - diff --git a/theseus/src/error.rs b/theseus/src/error.rs index 16056524a..8f6c6739f 100644 --- a/theseus/src/error.rs +++ b/theseus/src/error.rs @@ -61,7 +61,7 @@ pub enum ErrorKind { #[error("Error acquiring semaphore: {0}")] AcquireError(#[from] tokio::sync::AcquireError), - #[error("Profile {0} is not managed by Theseus!")] + #[error("Profile {0} is not managed by the app!")] UnmanagedProfileError(String), #[error("Could not create profile: {0}")] diff --git a/theseus/src/launcher/download.rs b/theseus/src/launcher/download.rs index 5a93c416c..c7d5dcbe2 100644 --- a/theseus/src/launcher/download.rs +++ b/theseus/src/launcher/download.rs @@ -151,7 +151,8 @@ pub async fn download_assets_index( let path = st .directories .assets_index_dir() - .await.join(format!("{}.json", &version.asset_index.id)); + .await + .join(format!("{}.json", &version.asset_index.id)); let res = if path.exists() { fs::read(path) @@ -316,7 +317,7 @@ pub async fn download_libraries( let data = fetch(&native.url, Some(&native.sha1), &st.fetch_semaphore).await?; let reader = std::io::Cursor::new(&data); if let Ok(mut archive) = zip::ZipArchive::new(reader) { - match archive.extract(&st.directories.version_natives_dir(version).await) { + match archive.extract(st.directories.version_natives_dir(version).await) { Ok(_) => tracing::info!("Fetched native {}", &library.name), Err(err) => tracing::error!("Failed extracting native {}. err: {}", &library.name, err) } diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index bc22285e8..07578ae36 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -109,14 +109,14 @@ pub async fn install_minecraft( LoadingBarType::MinecraftDownload { // If we are downloading minecraft for a profile, provide its name and uuid profile_name: profile.metadata.name.clone(), - profile_path: profile.path.clone(), + profile_path: profile.get_profile_full_path().await?, }, 100.0, "Downloading Minecraft", ) .await?; - crate::api::profile::edit(&profile.path, |prof| { + crate::api::profile::edit(&profile.name_as_path_id(), |prof| { prof.install_stage = ProfileInstallStage::Installing; async { Ok(()) } @@ -125,7 +125,7 @@ pub async fn install_minecraft( State::sync().await?; let state = State::get().await?; - let instance_path = &canonicalize(&profile.path)?; + let instance_path = &canonicalize(&profile.get_profile_full_path().await?)?; let metadata = state.metadata.read().await; let version = metadata @@ -273,7 +273,7 @@ pub async fn install_minecraft( } } - crate::api::profile::edit(&profile.path, |prof| { + crate::api::profile::edit(&profile.name_as_path_id(), |prof| { prof.install_stage = ProfileInstallStage::Installed; async { Ok(()) } @@ -314,7 +314,7 @@ pub async fn launch_minecraft( let state = State::get().await?; let metadata = state.metadata.read().await; - let instance_path = state.directories.profiles_dir().await.join(&profile.path); + let instance_path = profile.get_profile_full_path().await?; let instance_path = &canonicalize(instance_path)?; let version = metadata @@ -371,11 +371,11 @@ pub async fn launch_minecraft( // Check if profile has a running profile, and reject running the command if it does // Done late so a quick double call doesn't launch two instances let existing_processes = - process::get_uuids_by_profile_path(instance_path).await?; + process::get_uuids_by_profile_path(profile.name_as_path_id()).await?; if let Some(uuid) = existing_processes.first() { return Err(crate::ErrorKind::LauncherError(format!( "Profile {} is already running at UUID: {uuid}", - instance_path.display() + profile.name_as_path_id() )) .as_error()); } @@ -436,15 +436,15 @@ pub async fn launch_minecraft( let logs_dir = { let st = State::get().await?; st.directories - .profile_logs_dir(&profile.path) - .await + .profile_logs_dir(&profile.name_as_path_id()) + .await? .join(&datetime_string) }; fs::create_dir_all(&logs_dir)?; let stdout_log_path = logs_dir.join("stdout.log"); - crate::api::profile::edit(&profile.path, |prof| { + crate::api::profile::edit(&profile.name_as_path_id(), |prof| { prof.metadata.last_played = Some(Utc::now()); async { Ok(()) } @@ -497,7 +497,7 @@ pub async fn launch_minecraft( state_children .insert_process( Uuid::new_v4(), - profile.path.clone(), + profile.name_as_path_id(), stdout_log_path, command, post_exit_hook, diff --git a/theseus/src/state/children.rs b/theseus/src/state/children.rs index 2634980d8..90809c876 100644 --- a/theseus/src/state/children.rs +++ b/theseus/src/state/children.rs @@ -1,4 +1,4 @@ -use super::Profile; +use super::{Profile, ProfilePathId}; use std::path::{Path, PathBuf}; use std::process::ExitStatus; use std::{collections::HashMap, sync::Arc}; @@ -24,7 +24,7 @@ pub struct Children(HashMap>>); #[derive(Debug)] pub struct MinecraftChild { pub uuid: Uuid, - pub profile_relative_path: PathBuf, + pub profile_relative_path: ProfilePathId, pub manager: Option>>, // None when future has completed and been handled pub current_child: Arc>, pub output: SharedOutput, @@ -39,12 +39,17 @@ impl Children { // The threads for stdout and stderr are spawned here // Unlike a Hashmap's 'insert', this directly returns the reference to the MinecraftChild rather than any previously stored MinecraftChild that may exist - #[tracing::instrument(skip(self, mc_command, post_command, censor_strings))] + #[tracing::instrument(skip( + self, + mc_command, + post_command, + censor_strings + ))] #[theseus_macros::debug_pin] pub async fn insert_process( &mut self, uuid: Uuid, - profile_relative_path: PathBuf, + profile_relative_path: ProfilePathId, log_path: PathBuf, mut mc_command: Command, post_command: Option, // Command to run after minecraft. @@ -56,7 +61,7 @@ impl Children { // Create std watcher threads for stdout and stderr let shared_output = SharedOutput::build(&log_path, censor_strings).await?; - if let Some(child_stdout) = child.stdout.take() { + if let Some(child_stdout) = child.stdout.take() { let stdout_clone = shared_output.clone(); tokio::spawn(async move { if let Err(e) = stdout_clone.read_stdout(child_stdout).await { @@ -235,7 +240,7 @@ impl Children { // Gets all PID keys of running children with a given profile path pub async fn running_keys_with_profile( &self, - profile_path: &Path, + profile_path: ProfilePathId, ) -> crate::Result> { let running_keys = self.running_keys().await?; let mut keys = Vec::new(); @@ -252,7 +257,9 @@ impl Children { } // Gets all profiles of running children - pub async fn running_profile_paths(&self) -> crate::Result> { + pub async fn running_profile_paths( + &self, + ) -> crate::Result> { let mut profiles = Vec::new(); for key in self.keys() { if let Some(child) = self.get(&key) { diff --git a/theseus/src/state/dirs.rs b/theseus/src/state/dirs.rs index fd30cf977..2b61634c0 100644 --- a/theseus/src/state/dirs.rs +++ b/theseus/src/state/dirs.rs @@ -1,10 +1,10 @@ //! Theseus directory information use std::fs; -use std::path::{PathBuf, Path}; +use std::path::PathBuf; use tokio::sync::RwLock; -use super::Settings; +use super::{ProfilePathId, Settings}; #[derive(Debug)] pub struct DirectoryInfo { @@ -14,7 +14,6 @@ pub struct DirectoryInfo { } impl DirectoryInfo { - // Get the settings directory // init() is not needed for this function pub fn get_initial_settings_dir() -> Option { @@ -24,15 +23,17 @@ impl DirectoryInfo { #[inline] pub fn get_initial_settings_file() -> crate::Result { - let settings_dir = Self::get_initial_settings_dir().ok_or(crate::ErrorKind::FSError( - "Could not find valid config dir".to_string(), - ))?; + let settings_dir = Self::get_initial_settings_dir().ok_or( + crate::ErrorKind::FSError( + "Could not find valid config dir".to_string(), + ), + )?; Ok(settings_dir.join("settings.json")) } /// Get all paths needed for Theseus to operate properly #[tracing::instrument] - pub fn init(settings : &Settings) -> crate::Result { + pub fn init(settings: &Settings) -> crate::Result { // Working directory let working_dir = std::env::current_dir().map_err(|err| { crate::ErrorKind::FSError(format!( @@ -40,9 +41,11 @@ impl DirectoryInfo { )) })?; - let settings_dir = Self::get_initial_settings_dir() .ok_or(crate::ErrorKind::FSError( - "Could not find valid settings dir".to_string(), - ))?; + let settings_dir = Self::get_initial_settings_dir().ok_or( + crate::ErrorKind::FSError( + "Could not find valid settings dir".to_string(), + ), + )?; fs::create_dir_all(&settings_dir).map_err(|err| { crate::ErrorKind::FSError(format!( @@ -52,9 +55,11 @@ impl DirectoryInfo { // config directory (for instances, etc.) // by default this is the same as the settings directory - let config_dir = settings.loaded_config_dir.clone().ok_or(crate::ErrorKind::FSError( - "Could not find valid config dir".to_string(), - ))?; + let config_dir = settings.loaded_config_dir.clone().ok_or( + crate::ErrorKind::FSError( + "Could not find valid config dir".to_string(), + ), + )?; Ok(Self { settings_dir, @@ -150,10 +155,11 @@ impl DirectoryInfo { /// Gets the logs dir for a given profile #[inline] - pub async fn profile_logs_dir(&self, profile_relative_path: &Path) -> PathBuf { - self.profiles_dir().await - .join(profile_relative_path) - .join("modrinth_logs") + pub async fn profile_logs_dir( + &self, + profile_id: &ProfilePathId, + ) -> crate::Result { + Ok(profile_id.get_full_path().await?.join("modrinth_logs")) } #[inline] @@ -175,13 +181,13 @@ impl DirectoryInfo { /// Get the cache directory for Theseus #[inline] - pub async fn caches_dir(&self) -> PathBuf { - self.config_dir.read().await.join("caches") + pub fn caches_dir(&self) -> PathBuf { + self.settings_dir.join("caches") } #[inline] pub async fn caches_meta_dir(&self) -> PathBuf { - self.config_dir.read().await.join("caches").join("metadata") + self.caches_dir().join("metadata") } /// Get path from environment variable diff --git a/theseus/src/state/metadata.rs b/theseus/src/state/metadata.rs index b32a32519..a750a15ab 100644 --- a/theseus/src/state/metadata.rs +++ b/theseus/src/state/metadata.rs @@ -106,8 +106,11 @@ impl Metadata { let metadata_fetch = Metadata::fetch().await?; let state = State::get().await?; - let metadata_path = - state.directories.caches_meta_dir().await.join("metadata.json"); + let metadata_path = state + .directories + .caches_meta_dir() + .await + .join("metadata.json"); write( &metadata_path, diff --git a/theseus/src/state/mod.rs b/theseus/src/state/mod.rs index 0b192a6bf..0f696004b 100644 --- a/theseus/src/state/mod.rs +++ b/theseus/src/state/mod.rs @@ -50,7 +50,7 @@ pub use self::safe_processes::*; // Global state // RwLock on state only has concurrent reads, except for config dir change -static LAUNCHER_STATE:OnceCell> = OnceCell::const_new(); +static LAUNCHER_STATE: OnceCell> = OnceCell::const_new(); pub struct State { /// Information on the location of files used in the launcher pub directories: DirectoryInfo, @@ -87,97 +87,99 @@ pub struct State { impl State { /// Get the current launcher state, initializing it if needed - pub async fn get() -> crate::Result>> { - Ok(Arc::new(LAUNCHER_STATE - .get_or_try_init(Self::initialize_state) - .await?.read().await)) + pub async fn get( + ) -> crate::Result>> { + Ok(Arc::new( + LAUNCHER_STATE + .get_or_try_init(Self::initialize_state) + .await? + .read() + .await, + )) } /// Get the current launcher state, initializing it if needed /// Takes writing control of the state, blocking all other uses of it /// Only used for state change such as changing the config directory - pub async fn get_write() -> crate::Result> { + pub async fn get_write( + ) -> crate::Result> { Ok(LAUNCHER_STATE .get_or_try_init(Self::initialize_state) - .await?.write().await) + .await? + .write() + .await) } #[tracing::instrument] #[theseus_macros::debug_pin] async fn initialize_state() -> crate::Result> { - let loading_bar = init_loading_unsafe( - LoadingBarType::StateInit, - 100.0, - "Initializing launcher", - ) - .await?; - - // Settings - let settings = - Settings::init(&DirectoryInfo::get_initial_settings_file()?).await?; - - let directories = DirectoryInfo::init(&settings)?; - - emit_loading(&loading_bar, 10.0, None).await?; - - let mut file_watcher = init_watcher().await?; - - let fetch_semaphore = FetchSemaphore(RwLock::new( - Semaphore::new(settings.max_concurrent_downloads), - )); - let io_semaphore = IoSemaphore(RwLock::new( - Semaphore::new(settings.max_concurrent_writes), - )); - emit_loading(&loading_bar, 10.0, None).await?; - - let metadata_fut = - Metadata::init(&directories, &io_semaphore); - let profiles_fut = - Profiles::init(&directories, &mut file_watcher); - let tags_fut = Tags::init( - &directories, - &io_semaphore, - &fetch_semaphore, - ); - let users_fut = Users::init(&directories, &io_semaphore); - // Launcher data - let (metadata, profiles, tags, users) = loading_join! { - Some(&loading_bar), 70.0, Some("Loading metadata"); - metadata_fut, - profiles_fut, - tags_fut, - users_fut, - }?; - - let children = Children::new(); - let auth_flow = AuthTask::new(); - let safety_processes = SafeProcesses::new(); - emit_loading(&loading_bar, 10.0, None).await?; - - Ok::, crate::Error>(RwLock::new(Self { - directories, - fetch_semaphore, - fetch_semaphore_max: RwLock::new( - settings.max_concurrent_downloads as u32, - ), - io_semaphore, - io_semaphore_max: RwLock::new( - settings.max_concurrent_writes as u32, - ), - metadata: RwLock::new(metadata), - settings: RwLock::new(settings), - profiles: RwLock::new(profiles), - users: RwLock::new(users), - children: RwLock::new(children), - auth_flow: RwLock::new(auth_flow), - tags: RwLock::new(tags), - safety_processes: RwLock::new(safety_processes), - file_watcher: RwLock::new(file_watcher), - })) - + let loading_bar = init_loading_unsafe( + LoadingBarType::StateInit, + 100.0, + "Initializing launcher", + ) + .await?; + + // Settings + let settings = + Settings::init(&DirectoryInfo::get_initial_settings_file()?) + .await?; + + let directories = DirectoryInfo::init(&settings)?; + + emit_loading(&loading_bar, 10.0, None).await?; + + let mut file_watcher = init_watcher().await?; + + let fetch_semaphore = FetchSemaphore(RwLock::new(Semaphore::new( + settings.max_concurrent_downloads, + ))); + let io_semaphore = IoSemaphore(RwLock::new(Semaphore::new( + settings.max_concurrent_writes, + ))); + emit_loading(&loading_bar, 10.0, None).await?; + + let metadata_fut = Metadata::init(&directories, &io_semaphore); + let profiles_fut = Profiles::init(&directories, &mut file_watcher); + let tags_fut = + Tags::init(&directories, &io_semaphore, &fetch_semaphore); + let users_fut = Users::init(&directories, &io_semaphore); + // Launcher data + let (metadata, profiles, tags, users) = loading_join! { + Some(&loading_bar), 70.0, Some("Loading metadata"); + metadata_fut, + profiles_fut, + tags_fut, + users_fut, + }?; + + let children = Children::new(); + let auth_flow = AuthTask::new(); + let safety_processes = SafeProcesses::new(); + emit_loading(&loading_bar, 10.0, None).await?; + + Ok::, crate::Error>(RwLock::new(Self { + directories, + fetch_semaphore, + fetch_semaphore_max: RwLock::new( + settings.max_concurrent_downloads as u32, + ), + io_semaphore, + io_semaphore_max: RwLock::new( + settings.max_concurrent_writes as u32, + ), + metadata: RwLock::new(metadata), + settings: RwLock::new(settings), + profiles: RwLock::new(profiles), + users: RwLock::new(users), + children: RwLock::new(children), + auth_flow: RwLock::new(auth_flow), + tags: RwLock::new(tags), + safety_processes: RwLock::new(safety_processes), + file_watcher: RwLock::new(file_watcher), + })) } - /// Updates state with data from the web pub fn update() { tokio::task::spawn(Metadata::update()); @@ -261,7 +263,6 @@ pub async fn init_watcher() -> crate::Result> { None, move |res: DebounceEventResult| { futures::executor::block_on(async { - tracing::info!("File watcher event: {:?}", res); tx.send(res).await.unwrap(); }) }, @@ -272,14 +273,17 @@ pub async fn init_watcher() -> crate::Result> { match res { Ok(mut events) => { let mut visited_paths = Vec::new(); - // sort events by e.path - events.sort_by(|a, b| a.path.cmp(&b.path)); - events.iter().for_each(|e| { - tracing::debug!("File watcher event: {:?}", serde_json::to_string(&e.path).unwrap()); + // sort events by e.path + events.sort_by(|a, b| a.path.cmp(&b.path)); + events.iter().for_each(|e| { + tracing::debug!( + "File watcher event: {:?}", + serde_json::to_string(&e.path).unwrap() + ); let mut new_path = PathBuf::new(); let mut components_iterator = e.path.components(); let mut found = false; - while let Some(component) = components_iterator.next() { + for component in components_iterator.by_ref() { new_path.push(component); if found { break; @@ -291,6 +295,12 @@ pub async fn init_watcher() -> crate::Result> { // if any remain, it's a subfile let subfile = components_iterator.next().is_some(); + // At this point, new_path is the path to the profile, and subfile is whether it's a subfile of the profile or not + let profile_path_id = + ProfilePathId::new(&PathBuf::from( + new_path.file_name().unwrap_or_default(), + )); + if e.path .components() .any(|x| x.as_os_str() == "crash-reports") @@ -299,16 +309,16 @@ pub async fn init_watcher() -> crate::Result> { .map(|x| x == "txt") .unwrap_or(false) { - Profile::crash_task(new_path); + Profile::crash_task(profile_path_id); } else if !visited_paths.contains(&new_path) { if subfile { - Profile::sync_projects_task(new_path.clone()); + Profile::sync_projects_task(profile_path_id); visited_paths.push(new_path); } else { tracing::warn!("No subfile found "); Profiles::sync_available_profiles_task( - new_path.clone(), + profile_path_id, ); } } diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index d71cf6d13..8a37c2029 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -19,7 +19,6 @@ use notify::{RecommendedWatcher, RecursiveMode}; use notify_debouncer_mini::Debouncer; use reqwest::Method; use serde::{Deserialize, Serialize}; -use tracing::info; use std::io::Cursor; use std::{ collections::HashMap, @@ -30,7 +29,7 @@ use uuid::Uuid; const PROFILE_JSON_PATH: &str = "profile.json"; -pub(crate) struct Profiles(pub HashMap); +pub(crate) struct Profiles(pub HashMap); #[derive( Serialize, Deserialize, Clone, Copy, Debug, Default, Eq, PartialEq, @@ -48,12 +47,98 @@ pub enum ProfileInstallStage { NotInstalled, } +/// newtype wrapper over a Profile path, to be usable as a clear identifier for the kind of path used +/// eg: for "a/b/c/profiles/My Mod", the ProfilePathId would be "My Mod" +#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash)] +#[serde(transparent)] +pub struct ProfilePathId(PathBuf); +impl ProfilePathId { + // Create a new ProfilePathId from a full file path + pub async fn from_fs_path(path: PathBuf) -> crate::Result { + let path: PathBuf = canonicalize(path)?; + let profiles_dir = + canonicalize(State::get().await?.directories.profiles_dir().await)?; + path.strip_prefix(profiles_dir) + .ok() + .and_then(|p| p.file_name()) + .ok_or_else(|| { + crate::ErrorKind::FSError(format!( + "Path {path:?} does not correspond to a profile", + path = path + )) + })?; + Ok(Self(path)) + } + + // Create a new ProfilePathId from a relative path + pub fn new(path: &Path) -> Self { + ProfilePathId(PathBuf::from(path)) + } + + pub async fn get_full_path(&self) -> crate::Result { + let state = State::get().await?; + let profiles_dir = state.directories.profiles_dir().await; + Ok(profiles_dir.join(&self.0)) + } + + pub fn check_valid_utf(&self) -> crate::Result<&Self> { + self.0 + .to_str() + .ok_or(crate::ErrorKind::UTFError(self.0.clone()).as_error())?; + Ok(self) + } +} +impl std::fmt::Display for ProfilePathId { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.0.display().fmt(f) + } +} + +/// newtype wrapper over a Profile path, to be usable as a clear identifier for the kind of path used +/// eg: for "a/b/c/profiles/My Mod/mods/myproj", the ProjectPathId would be "mods/myproj" +#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash)] +#[serde(transparent)] +pub struct ProjectPathId(pub PathBuf); +impl ProjectPathId { + // Create a new ProjectPathId from a full file path + pub async fn from_fs_path(path: PathBuf) -> crate::Result { + let path: PathBuf = canonicalize(path)?; + let profiles_dir: PathBuf = + canonicalize(State::get().await?.directories.profiles_dir().await)?; + path.strip_prefix(profiles_dir) + .ok() + .map(|p| p.components().skip(1).collect::()) + .ok_or_else(|| { + crate::ErrorKind::FSError(format!( + "Path {path:?} does not correspond to a profile", + path = path + )) + })?; + Ok(Self(path)) + } + + pub async fn get_full_path( + &self, + profile: ProfilePathId, + ) -> crate::Result { + let _state = State::get().await?; + let profile_dir = profile.get_full_path().await?; + Ok(profile_dir.join(&self.0)) + } + + // Create a new ProjectPathId from a relative path + pub fn new(path: &Path) -> Self { + ProjectPathId(PathBuf::from(path)) + } +} + // Represent a Minecraft instance. #[derive(Serialize, Deserialize, Clone, Debug)] pub struct Profile { pub uuid: Uuid, // todo: will be used in restructure to refer to profiles #[serde(default)] pub install_stage: ProfileInstallStage, + #[serde(default)] pub path: PathBuf, pub metadata: ProfileMetadata, #[serde(skip_serializing_if = "Option::is_none")] @@ -64,7 +149,7 @@ pub struct Profile { pub resolution: Option, #[serde(skip_serializing_if = "Option::is_none")] pub hooks: Option, - pub projects: HashMap, + pub projects: HashMap, } #[derive(Serialize, Deserialize, Clone, Debug)] @@ -150,7 +235,6 @@ impl Profile { uuid: Uuid, name: String, version: String, - path: PathBuf, ) -> crate::Result { if name.trim().is_empty() { return Err(crate::ErrorKind::InputError(String::from( @@ -162,7 +246,7 @@ impl Profile { Ok(Self { uuid, install_stage: ProfileInstallStage::NotInstalled, - path: canonicalize(path)?, + path: PathBuf::new().join(&name), metadata: ProfileMetadata { name, icon: None, @@ -189,6 +273,11 @@ impl Profile { self.metadata.name.clone() } + #[inline] + pub fn name_as_path_id(&self) -> ProfilePathId { + ProfilePathId::new(&self.path) + } + #[tracing::instrument(skip(self, semaphore, icon))] pub async fn set_icon<'a>( &'a mut self, @@ -204,7 +293,7 @@ impl Profile { Ok(()) } - pub fn crash_task(path: PathBuf) { + pub fn crash_task(path: ProfilePathId) { tokio::task::spawn(async move { let res = async { let profile = crate::api::profile::get(&path, None).await?; @@ -228,20 +317,24 @@ impl Profile { }); } - pub fn sync_projects_task(path: PathBuf) { + pub fn sync_projects_task(profile_path_id: ProfilePathId) { tokio::task::spawn(async move { let span = tracing::span!(tracing::Level::INFO, "sync_projects_task"); - info!(parent: &span, "Syncing projects for profile {}", path.display()); + tracing::debug!( + parent: &span, + "Syncing projects for profile {}", + profile_path_id + ); let res = async { let _span = span.enter(); let state = State::get().await?; - let profile = crate::api::profile::get(&path, None).await?; + let profile = crate::api::profile::get(&profile_path_id, None).await?; if let Some(profile) = profile { - let paths = profile.get_profile_full_project_paths()?; + let paths = profile.get_profile_full_project_paths().await?; - let caches_dir = state.directories.caches_dir().await; + let caches_dir = state.directories.caches_dir(); let projects = crate::state::infer_data_from_files( profile.clone(), paths, @@ -252,19 +345,19 @@ impl Profile { .await?; let mut new_profiles = state.profiles.write().await; - if let Some(profile) = new_profiles.0.get_mut(&path) { + if let Some(profile) = new_profiles.0.get_mut(&profile_path_id) { profile.projects = projects; } emit_profile( profile.uuid, - profile.path, + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Synced, ) .await?; } else { tracing::warn!( - "Unable to fetch single profile projects: path {path:?} invalid", + "Unable to fetch single profile projects: path {profile_path_id} invalid", ); } Ok::<(), crate::Error>(()) @@ -280,13 +373,23 @@ impl Profile { }); } + // Get full path to profile + pub async fn get_profile_full_path(&self) -> crate::Result { + let state = State::get().await?; + let profiles_dir = state.directories.profiles_dir().await; + Ok(profiles_dir.join(&self.path)) + } + /// Gets paths to projects as their full paths, not just their relative paths - pub fn get_profile_full_project_paths(&self) -> crate::Result> { + pub async fn get_profile_full_project_paths( + &self, + ) -> crate::Result> { let mut files = Vec::new(); + let profile_path = self.get_profile_full_path().await?; let mut read_paths = |path: &str| { - let new_path = self.path.join(path); + let new_path = profile_path.join(path); if new_path.exists() { - for path in std::fs::read_dir(self.path.join(path))? { + for path in std::fs::read_dir(new_path)? { let path = path?.path(); if path.is_file() { files.push(path); @@ -348,7 +451,7 @@ impl Profile { pub async fn add_project_version( &self, version_id: String, - ) -> crate::Result<(PathBuf, ModrinthVersion)> { + ) -> crate::Result<(ProjectPathId, ModrinthVersion)> { let state = State::get().await?; let version = fetch_json::( @@ -397,7 +500,7 @@ impl Profile { file_name: &str, bytes: bytes::Bytes, project_type: Option, - ) -> crate::Result { + ) -> crate::Result { let project_type = if let Some(project_type) = project_type { project_type } else { @@ -429,17 +532,23 @@ impl Profile { }; let state = State::get().await?; - let relative_name = PathBuf::new().join(project_type.get_folder()).join(file_name); - let path = self.path.join(relative_name.clone()); - write(&path, &bytes, &state.io_semaphore).await?; + let relative_name = PathBuf::new() + .join(project_type.get_folder()) + .join(file_name); + let file_path = self + .get_profile_full_path() + .await? + .join(relative_name.clone()); + let project_path_id = ProjectPathId::new(&relative_name); + write(&file_path, &bytes, &state.io_semaphore).await?; let hash = get_hash(bytes).await?; { let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.path) { + if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { profile.projects.insert( - path.clone(), + project_path_id.clone(), Project { sha512: hash, disabled: false, @@ -451,7 +560,7 @@ impl Profile { } } - Ok(relative_name) + Ok(project_path_id) } /// Toggle a project's disabled state. @@ -460,25 +569,31 @@ impl Profile { #[theseus_macros::debug_pin] pub async fn toggle_disable_project( &self, - relative_path: &Path, - ) -> crate::Result { + relative_path: &ProjectPathId, + ) -> crate::Result { let state = State::get().await?; if let Some(mut project) = { - let mut profiles: tokio::sync::RwLockWriteGuard<'_, Profiles> = state.profiles.write().await; + let mut profiles: tokio::sync::RwLockWriteGuard<'_, Profiles> = + state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.path) { + if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { profile.projects.remove(relative_path) } else { None } } { - let relative_path = relative_path.to_path_buf(); + // Get relative path from former ProjectPathId + let relative_path = relative_path.0.to_path_buf(); let mut new_path = relative_path.clone(); - if relative_path.extension().map_or(false, |ext| ext == "disabled") { + if relative_path + .extension() + .map_or(false, |ext| ext == "disabled") + { project.disabled = false; new_path.set_file_name( - relative_path.file_name() + relative_path + .file_name() .unwrap_or_default() .to_string_lossy() .replace(".disabled", ""), @@ -486,22 +601,31 @@ impl Profile { } else { new_path.set_file_name(format!( "{}.disabled", - relative_path.file_name().unwrap_or_default().to_string_lossy() + relative_path + .file_name() + .unwrap_or_default() + .to_string_lossy() )); project.disabled = true; } - let true_path = self.path.join(&relative_path); - let true_new_path = self.path.join(&new_path); + let true_path = + self.get_profile_full_path().await?.join(&relative_path); + let true_new_path = + self.get_profile_full_path().await?.join(&new_path); fs::rename(true_path, &true_new_path).await?; + let new_project_path_id = ProjectPathId::new(&new_path); + let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.path) { - profile.projects.insert(new_path.clone(), project); + if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { + profile + .projects + .insert(new_project_path_id.clone(), project); profile.metadata.date_modified = Utc::now(); } - Ok(new_path) + Ok(new_project_path_id) } else { Err(crate::ErrorKind::InputError(format!( "Project path does not exist: {:?}", @@ -513,16 +637,23 @@ impl Profile { pub async fn remove_project( &self, - relative_path: &Path, + relative_path: &ProjectPathId, dont_remove_arr: Option, ) -> crate::Result<()> { let state = State::get().await?; if self.projects.contains_key(relative_path) { - fs::remove_file(self.path.join(relative_path)).await?; + fs::remove_file( + self.get_profile_full_path() + .await? + .join(relative_path.0.clone()), + ) + .await?; if !dont_remove_arr.unwrap_or(false) { let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.path) { + if let Some(profile) = + profiles.0.get_mut(&self.name_as_path_id()) + { profile.projects.remove(relative_path); profile.metadata.date_modified = Utc::now(); } @@ -558,10 +689,10 @@ impl Profiles { while let Some(entry) = entries.next_entry().await? { let path = entry.path(); if path.is_dir() { - let prof = match Self::read_profile_from_dir(&path, &dirs).await { + let prof = match Self::read_profile_from_dir(&path, dirs).await + { Ok(prof) => Some(prof), Err(err) => { - tracing::warn!( "Error loading profile: {err}. Skipping..." ); @@ -571,7 +702,7 @@ impl Profiles { if let Some(profile) = prof { let path = canonicalize(path)?; Profile::watch_fs(&path, file_watcher).await?; - profiles.insert(profile.path.clone(), profile); + profiles.insert(profile.name_as_path_id(), profile); } } } @@ -590,16 +721,17 @@ impl Profiles { { let profiles = state.profiles.read().await; for (_profile_path, profile) in profiles.0.iter() { - let paths = profile.get_profile_full_project_paths()?; + let paths = + profile.get_profile_full_project_paths().await?; files.push((profile.clone(), paths)); } } - let caches_dir = state.directories.caches_dir().await; + let caches_dir = state.directories.caches_dir(); future::try_join_all(files.into_iter().map( |(profile, files)| async { - let profile_path = profile.path.clone(); + let profile_name = profile.name_as_path_id(); let inferred = super::projects::infer_data_from_files( profile, files, @@ -610,7 +742,7 @@ impl Profiles { .await?; let mut new_profiles = state.profiles.write().await; - if let Some(profile) = new_profiles.0.get_mut(&profile_path) + if let Some(profile) = new_profiles.0.get_mut(&profile_name) { profile.projects = inferred; } @@ -643,7 +775,7 @@ impl Profiles { pub async fn insert(&mut self, profile: Profile) -> crate::Result<&Self> { emit_profile( profile.uuid, - profile.path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Added, ) @@ -651,29 +783,26 @@ impl Profiles { let state = State::get().await?; let mut file_watcher = state.file_watcher.write().await; - Profile::watch_fs(&profile.path, &mut file_watcher).await?; - - self.0.insert( - canonicalize(&profile.path)? - .to_str() - .ok_or( - crate::ErrorKind::UTFError(profile.path.clone()).as_error(), - )? - .into(), - profile, - ); + Profile::watch_fs( + &profile.get_profile_full_path().await?, + &mut file_watcher, + ) + .await?; + + let profile_name = profile.name_as_path_id(); + profile_name.check_valid_utf()?; + self.0.insert(profile_name, profile); Ok(self) } #[tracing::instrument(skip(self))] pub async fn remove( &mut self, - path: &Path, + profile_path: &ProfilePathId, ) -> crate::Result> { - let path = - PathBuf::from(&canonicalize(path)?.to_string_lossy().to_string()); - let profile = self.0.remove(&path); + let profile = self.0.remove(profile_path); + let path = profile_path.get_full_path().await?; if path.exists() { fs::remove_dir_all(path).await?; } @@ -683,14 +812,16 @@ impl Profiles { #[tracing::instrument(skip_all)] pub async fn sync(&self) -> crate::Result<&Self> { - let state = State::get().await?; - let profiles_dir = &state.directories.profiles_dir().await; + let _state = State::get().await?; stream::iter(self.0.iter()) .map(Ok::<_, crate::Error>) - .try_for_each_concurrent(None, |(path, profile)| async move { + .try_for_each_concurrent(None, |(_, profile)| async move { let json = serde_json::to_vec(&profile)?; - let json_path = profiles_dir.join(&path).join(PROFILE_JSON_PATH); + let json_path = profile + .get_profile_full_path() + .await? + .join(PROFILE_JSON_PATH); fs::write(json_path, json).await?; Ok::<_, crate::Error>(()) @@ -700,25 +831,21 @@ impl Profiles { Ok(self) } - async fn read_profile_from_dir(path: &Path, dirs : &DirectoryInfo) -> crate::Result { + async fn read_profile_from_dir( + path: &Path, + dirs: &DirectoryInfo, + ) -> crate::Result { let json = fs::read(path.join(PROFILE_JSON_PATH)).await?; let mut profile = serde_json::from_slice::(&json)?; - - profile.path = PathBuf::from(path.strip_prefix(dirs.profiles_dir().await)?); - - // Cache icons were changed to be relative in v0.2.3. This strips the cache dir from the icon path if it exists. - let cache_dir = dirs.caches_dir().await; - if let Some(icon) = &mut profile.metadata.icon { - *icon = match icon.strip_prefix(cache_dir) { - Ok(path) => path.to_path_buf(), - Err(_) => icon.clone(), - }; - } + + // Get name from stripped path + profile.path = + PathBuf::from(path.strip_prefix(dirs.profiles_dir().await)?); Ok(profile) } - pub fn sync_available_profiles_task(path: PathBuf) { + pub fn sync_available_profiles_task(profile_path_id: ProfilePathId) { tokio::task::spawn(async move { let span = tracing::span!( tracing::Level::INFO, @@ -730,25 +857,31 @@ impl Profiles { let dirs = &state.directories; let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&path) { - if !path.exists() { + if let Some(profile) = profiles.0.get_mut(&profile_path_id) { + if !profile.get_profile_full_path().await?.exists() { // if path exists in the state but no longer in the filesystem, remove it from the state list emit_profile( profile.uuid, - profile.path.clone(), + profile.get_profile_full_path().await?, &profile.metadata.name, ProfilePayloadType::Removed, ) .await?; tracing::debug!("Removed!"); - profiles.0.remove(&path); + profiles.0.remove(&profile_path_id); } - } else if path.exists() { + } else if profile_path_id.get_full_path().await?.exists() { // if it exists in the filesystem but no longer in the state, add it to the state list profiles - .insert(Self::read_profile_from_dir(&path, &dirs).await?) + .insert( + Self::read_profile_from_dir( + &profile_path_id.get_full_path().await?, + dirs, + ) + .await?, + ) .await?; - Profile::sync_projects_task(path); + Profile::sync_projects_task(profile_path_id); } Ok::<(), crate::Error>(()) } diff --git a/theseus/src/state/projects.rs b/theseus/src/state/projects.rs index 38c70f434..bbb274767 100644 --- a/theseus/src/state/projects.rs +++ b/theseus/src/state/projects.rs @@ -7,6 +7,7 @@ use crate::util::fetch::{ }; use async_zip::tokio::read::fs::ZipFileReader; use chrono::{DateTime, Utc}; +use futures::StreamExt; use reqwest::Method; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -15,6 +16,8 @@ use std::collections::HashMap; use std::path::{Path, PathBuf}; use tokio::io::AsyncReadExt; +use super::ProjectPathId; + #[derive(Serialize, Deserialize, Clone, Debug)] #[serde(rename_all = "lowercase")] pub enum ProjectType { @@ -252,7 +255,6 @@ async fn read_icon_from_file( Ok(None) } - // Creates Project data from the existing files in the file system, for a given Profile // Paths must be the full paths to the files in the FS, and not the relative paths // eg: with get_profile_full_project_paths @@ -260,11 +262,11 @@ async fn read_icon_from_file( #[theseus_macros::debug_pin] pub async fn infer_data_from_files( profile: Profile, - paths: Vec, + paths: Vec, cache_dir: PathBuf, io_semaphore: &IoSemaphore, fetch_semaphore: &FetchSemaphore, -) -> crate::Result> { +) -> crate::Result> { let mut file_path_hashes = HashMap::new(); // TODO: Make this concurrent and use progressive hashing to avoid loading each JAR in memory @@ -765,10 +767,13 @@ pub async fn infer_data_from_files( } // Project paths should be relative - let return_projects: HashMap = return_projects.into_iter().map(|(h, v)| { - let h = h.strip_prefix(profile.path.clone())?.to_path_buf(); - Ok::<_,crate::Error>((h,v)) - }).collect::>>()?; + let _profile_base_path = profile.get_profile_full_path().await?; + let mut corrected_hashmap = HashMap::new(); + let mut stream = tokio_stream::iter(return_projects); + while let Some((h, v)) = stream.next().await { + let h = ProjectPathId::from_fs_path(h).await?; + corrected_hashmap.insert(h, v); + } - Ok(return_projects) + Ok(corrected_hashmap) } diff --git a/theseus/src/state/settings.rs b/theseus/src/state/settings.rs index 678ee8262..1a6c6bb57 100644 --- a/theseus/src/state/settings.rs +++ b/theseus/src/state/settings.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use std::path::{Path, PathBuf}; use tokio::fs; -use super::{JavaGlobals, DirectoryInfo}; +use super::{DirectoryInfo, JavaGlobals}; // TODO: convert to semver? const CURRENT_FORMAT_VERSION: u32 = 1; @@ -80,7 +80,7 @@ impl Settings { opt_out_analytics: false, advanced_rendering: true, onboarded: false, - + // By default, the config directory is the same as the settings directory loaded_config_dir: DirectoryInfo::get_initial_settings_dir(), }) diff --git a/theseus/src/state/users.rs b/theseus/src/state/users.rs index ec0878cbe..d88b4d04c 100644 --- a/theseus/src/state/users.rs +++ b/theseus/src/state/users.rs @@ -29,7 +29,8 @@ impl Users { pub async fn save(&self) -> crate::Result<()> { let state = State::get().await?; - let users_path = state.directories.caches_meta_dir().await.join(USERS_JSON); + let users_path = + state.directories.caches_meta_dir().await.join(USERS_JSON); write( &users_path, &serde_json::to_vec(&self.0)?, diff --git a/theseus/src/util/fetch.rs b/theseus/src/util/fetch.rs index f65a04f22..ae8c1ab0b 100644 --- a/theseus/src/util/fetch.rs +++ b/theseus/src/util/fetch.rs @@ -218,7 +218,7 @@ pub async fn write<'a>( Ok(()) } -// Writes a icon to the cache and returns the *relative* path of the icon within the cache directory +// Writes a icon to the cache and returns the absolute path of the icon within the cache directory #[tracing::instrument(skip(bytes, semaphore))] pub async fn write_cached_icon( icon_path: &str, @@ -237,7 +237,6 @@ pub async fn write_cached_icon( write(&path, &bytes, semaphore).await?; let path = dunce::canonicalize(path)?; - let path = path.strip_prefix(cache_dir)?.to_path_buf(); Ok(path) } diff --git a/theseus_cli/src/subcommands/profile.rs b/theseus_cli/src/subcommands/profile.rs index 92a92abfe..a2c773f9a 100644 --- a/theseus_cli/src/subcommands/profile.rs +++ b/theseus_cli/src/subcommands/profile.rs @@ -227,7 +227,7 @@ impl<'a> From<&'a Profile> for ProfileRow<'a> { fn from(it: &'a Profile) -> Self { Self { name: &it.metadata.name, - path: &it.path, + path: Path::new(&it.metadata.name), game_version: &it.metadata.game_version, loader: &it.metadata.loader, loader_version: it @@ -285,7 +285,8 @@ impl ProfileRemove { _args: &crate::Args, _largs: &ProfileCommand, ) -> Result<()> { - let profile = canonicalize(&self.profile)?; + let profile = + ProfilePathId::from_fs_path(canonicalize(&self.profile)?).await?; info!("Removing profile {} from Theseus", self.profile.display()); if confirm_async(String::from("Do you wish to continue"), true).await? { @@ -335,7 +336,9 @@ impl ProfileRun { .await?; let credentials = auth::refresh(id).await?; - let proc_lock = profile::run_credentials(&path, &credentials).await?; + let profile_path_id = ProfilePathId::from_fs_path(path).await?; + let proc_lock = + profile::run_credentials(&profile_path_id, &credentials).await?; let mut proc = proc_lock.write().await; process::wait_for(&mut proc).await?; diff --git a/theseus_gui/src-tauri/src/api/logs.rs b/theseus_gui/src-tauri/src/api/logs.rs index b76b3db41..83a9aae99 100644 --- a/theseus_gui/src-tauri/src/api/logs.rs +++ b/theseus_gui/src-tauri/src/api/logs.rs @@ -50,10 +50,15 @@ pub async fn logs_get_output_by_datetime( profile_uuid: Uuid, datetime_string: String, ) -> Result { - let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.path + let profile_path = if let Some(p) = + crate::profile::get_by_uuid(profile_uuid, None).await? + { + p.name_as_path_id() } else { - return Err(theseus::Error::from(theseus::ErrorKind::UnmanagedProfileError(profile_uuid.to_string())).into()); + return Err(theseus::Error::from( + theseus::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()), + ) + .into()); }; Ok(logs::get_output_by_datetime(&profile_path, &datetime_string).await?) diff --git a/theseus_gui/src-tauri/src/api/pack.rs b/theseus_gui/src-tauri/src/api/pack.rs index 1d13d8a18..eb6e4212b 100644 --- a/theseus_gui/src-tauri/src/api/pack.rs +++ b/theseus_gui/src-tauri/src/api/pack.rs @@ -1,5 +1,5 @@ use crate::api::Result; -use std::path::PathBuf; + use theseus::{ pack::{ install::install_pack, @@ -20,8 +20,8 @@ pub fn init() -> tauri::plugin::TauriPlugin { #[tauri::command] pub async fn pack_install( location: CreatePackLocation, - profile: PathBuf, -) -> Result { + profile: ProfilePathId, +) -> Result { Ok(install_pack(location, profile).await?) } diff --git a/theseus_gui/src-tauri/src/api/process.rs b/theseus_gui/src-tauri/src/api/process.rs index 58ffb8e3e..714855ff6 100644 --- a/theseus_gui/src-tauri/src/api/process.rs +++ b/theseus_gui/src-tauri/src/api/process.rs @@ -1,5 +1,3 @@ -use std::path::{Path, PathBuf}; - use crate::api::Result; use theseus::prelude::*; use uuid::Uuid; @@ -50,14 +48,15 @@ pub async fn process_get_all_running_uuids() -> Result> { // Gets all process UUIDs by profile path #[tauri::command] pub async fn process_get_uuids_by_profile_path( - profile_path: &Path, + profile_path: ProfilePathId, ) -> Result> { Ok(process::get_uuids_by_profile_path(profile_path).await?) } // Gets the Profile paths of each *running* stored process in the state #[tauri::command] -pub async fn process_get_all_running_profile_paths() -> Result> { +pub async fn process_get_all_running_profile_paths( +) -> Result> { Ok(process::get_all_running_profile_paths().await?) } diff --git a/theseus_gui/src-tauri/src/api/profile.rs b/theseus_gui/src-tauri/src/api/profile.rs index 82fa10c05..a2642ae6d 100644 --- a/theseus_gui/src-tauri/src/api/profile.rs +++ b/theseus_gui/src-tauri/src/api/profile.rs @@ -36,8 +36,8 @@ pub fn init() -> tauri::plugin::TauriPlugin { // Remove a profile // invoke('plugin:profile|profile_add_path',path) #[tauri::command] -pub async fn profile_remove(path: &Path) -> Result<()> { - profile::remove(path).await?; +pub async fn profile_remove(path: ProfilePathId) -> Result<()> { + profile::remove(&path).await?; Ok(()) } @@ -45,19 +45,19 @@ pub async fn profile_remove(path: &Path) -> Result<()> { // invoke('plugin:profile|profile_add_path',path) #[tauri::command] pub async fn profile_get( - path: &Path, + path: ProfilePathId, clear_projects: Option, ) -> Result> { - let res = profile::get(path, clear_projects).await?; + let res = profile::get(&path, clear_projects).await?; Ok(res) } // Get optimal java version from profile #[tauri::command] pub async fn profile_get_optimal_jre_key( - path: &Path, + path: ProfilePathId, ) -> Result> { - let res = profile::get_optimal_jre_key(path).await?; + let res = profile::get_optimal_jre_key(&path).await?; Ok(res) } @@ -66,14 +66,14 @@ pub async fn profile_get_optimal_jre_key( #[tauri::command] pub async fn profile_list( clear_projects: Option, -) -> Result> { +) -> Result> { let res = profile::list(clear_projects).await?; Ok(res) } #[tauri::command] pub async fn profile_check_installed( - path: &Path, + path: ProfilePathId, project_id: String, ) -> Result { let profile = profile_get(path, None).await?; @@ -94,8 +94,8 @@ pub async fn profile_check_installed( /// Installs/Repairs a profile /// invoke('plugin:profile|profile_install') #[tauri::command] -pub async fn profile_install(path: &Path) -> Result<()> { - profile::install(path).await?; +pub async fn profile_install(path: ProfilePathId) -> Result<()> { + profile::install(&path).await?; Ok(()) } @@ -103,40 +103,40 @@ pub async fn profile_install(path: &Path) -> Result<()> { /// invoke('plugin:profile|profile_update_all') #[tauri::command] pub async fn profile_update_all( - path: &Path, -) -> Result> { - Ok(profile::update_all(path).await?) + path: ProfilePathId, +) -> Result> { + Ok(profile::update_all(&path).await?) } /// Updates a specified project /// invoke('plugin:profile|profile_update_project') #[tauri::command] pub async fn profile_update_project( - path: &Path, - project_path: &Path, -) -> Result { - Ok(profile::update_project(path, project_path, None).await?) + path: ProfilePathId, + project_path: ProjectPathId, +) -> Result { + Ok(profile::update_project(&path, &project_path, None).await?) } // Adds a project to a profile from a version ID // invoke('plugin:profile|profile_add_project_from_version') #[tauri::command] pub async fn profile_add_project_from_version( - path: &Path, + path: ProfilePathId, version_id: String, -) -> Result { - Ok(profile::add_project_from_version(path, version_id).await?) +) -> Result { + Ok(profile::add_project_from_version(&path, version_id).await?) } // Adds a project to a profile from a path // invoke('plugin:profile|profile_add_project_from_path') #[tauri::command] pub async fn profile_add_project_from_path( - path: &Path, + path: ProfilePathId, project_path: &Path, project_type: Option, -) -> Result { - let res = profile::add_project_from_path(path, project_path, project_type) +) -> Result { + let res = profile::add_project_from_path(&path, project_path, project_type) .await?; Ok(res) } @@ -145,20 +145,20 @@ pub async fn profile_add_project_from_path( // invoke('plugin:profile|profile_toggle_disable_project') #[tauri::command] pub async fn profile_toggle_disable_project( - path: &Path, - project_path: &Path, -) -> Result { - Ok(profile::toggle_disable_project(path, project_path).await?) + path: ProfilePathId, + project_path: ProjectPathId, +) -> Result { + Ok(profile::toggle_disable_project(&path, &project_path).await?) } // Removes a project from a profile // invoke('plugin:profile|profile_remove_project') #[tauri::command] pub async fn profile_remove_project( - path: &Path, - project_path: &Path, + path: ProfilePathId, + project_path: ProjectPathId, ) -> Result<()> { - profile::remove_project(path, project_path).await?; + profile::remove_project(&path, &project_path).await?; Ok(()) } @@ -166,13 +166,13 @@ pub async fn profile_remove_project( // invoke('profile_export_mrpack') #[tauri::command] pub async fn profile_export_mrpack( - path: &Path, + path: ProfilePathId, export_location: PathBuf, included_overrides: Vec, version_id: Option, ) -> Result<()> { profile::export_mrpack( - path, + &path, export_location, included_overrides, version_id, @@ -190,7 +190,7 @@ pub async fn profile_export_mrpack( // => [folder1, folder2] #[tauri::command] pub async fn profile_get_potential_override_folders( - profile_path: PathBuf, + profile_path: ProfilePathId, ) -> Result> { let overrides = profile::get_potential_override_folders(profile_path).await?; @@ -202,8 +202,8 @@ pub async fn profile_get_potential_override_folders( // for the actual Child in the state. // invoke('plugin:profile|profile_run', path) #[tauri::command] -pub async fn profile_run(path: &Path) -> Result { - let minecraft_child = profile::run(path).await?; +pub async fn profile_run(path: ProfilePathId) -> Result { + let minecraft_child = profile::run(&path).await?; let uuid = minecraft_child.read().await.uuid; Ok(uuid) } @@ -211,8 +211,8 @@ pub async fn profile_run(path: &Path) -> Result { // Run Minecraft using a profile using the default credentials, and wait for the result // invoke('plugin:profile|profile_run_wait', path) #[tauri::command] -pub async fn profile_run_wait(path: &Path) -> Result<()> { - let proc_lock = profile::run(path).await?; +pub async fn profile_run_wait(path: ProfilePathId) -> Result<()> { + let proc_lock = profile::run(&path).await?; let mut proc = proc_lock.write().await; Ok(process::wait_for(&mut proc).await?) } @@ -223,12 +223,11 @@ pub async fn profile_run_wait(path: &Path) -> Result<()> { // invoke('plugin:profile|profile_run_credentials', {path, credentials})') #[tauri::command] pub async fn profile_run_credentials( - path: &Path, + path: ProfilePathId, credentials: Credentials, ) -> Result { - let minecraft_child = profile::run_credentials(path, &credentials).await?; + let minecraft_child = profile::run_credentials(&path, &credentials).await?; let uuid = minecraft_child.read().await.uuid; - Ok(uuid) } @@ -237,10 +236,10 @@ pub async fn profile_run_credentials( // invoke('plugin:profile|profile_run_wait', {path, credentials) #[tauri::command] pub async fn profile_run_wait_credentials( - path: &Path, + path: ProfilePathId, credentials: Credentials, ) -> Result<()> { - let proc_lock = profile::run_credentials(path, &credentials).await?; + let proc_lock = profile::run_credentials(&path, &credentials).await?; let mut proc = proc_lock.write().await; Ok(process::wait_for(&mut proc).await?) } @@ -267,10 +266,10 @@ pub struct EditProfileMetadata { // invoke('plugin:profile|profile_edit', {path, editProfile}) #[tauri::command] pub async fn profile_edit( - path: &Path, + path: ProfilePathId, edit_profile: EditProfile, ) -> Result<()> { - profile::edit(path, |prof| { + profile::edit(&path, |prof| { if let Some(metadata) = edit_profile.metadata.clone() { if let Some(name) = metadata.name { prof.metadata.name = name; @@ -307,9 +306,9 @@ pub async fn profile_edit( // invoke('plugin:profile|profile_edit_icon') #[tauri::command] pub async fn profile_edit_icon( - path: &Path, + path: ProfilePathId, icon_path: Option<&Path>, ) -> Result<()> { - profile::edit_icon(path, icon_path).await?; + profile::edit_icon(&path, icon_path).await?; Ok(()) } diff --git a/theseus_gui/src-tauri/src/api/profile_create.rs b/theseus_gui/src-tauri/src/api/profile_create.rs index 8afb4f77f..03e363e52 100644 --- a/theseus_gui/src-tauri/src/api/profile_create.rs +++ b/theseus_gui/src-tauri/src/api/profile_create.rs @@ -17,7 +17,7 @@ pub async fn profile_create( modloader: ModLoader, // the modloader to use loader_version: Option, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader icon: Option, // the icon for the profile -) -> Result { +) -> Result { let res = profile_create::profile_create( name, game_version, diff --git a/theseus_gui/src-tauri/src/api/settings.rs b/theseus_gui/src-tauri/src/api/settings.rs index 7a6341013..1b8b3c134 100644 --- a/theseus_gui/src-tauri/src/api/settings.rs +++ b/theseus_gui/src-tauri/src/api/settings.rs @@ -24,7 +24,11 @@ pub struct FrontendSettings { pub fn init() -> tauri::plugin::TauriPlugin { tauri::plugin::Builder::new("settings") - .invoke_handler(tauri::generate_handler![settings_get, settings_set, settings_change_config_dir]) + .invoke_handler(tauri::generate_handler![ + settings_get, + settings_set, + settings_change_config_dir + ]) .build() } diff --git a/theseus_gui/src-tauri/src/api/utils.rs b/theseus_gui/src-tauri/src/api/utils.rs index 08be69908..cef1bbc9e 100644 --- a/theseus_gui/src-tauri/src/api/utils.rs +++ b/theseus_gui/src-tauri/src/api/utils.rs @@ -1,7 +1,7 @@ use theseus::{handler, prelude::CommandPayload, State}; use crate::api::Result; -use std::{env, process::Command, path::PathBuf}; +use std::{env, process::Command}; pub fn init() -> tauri::plugin::TauriPlugin { tauri::plugin::Builder::new("utils") @@ -12,7 +12,6 @@ pub fn init() -> tauri::plugin::TauriPlugin { safety_check_safe_loading_bars, get_opening_command, await_sync, - get_cache_path ]) .build() } @@ -126,11 +125,3 @@ pub async fn await_sync() -> Result<()> { tracing::debug!("State synced"); Ok(()) } - -// Get cached path from relative path -// Returns "%CACHE_DIR%/relative_path" -#[tauri::command] -pub async fn get_cache_path() -> Result { - let state = theseus::State::get().await?; - Ok(state.directories.caches_dir().await) -} diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index b474f3de5..fd0d42985 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -96,12 +96,6 @@ const handleClose = async () => { window.getCurrent().close() } -const do_change = async () => { - console.log("123") - await change_config_dir('/home/thesuzerain/newone') - console.log("456") -} - window.getCurrent().listen(TauriEvent.WINDOW_CLOSE_REQUESTED, async () => { await handleClose() }) @@ -157,9 +151,6 @@ const accounts = ref(null) -
diff --git a/theseus_gui/src/components/ui/ExportModal.vue b/theseus_gui/src/components/ui/ExportModal.vue index 15a1065d9..239e57b24 100644 --- a/theseus_gui/src/components/ui/ExportModal.vue +++ b/theseus_gui/src/components/ui/ExportModal.vue @@ -69,14 +69,12 @@ const exportPack = async () => { } }) }) - console.log(filesToExport) const outputPath = await open({ directory: true, multiple: false, }) if (outputPath) { - console.log(outputPath) export_profile_mrpack( props.instance.path, outputPath + `/${nameInput.value} ${versionInput.value}.mrpack`, diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue index 7d6182416..c64e6cc0c 100644 --- a/theseus_gui/src/components/ui/Instance.vue +++ b/theseus_gui/src/components/ui/Instance.vue @@ -16,7 +16,7 @@ import { handleError } from '@/store/state.js' import { showInFolder } from '@/helpers/utils.js' import InstanceInstallModal from '@/components/ui/InstanceInstallModal.vue' import mixpanel from 'mixpanel-browser' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const props = defineProps({ instance: { @@ -176,8 +176,6 @@ defineExpose({ instance: props.instance, }) -const cacheDir = await getCacheDir(); - const unlisten = await process_listener((e) => { if (e.event === 'finished' && e.uuid === uuid.value) playing.value = false }) @@ -195,7 +193,7 @@ onUnmounted(() => unlisten()) ? !props.instance.metadata.icon || (props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http')) ? props.instance.metadata.icon - : convertCachedFileSrc(cacheDir,props.instance.metadata?.icon) + : convertFileSrc(props.instance.metadata?.icon) : props.instance.icon_url " alt="Mod card" diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue index 5eafb9d02..d895ff85c 100644 --- a/theseus_gui/src/components/ui/InstanceCreationModal.vue +++ b/theseus_gui/src/components/ui/InstanceCreationModal.vue @@ -119,7 +119,7 @@ import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/state.js' import { listen } from '@tauri-apps/api/event' import { install_from_file } from '@/helpers/pack.js' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const themeStore = useTheming() @@ -236,7 +236,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = convertCachedFileSrc(cacheDir,icon.value) + display_icon.value = convertFileSrc(icon.value) } const reset_icon = () => { @@ -244,8 +244,6 @@ const reset_icon = () => { display_icon.value = null } -const cacheDir = await getCacheDir(); - const selectable_versions = computed(() => { if (game_version.value) { if (loader.value === 'fabric') { diff --git a/theseus_gui/src/components/ui/InstanceInstallModal.vue b/theseus_gui/src/components/ui/InstanceInstallModal.vue index c0f274988..cffd9edc2 100644 --- a/theseus_gui/src/components/ui/InstanceInstallModal.vue +++ b/theseus_gui/src/components/ui/InstanceInstallModal.vue @@ -24,7 +24,7 @@ import { installVersionDependencies } from '@/helpers/utils' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const themeStore = useTheming() @@ -60,7 +60,6 @@ defineExpose({ }) const profiles = ref([]) -const cacheDir = await getCacheDir(); async function install(instance) { instance.installing = true @@ -142,7 +141,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = convertCachedFileSrc(cacheDir, icon.value) + display_icon.value = convertFileSrc(icon.value) } const reset_icon = () => { @@ -227,7 +226,7 @@ const check_valid = computed(() => { !profile.metadata.icon || (profile.metadata.icon && profile.metadata.icon.startsWith('http')) ? profile.metadata.icon - : convertCachedFileSrc(cacheDir, profile.metadata?.icon) + : convertFileSrc(profile.metadata?.icon) " class="profile-image" /> diff --git a/theseus_gui/src/helpers/cache.js b/theseus_gui/src/helpers/cache.js index f2089872d..874b9c8ed 100644 --- a/theseus_gui/src/helpers/cache.js +++ b/theseus_gui/src/helpers/cache.js @@ -1,15 +1,13 @@ - // Wrapper around convertFileSrc, which converts a filepath to a loadable URL -import { invoke } from "@tauri-apps/api" -import { convertFileSrc } from "@tauri-apps/api/tauri" +import { invoke } from '@tauri-apps/api' +import { convertFileSrc } from '@tauri-apps/api/tauri' // This converts a relative cached filepath (ie: 'icons/1234.png') to a loadable URL by appending the cache directory first -export function convertCachedFileSrc(cacheDir,src) { - return convertFileSrc(cacheDir + "/" + src) +export function convertCachedFileSrc(cacheDir, src) { + return convertFileSrc(cacheDir + '/' + src) } export async function getCacheDir() { - return await invoke('plugin:utils|get_cache_path', { }) + return await invoke('plugin:utils|get_cache_path', {}) } - diff --git a/theseus_gui/src/helpers/settings.js b/theseus_gui/src/helpers/settings.js index ebe80553f..62b53745c 100644 --- a/theseus_gui/src/helpers/settings.js +++ b/theseus_gui/src/helpers/settings.js @@ -38,10 +38,8 @@ export async function set(settings) { return await invoke('plugin:settings|settings_set', { settings }) } - // Changes the config dir // Seizes the entire application state until its done export async function change_config_dir(newConfigDir) { - console.log("tedst") return await invoke('plugin:settings|settings_change_config_dir', { newConfigDir }) -} \ No newline at end of file +} diff --git a/theseus_gui/src/pages/Browse.vue b/theseus_gui/src/pages/Browse.vue index cbb49305e..8bbd1c6d1 100644 --- a/theseus_gui/src/pages/Browse.vue +++ b/theseus_gui/src/pages/Browse.vue @@ -30,7 +30,7 @@ import SplashScreen from '@/components/ui/SplashScreen.vue' import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue' import { useFetch } from '@/helpers/fetch.js' import { check_installed, get as getInstance } from '@/helpers/profile.js' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const router = useRouter() const route = useRoute() @@ -70,8 +70,6 @@ const pageCount = computed(() => results.value ? Math.ceil(results.value.total_hits / results.value.limit) : 1 ) -const cacheDir = await getCacheDir(); - function getArrayOrString(x) { if (typeof x === 'string' || x instanceof String) { return [x] @@ -484,7 +482,7 @@ const showLoaders = computed( !instanceContext.metadata.icon || (instanceContext.metadata.icon && instanceContext.metadata.icon.startsWith('http')) ? instanceContext.metadata.icon - : convertCachedFileSrc(cacheDir, instanceContext.metadata.icon) + : convertFileSrc(instanceContext.metadata.icon) " :alt="instanceContext.metadata.name" size="sm" diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue index 1cd55ef7e..ccb37c90d 100644 --- a/theseus_gui/src/pages/instance/Index.vue +++ b/theseus_gui/src/pages/instance/Index.vue @@ -8,7 +8,7 @@ !instance.metadata.icon || (instance.metadata.icon && instance.metadata.icon.startsWith('http')) ? instance.metadata.icon - : convertCachedFileSrc(cacheDir, instance.metadata?.icon) + : convertFileSrc(instance.metadata?.icon) " />
@@ -136,7 +136,7 @@ import ContextMenu from '@/components/ui/ContextMenu.vue' import mixpanel from 'mixpanel-browser' import { PackageIcon } from '@/assets/icons/index.js' import ExportModal from '@/components/ui/ExportModal.vue' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const route = useRoute() @@ -155,8 +155,6 @@ breadcrumbs.setContext({ const loadingBar = useLoading() -const cacheDir = await getCacheDir(); - const uuid = ref(null) const playing = ref(false) const loading = ref(false) diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue index 436e2b05c..c6ccab3fd 100644 --- a/theseus_gui/src/pages/instance/Mods.vue +++ b/theseus_gui/src/pages/instance/Mods.vue @@ -234,7 +234,7 @@ import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { open } from '@tauri-apps/api/dialog' import { listen } from '@tauri-apps/api/event' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const router = useRouter() @@ -281,7 +281,7 @@ const initProjects = (initInstance) => { author: project.metadata.authors[0], version: project.metadata.version, file_name: project.file_name, - icon: project.metadata.icon ? convertCachedFileSrc(cacheDir, project.metadata.icon) : null, + icon: project.metadata.icon ? convertFileSrc(project.metadata.icon) : null, disabled: project.disabled, outdated: false, project_type: project.metadata.project_type, @@ -317,8 +317,6 @@ const selected = computed(() => projects.value.filter((mod) => mod.selected)) const deleteWarning = ref(null) const hideNonSelected = ref(false) -const cacheDir = await getCacheDir(); - const selectableProjectTypes = computed(() => { const obj = { All: 'all' } diff --git a/theseus_gui/src/pages/instance/Options.vue b/theseus_gui/src/pages/instance/Options.vue index 964bb6d53..caee887f0 100644 --- a/theseus_gui/src/pages/instance/Options.vue +++ b/theseus_gui/src/pages/instance/Options.vue @@ -62,7 +62,7 @@
@@ -340,7 +340,7 @@ import { get_game_versions, get_loaders } from '@/helpers/tags.js' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const router = useRouter() @@ -357,10 +357,6 @@ const title = ref(props.instance.metadata.name) const icon = ref(props.instance.metadata.icon) const groups = ref(props.instance.metadata.groups) -const cacheDir = await getCacheDir(); - - - const instancesList = Object.values(await list(true)) const availableGroups = ref([ ...new Set( diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue index d2fea87b5..89b671808 100644 --- a/theseus_gui/src/pages/project/Index.vue +++ b/theseus_gui/src/pages/project/Index.vue @@ -8,7 +8,7 @@ !instance.metadata.icon || (instance.metadata.icon && instance.metadata.icon.startsWith('http')) ? instance.metadata.icon - : convertCachedFileSrc(cacheDir, instance.metadata?.icon) + : convertFileSrc(instance.metadata?.icon) " :alt="instance.metadata.name" size="sm" @@ -275,7 +275,7 @@ import { useFetch } from '@/helpers/fetch.js' import { handleError } from '@/store/notifications.js' import ContextMenu from '@/components/ui/ContextMenu.vue' import mixpanel from 'mixpanel-browser' -import { convertCachedFileSrc, getCacheDir } from '@/helpers/cache' +import { convertFileSrc } from '@tauri-apps/api/tauri' const route = useRoute() const breadcrumbs = useBreadcrumbs() @@ -296,8 +296,6 @@ const instance = ref(null) const installed = ref(false) const installedVersion = ref(null) -const cacheDir = await getCacheDir(); - async function fetchProjectData() { ;[ data.value, diff --git a/theseus_playground/src/main.rs b/theseus_playground/src/main.rs index 0542b4f0c..786459739 100644 --- a/theseus_playground/src/main.rs +++ b/theseus_playground/src/main.rs @@ -3,7 +3,6 @@ windows_subsystem = "windows" )] -use dunce::canonicalize; use theseus::jre::autodetect_java_globals; use theseus::prelude::*; @@ -98,7 +97,7 @@ async fn main() -> theseus::Result<()> { println!("running"); // Run a profile, running minecraft and store the RwLock to the process - let proc_lock = profile::run(&canonicalize(&profile_path)?).await?; + let proc_lock = profile::run(&profile_path).await?; let uuid = proc_lock.read().await.uuid; let pid = proc_lock.read().await.current_child.read().await.id(); From 685e62d418bcba41ecda09601561977f209ea9eb Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 6 Jul 2023 13:20:07 -0700 Subject: [PATCH 04/10] renaming --- theseus/src/api/logs.rs | 8 +++--- theseus/src/api/process.rs | 3 +-- theseus/src/api/profile_create.rs | 5 ++-- theseus/src/launcher/mod.rs | 14 +++++----- theseus/src/state/dirs.rs | 5 ++-- theseus/src/state/mod.rs | 6 ++--- theseus/src/state/profiles.rs | 26 +++++++------------ theseus/src/state/settings.rs | 5 ---- theseus_gui/src-tauri/src/api/logs.rs | 2 +- theseus_gui/src/components/ui/Instance.vue | 2 +- .../components/ui/InstanceCreationModal.vue | 4 +-- .../components/ui/InstanceInstallModal.vue | 6 ++--- theseus_gui/src/helpers/cache.js | 13 ---------- theseus_gui/src/pages/instance/Options.vue | 2 +- theseus_gui/src/pages/project/Index.vue | 2 +- 15 files changed, 37 insertions(+), 66 deletions(-) delete mode 100644 theseus_gui/src/helpers/cache.js diff --git a/theseus/src/api/logs.rs b/theseus/src/api/logs.rs index c26151a11..0d95c4030 100644 --- a/theseus/src/api/logs.rs +++ b/theseus/src/api/logs.rs @@ -36,7 +36,7 @@ pub async fn get_logs( let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.name_as_path_id() + p.profile_id() } else { return Err(crate::ErrorKind::UnmanagedProfileError( profile_uuid.to_string(), @@ -78,7 +78,7 @@ pub async fn get_logs_by_datetime( let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.name_as_path_id() + p.profile_id() } else { return Err(crate::ErrorKind::UnmanagedProfileError( profile_uuid.to_string(), @@ -112,7 +112,7 @@ pub async fn delete_logs(profile_uuid: uuid::Uuid) -> crate::Result<()> { let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.name_as_path_id() + p.profile_id() } else { return Err(crate::ErrorKind::UnmanagedProfileError( profile_uuid.to_string(), @@ -140,7 +140,7 @@ pub async fn delete_logs_by_datetime( let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.name_as_path_id() + p.profile_id() } else { return Err(crate::ErrorKind::UnmanagedProfileError( profile_uuid.to_string(), diff --git a/theseus/src/api/process.rs b/theseus/src/api/process.rs index a57316895..1455e62b2 100644 --- a/theseus/src/api/process.rs +++ b/theseus/src/api/process.rs @@ -56,8 +56,7 @@ pub async fn get_all_running_profile_paths() -> crate::Result pub async fn get_all_running_profiles() -> crate::Result> { let state = State::get().await?; let children = state.children.read().await; - let ret = children.running_profiles().await?; - Ok(ret) + children.running_profiles().await } // Gets the UUID of each stored process in the state by profile path diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index 60304e4fe..8568e3f02 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -116,15 +116,14 @@ pub async fn profile_create( } State::sync().await?; - Ok(profile.name_as_path_id()) + Ok(profile.profile_id()) } .await; match result { Ok(profile) => Ok(profile), Err(err) => { - let _ = - crate::api::profile::remove(&profile.name_as_path_id()).await; + let _ = crate::api::profile::remove(&profile.profile_id()).await; Err(err) } diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index 07578ae36..43ad8ac39 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -116,7 +116,7 @@ pub async fn install_minecraft( ) .await?; - crate::api::profile::edit(&profile.name_as_path_id(), |prof| { + crate::api::profile::edit(&profile.profile_id(), |prof| { prof.install_stage = ProfileInstallStage::Installing; async { Ok(()) } @@ -273,7 +273,7 @@ pub async fn install_minecraft( } } - crate::api::profile::edit(&profile.name_as_path_id(), |prof| { + crate::api::profile::edit(&profile.profile_id(), |prof| { prof.install_stage = ProfileInstallStage::Installed; async { Ok(()) } @@ -371,11 +371,11 @@ pub async fn launch_minecraft( // Check if profile has a running profile, and reject running the command if it does // Done late so a quick double call doesn't launch two instances let existing_processes = - process::get_uuids_by_profile_path(profile.name_as_path_id()).await?; + process::get_uuids_by_profile_path(profile.profile_id()).await?; if let Some(uuid) = existing_processes.first() { return Err(crate::ErrorKind::LauncherError(format!( "Profile {} is already running at UUID: {uuid}", - profile.name_as_path_id() + profile.profile_id() )) .as_error()); } @@ -436,7 +436,7 @@ pub async fn launch_minecraft( let logs_dir = { let st = State::get().await?; st.directories - .profile_logs_dir(&profile.name_as_path_id()) + .profile_logs_dir(&profile.profile_id()) .await? .join(&datetime_string) }; @@ -444,7 +444,7 @@ pub async fn launch_minecraft( let stdout_log_path = logs_dir.join("stdout.log"); - crate::api::profile::edit(&profile.name_as_path_id(), |prof| { + crate::api::profile::edit(&profile.profile_id(), |prof| { prof.metadata.last_played = Some(Utc::now()); async { Ok(()) } @@ -497,7 +497,7 @@ pub async fn launch_minecraft( state_children .insert_process( Uuid::new_v4(), - profile.name_as_path_id(), + profile.profile_id(), stdout_log_path, command, post_exit_hook, diff --git a/theseus/src/state/dirs.rs b/theseus/src/state/dirs.rs index 2b61634c0..9aba6d4ef 100644 --- a/theseus/src/state/dirs.rs +++ b/theseus/src/state/dirs.rs @@ -8,8 +8,8 @@ use super::{ProfilePathId, Settings}; #[derive(Debug)] pub struct DirectoryInfo { - pub settings_dir: PathBuf, - pub config_dir: RwLock, + pub settings_dir: PathBuf, // Base settings directory- settings.json and icon cache. + pub config_dir: RwLock, // Base config directory- instances, minecraft downloads, etc. Changeable as a setting. pub working_dir: PathBuf, } @@ -63,7 +63,6 @@ impl DirectoryInfo { Ok(Self { settings_dir, - // config_dir: RwLock::new(config_dir), config_dir: RwLock::new(config_dir), working_dir, }) diff --git a/theseus/src/state/mod.rs b/theseus/src/state/mod.rs index 0f696004b..5334194ac 100644 --- a/theseus/src/state/mod.rs +++ b/theseus/src/state/mod.rs @@ -49,7 +49,7 @@ mod safe_processes; pub use self::safe_processes::*; // Global state -// RwLock on state only has concurrent reads, except for config dir change +// RwLock on state only has concurrent reads, except for config dir change which takes control of the State static LAUNCHER_STATE: OnceCell> = OnceCell::const_new(); pub struct State { /// Information on the location of files used in the launcher @@ -292,7 +292,7 @@ pub async fn init_watcher() -> crate::Result> { found = true; } } - // if any remain, it's a subfile + // if any remain, it's a subfile of the profile folder and not the profile folder itself let subfile = components_iterator.next().is_some(); // At this point, new_path is the path to the profile, and subfile is whether it's a subfile of the profile or not @@ -315,8 +315,6 @@ pub async fn init_watcher() -> crate::Result> { Profile::sync_projects_task(profile_path_id); visited_paths.push(new_path); } else { - tracing::warn!("No subfile found "); - Profiles::sync_available_profiles_task( profile_path_id, ); diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index 8a37c2029..004f41035 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -139,7 +139,7 @@ pub struct Profile { #[serde(default)] pub install_stage: ProfileInstallStage, #[serde(default)] - pub path: PathBuf, + pub path: PathBuf, // Relative path to the profile, to be used in ProfilePathId pub metadata: ProfileMetadata, #[serde(skip_serializing_if = "Option::is_none")] pub java: Option, @@ -268,13 +268,9 @@ impl Profile { }) } + // Gets the ProfilePathId for this profile #[inline] - pub fn name(&self) -> String { - self.metadata.name.clone() - } - - #[inline] - pub fn name_as_path_id(&self) -> ProfilePathId { + pub fn profile_id(&self) -> ProfilePathId { ProfilePathId::new(&self.path) } @@ -546,7 +542,7 @@ impl Profile { { let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { + if let Some(profile) = profiles.0.get_mut(&self.profile_id()) { profile.projects.insert( project_path_id.clone(), Project { @@ -576,7 +572,7 @@ impl Profile { let mut profiles: tokio::sync::RwLockWriteGuard<'_, Profiles> = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { + if let Some(profile) = profiles.0.get_mut(&self.profile_id()) { profile.projects.remove(relative_path) } else { None @@ -618,7 +614,7 @@ impl Profile { let new_project_path_id = ProjectPathId::new(&new_path); let mut profiles = state.profiles.write().await; - if let Some(profile) = profiles.0.get_mut(&self.name_as_path_id()) { + if let Some(profile) = profiles.0.get_mut(&self.profile_id()) { profile .projects .insert(new_project_path_id.clone(), project); @@ -651,9 +647,7 @@ impl Profile { if !dont_remove_arr.unwrap_or(false) { let mut profiles = state.profiles.write().await; - if let Some(profile) = - profiles.0.get_mut(&self.name_as_path_id()) - { + if let Some(profile) = profiles.0.get_mut(&self.profile_id()) { profile.projects.remove(relative_path); profile.metadata.date_modified = Utc::now(); } @@ -702,7 +696,7 @@ impl Profiles { if let Some(profile) = prof { let path = canonicalize(path)?; Profile::watch_fs(&path, file_watcher).await?; - profiles.insert(profile.name_as_path_id(), profile); + profiles.insert(profile.profile_id(), profile); } } } @@ -731,7 +725,7 @@ impl Profiles { let caches_dir = state.directories.caches_dir(); future::try_join_all(files.into_iter().map( |(profile, files)| async { - let profile_name = profile.name_as_path_id(); + let profile_name = profile.profile_id(); let inferred = super::projects::infer_data_from_files( profile, files, @@ -789,7 +783,7 @@ impl Profiles { ) .await?; - let profile_name = profile.name_as_path_id(); + let profile_name = profile.profile_id(); profile_name.check_valid_utf()?; self.0.insert(profile_name, profile); Ok(self) diff --git a/theseus/src/state/settings.rs b/theseus/src/state/settings.rs index 1a6c6bb57..4d17e5b1c 100644 --- a/theseus/src/state/settings.rs +++ b/theseus/src/state/settings.rs @@ -121,11 +121,6 @@ impl Settings { }; } - // #[inline] - // pub fn get_config_dir(&self) -> crate::Result { - // self.config_dir.clone() - // } - #[tracing::instrument(skip(self))] pub async fn sync(&self, to: &Path) -> crate::Result<()> { fs::write(to, serde_json::to_vec(self)?) diff --git a/theseus_gui/src-tauri/src/api/logs.rs b/theseus_gui/src-tauri/src/api/logs.rs index 83a9aae99..1cb40f7d5 100644 --- a/theseus_gui/src-tauri/src/api/logs.rs +++ b/theseus_gui/src-tauri/src/api/logs.rs @@ -53,7 +53,7 @@ pub async fn logs_get_output_by_datetime( let profile_path = if let Some(p) = crate::profile::get_by_uuid(profile_uuid, None).await? { - p.name_as_path_id() + p.profile_id() } else { return Err(theseus::Error::from( theseus::ErrorKind::UnmanagedProfileError(profile_uuid.to_string()), diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue index c64e6cc0c..5627af754 100644 --- a/theseus_gui/src/components/ui/Instance.vue +++ b/theseus_gui/src/components/ui/Instance.vue @@ -2,6 +2,7 @@ import { onUnmounted, ref, watch } from 'vue' import { useRouter } from 'vue-router' import { Card, DownloadIcon, StopCircleIcon, Avatar, AnimatedLogo, PlayIcon } from 'omorphia' +import { convertFileSrc } from '@tauri-apps/api/tauri' import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue' import { install as pack_install } from '@/helpers/pack' import { list, run } from '@/helpers/profile' @@ -16,7 +17,6 @@ import { handleError } from '@/store/state.js' import { showInFolder } from '@/helpers/utils.js' import InstanceInstallModal from '@/components/ui/InstanceInstallModal.vue' import mixpanel from 'mixpanel-browser' -import { convertFileSrc } from '@tauri-apps/api/tauri' const props = defineProps({ instance: { diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue index d895ff85c..9f99cc1c1 100644 --- a/theseus_gui/src/components/ui/InstanceCreationModal.vue +++ b/theseus_gui/src/components/ui/InstanceCreationModal.vue @@ -107,6 +107,7 @@ import { computed, ref, shallowRef } from 'vue' import { get_loaders } from '@/helpers/tags' import { create } from '@/helpers/profile' import { open } from '@tauri-apps/api/dialog' +import { tauri } from '@tauri-apps/api' import { get_game_versions, get_fabric_versions, @@ -119,7 +120,6 @@ import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/state.js' import { listen } from '@tauri-apps/api/event' import { install_from_file } from '@/helpers/pack.js' -import { convertFileSrc } from '@tauri-apps/api/tauri' const themeStore = useTheming() @@ -236,7 +236,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = convertFileSrc(icon.value) + display_icon.value = tauri.convertFileSrc(icon.value) } const reset_icon = () => { diff --git a/theseus_gui/src/components/ui/InstanceInstallModal.vue b/theseus_gui/src/components/ui/InstanceInstallModal.vue index cffd9edc2..1534d05df 100644 --- a/theseus_gui/src/components/ui/InstanceInstallModal.vue +++ b/theseus_gui/src/components/ui/InstanceInstallModal.vue @@ -24,7 +24,7 @@ import { installVersionDependencies } from '@/helpers/utils' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' -import { convertFileSrc } from '@tauri-apps/api/tauri' +import { tauri } from '@tauri-apps/api' const themeStore = useTheming() @@ -141,7 +141,7 @@ const upload_icon = async () => { }) if (!icon.value) return - display_icon.value = convertFileSrc(icon.value) + display_icon.value = tauri.convertFileSrc(icon.value) } const reset_icon = () => { @@ -226,7 +226,7 @@ const check_valid = computed(() => { !profile.metadata.icon || (profile.metadata.icon && profile.metadata.icon.startsWith('http')) ? profile.metadata.icon - : convertFileSrc(profile.metadata?.icon) + : tauri.convertFileSrc(profile.metadata?.icon) " class="profile-image" /> diff --git a/theseus_gui/src/helpers/cache.js b/theseus_gui/src/helpers/cache.js deleted file mode 100644 index 874b9c8ed..000000000 --- a/theseus_gui/src/helpers/cache.js +++ /dev/null @@ -1,13 +0,0 @@ -// Wrapper around convertFileSrc, which converts a filepath to a loadable URL - -import { invoke } from '@tauri-apps/api' -import { convertFileSrc } from '@tauri-apps/api/tauri' - -// This converts a relative cached filepath (ie: 'icons/1234.png') to a loadable URL by appending the cache directory first -export function convertCachedFileSrc(cacheDir, src) { - return convertFileSrc(cacheDir + '/' + src) -} - -export async function getCacheDir() { - return await invoke('plugin:utils|get_cache_path', {}) -} diff --git a/theseus_gui/src/pages/instance/Options.vue b/theseus_gui/src/pages/instance/Options.vue index caee887f0..a0dee07ca 100644 --- a/theseus_gui/src/pages/instance/Options.vue +++ b/theseus_gui/src/pages/instance/Options.vue @@ -334,13 +334,13 @@ import { computed, readonly, ref, shallowRef, watch } from 'vue' import { get_max_memory } from '@/helpers/jre.js' import { get } from '@/helpers/settings.js' import JavaSelector from '@/components/ui/JavaSelector.vue' +import { convertFileSrc } from '@tauri-apps/api/tauri' import { open } from '@tauri-apps/api/dialog' import { get_fabric_versions, get_forge_versions, get_quilt_versions } from '@/helpers/metadata.js' import { get_game_versions, get_loaders } from '@/helpers/tags.js' import { handleError } from '@/store/notifications.js' import mixpanel from 'mixpanel-browser' import { useTheming } from '@/store/theme.js' -import { convertFileSrc } from '@tauri-apps/api/tauri' const router = useRouter() diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue index 89b671808..4f3043ed8 100644 --- a/theseus_gui/src/pages/project/Index.vue +++ b/theseus_gui/src/pages/project/Index.vue @@ -273,9 +273,9 @@ import { useBreadcrumbs } from '@/store/breadcrumbs' import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue' import { useFetch } from '@/helpers/fetch.js' import { handleError } from '@/store/notifications.js' +import { convertFileSrc } from '@tauri-apps/api/tauri' import ContextMenu from '@/components/ui/ContextMenu.vue' import mixpanel from 'mixpanel-browser' -import { convertFileSrc } from '@tauri-apps/api/tauri' const route = useRoute() const breadcrumbs = useBreadcrumbs() From cc3551673ae095e91b03b18d6183a13b1745a1ea Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 6 Jul 2023 13:21:42 -0700 Subject: [PATCH 05/10] unused lint --- theseus_gui/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index fd0d42985..298206330 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -14,7 +14,7 @@ import { import { useLoading, useTheming } from '@/store/state' import AccountsCard from '@/components/ui/AccountsCard.vue' import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue' -import { get, change_config_dir } from '@/helpers/settings' +import { get } from '@/helpers/settings' import Breadcrumbs from '@/components/ui/Breadcrumbs.vue' import RunningAppBar from '@/components/ui/RunningAppBar.vue' import SplashScreen from '@/components/ui/SplashScreen.vue' From 7b0d9efa06719fb9c84b784e6a6c03ad57294d23 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 6 Jul 2023 14:43:34 -0700 Subject: [PATCH 06/10] fixed launcher logs- should not move --- theseus/src/api/settings.rs | 8 ++++++-- theseus/src/logger.rs | 8 ++++---- theseus/src/state/dirs.rs | 13 +++++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/theseus/src/api/settings.rs b/theseus/src/api/settings.rs index b5149eca9..872946bf6 100644 --- a/theseus/src/api/settings.rs +++ b/theseus/src/api/settings.rs @@ -111,11 +111,15 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { let entry_path = entry.path(); if let Some(file_name) = entry_path.file_name() { // Ignore settings.json - if file_name == "settings.json" { + if file_name == state::SETTINGS_FILE_NAME { continue; } // Ignore caches folder - if file_name == "caches" { + if file_name == state::CACHES_FOLDER_NAME { + continue; + } + // Ignore modrinth_logs folder + if file_name == state::LAUNCHER_LOGS_FOLDER_NAME { continue; } diff --git a/theseus/src/logger.rs b/theseus/src/logger.rs index 05e64f58c..b715c0ccf 100644 --- a/theseus/src/logger.rs +++ b/theseus/src/logger.rs @@ -44,10 +44,10 @@ pub fn start_logger() -> Option { use tracing_subscriber::prelude::*; // Initialize and get logs directory path - let path = if let Some(dir) = DirectoryInfo::init().ok() { - dir.launcher_logs_dir() + let logs_dir = if let Some(d) = DirectoryInfo::launcher_logs_dir() { + d } else { - eprintln!("Could not create logger."); + eprintln!("Could not start logger"); return None; }; @@ -55,7 +55,7 @@ pub fn start_logger() -> Option { .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("theseus=info")); let file_appender = - RollingFileAppender::new(Rotation::DAILY, path, "theseus.log"); + RollingFileAppender::new(Rotation::DAILY, logs_dir, "theseus.log"); let (non_blocking, guard) = tracing_appender::non_blocking(file_appender); let subscriber = tracing_subscriber::registry() diff --git a/theseus/src/state/dirs.rs b/theseus/src/state/dirs.rs index 9aba6d4ef..9a626606d 100644 --- a/theseus/src/state/dirs.rs +++ b/theseus/src/state/dirs.rs @@ -6,6 +6,10 @@ use tokio::sync::RwLock; use super::{ProfilePathId, Settings}; +pub const SETTINGS_FILE_NAME: &str = "settings.json"; +pub const CACHES_FOLDER_NAME: &str = "caches"; +pub const LAUNCHER_LOGS_FOLDER_NAME: &str = "launcher_logs"; + #[derive(Debug)] pub struct DirectoryInfo { pub settings_dir: PathBuf, // Base settings directory- settings.json and icon cache. @@ -162,8 +166,9 @@ impl DirectoryInfo { } #[inline] - pub async fn launcher_logs_dir(&self) -> PathBuf { - self.config_dir.read().await.join("launcher_logs") + pub fn launcher_logs_dir() -> Option { + Self::get_initial_settings_dir() + .map(|d| d.join(LAUNCHER_LOGS_FOLDER_NAME)) } /// Get the file containing the global database @@ -175,13 +180,13 @@ impl DirectoryInfo { /// Get the settings file for Theseus #[inline] pub fn settings_file(&self) -> PathBuf { - self.settings_dir.join("settings.json") + self.settings_dir.join(SETTINGS_FILE_NAME) } /// Get the cache directory for Theseus #[inline] pub fn caches_dir(&self) -> PathBuf { - self.settings_dir.join("caches") + self.settings_dir.join(CACHES_FOLDER_NAME) } #[inline] From 2a6a3efb26c17332035608ab30003ba9a8efd5ed Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 20 Jul 2023 12:26:45 -0700 Subject: [PATCH 07/10] merge conflicts --- theseus/src/api/logs.rs | 4 ++-- theseus/src/api/process.rs | 5 ++++- theseus/src/api/profile.rs | 9 +++++---- theseus/src/api/profile_create.rs | 3 +-- theseus/src/api/settings.rs | 14 ++++++++++---- theseus/src/launcher/mod.rs | 3 ++- theseus/src/state/profiles.rs | 14 ++++++++------ 7 files changed, 32 insertions(+), 20 deletions(-) diff --git a/theseus/src/api/logs.rs b/theseus/src/api/logs.rs index a62a48c85..2e3420ee2 100644 --- a/theseus/src/api/logs.rs +++ b/theseus/src/api/logs.rs @@ -1,7 +1,7 @@ use crate::{ util::io::{self, IOError}, - {state::ProfilePathId, State, -}}; + {state::ProfilePathId, State}, +}; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug)] diff --git a/theseus/src/api/process.rs b/theseus/src/api/process.rs index 953513caf..c9a86293d 100644 --- a/theseus/src/api/process.rs +++ b/theseus/src/api/process.rs @@ -2,13 +2,16 @@ use uuid::Uuid; -use crate::{state::{MinecraftChild, ProfilePathId}, util::io::IOError}; pub use crate::{ state::{ Hooks, JavaSettings, MemorySettings, Profile, Settings, WindowSize, }, State, }; +use crate::{ + state::{MinecraftChild, ProfilePathId}, + util::io::IOError, +}; // Gets whether a child process stored in the state by UUID has finished #[tracing::instrument] diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs index aa9e9ac10..53b3a845d 100644 --- a/theseus/src/api/profile.rs +++ b/theseus/src/api/profile.rs @@ -668,7 +668,7 @@ pub async fn get_potential_override_folders( while let Some(entry) = read_dir .next_entry() .await - .map_err(|e| IOError::with_path(e, &profile_path))? + .map_err(|e| IOError::with_path(e, &profile_base_dir))? { let path: PathBuf = entry.path(); if path.is_dir() { @@ -677,7 +677,7 @@ pub async fn get_potential_override_folders( while let Some(entry) = read_dir .next_entry() .await - .map_err(|e| IOError::with_path(e, &profile_path))? + .map_err(|e| IOError::with_path(e, &profile_base_dir))? { let path: PathBuf = entry.path(); let name = path.strip_prefix(&profile_base_dir)?.to_path_buf(); @@ -744,11 +744,12 @@ pub async fn run_credentials( // TODO: hook parameters let mut cmd = hook.split(' '); if let Some(command) = cmd.next() { + let full_path = path.get_full_path().await?; let result = Command::new(command) .args(&cmd.collect::>()) - .current_dir(path.get_full_path().await?) + .current_dir(&full_path) .spawn() - .map_err(|e| IOError::with_path(e, path))? + .map_err(|e| IOError::with_path(e, &full_path))? .wait() .await .map_err(IOError::from)?; diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index 8698b83bb..fabd313f4 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -77,8 +77,7 @@ pub async fn profile_create( let result = async { if let Some(ref icon) = icon { let bytes = - io::read(state.directories.caches_dir().join(icon)) - .await?; + io::read(state.directories.caches_dir().join(icon)).await?; profile .set_icon( &state.directories.caches_dir(), diff --git a/theseus/src/api/settings.rs b/theseus/src/api/settings.rs index 872946bf6..b24b9e03a 100644 --- a/theseus/src/api/settings.rs +++ b/theseus/src/api/settings.rs @@ -2,11 +2,13 @@ use std::path::PathBuf; -use tokio::{fs, sync::RwLock}; +use io::IOError; +use tokio::sync::RwLock; use crate::{ prelude::DirectoryInfo, state::{self, Profiles}, + util::io, }; pub use crate::{ state::{ @@ -106,8 +108,12 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { state_write.directories = DirectoryInfo::init(&settings)?; // Move all files over from state_write.directories.config_dir to new_config_dir - let mut entries = fs::read_dir(old_config_dir).await?; - while let Some(entry) = entries.next_entry().await? { + let mut entries = io::read_dir(&old_config_dir).await?; + while let Some(entry) = entries + .next_entry() + .await + .map_err(|e| IOError::with_path(e, &old_config_dir))? + { let entry_path = entry.path(); if let Some(file_name) = entry_path.file_name() { // Ignore settings.json @@ -124,7 +130,7 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { } let new_path = new_config_dir.join(file_name); - fs::rename(entry_path, new_path).await?; + io::rename(entry_path, new_path).await?; } } diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index 2090c3e91..89ec1a70a 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -124,7 +124,8 @@ pub async fn install_minecraft( State::sync().await?; let state = State::get().await?; - let instance_path = &io::canonicalize(&profile.get_profile_full_path().await?)?; + let instance_path = + &io::canonicalize(&profile.get_profile_full_path().await?)?; let metadata = state.metadata.read().await; let version = metadata diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index daad8de71..b61268f10 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -54,9 +54,10 @@ pub struct ProfilePathId(PathBuf); impl ProfilePathId { // Create a new ProfilePathId from a full file path pub async fn from_fs_path(path: PathBuf) -> crate::Result { - let path: PathBuf = canonicalize(path)?; - let profiles_dir = - canonicalize(State::get().await?.directories.profiles_dir().await)?; + let path: PathBuf = io::canonicalize(path)?; + let profiles_dir = io::canonicalize( + State::get().await?.directories.profiles_dir().await, + )?; path.strip_prefix(profiles_dir) .ok() .and_then(|p| p.file_name()) @@ -101,9 +102,10 @@ pub struct ProjectPathId(pub PathBuf); impl ProjectPathId { // Create a new ProjectPathId from a full file path pub async fn from_fs_path(path: PathBuf) -> crate::Result { - let path: PathBuf = canonicalize(path)?; - let profiles_dir: PathBuf = - canonicalize(State::get().await?.directories.profiles_dir().await)?; + let path: PathBuf = io::canonicalize(path)?; + let profiles_dir: PathBuf = io::canonicalize( + State::get().await?.directories.profiles_dir().await, + )?; path.strip_prefix(profiles_dir) .ok() .map(|p| p.components().skip(1).collect::()) From 2db3ac1acb3fff3ebd743068f56b02954f3ca478 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 20 Jul 2023 13:35:03 -0700 Subject: [PATCH 08/10] requested fixes --- theseus/src/api/profile.rs | 13 +++++++++ theseus/src/api/profile_create.rs | 44 +++++++++++++++---------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs index 53b3a845d..fd11085f5 100644 --- a/theseus/src/api/profile.rs +++ b/theseus/src/api/profile.rs @@ -539,6 +539,19 @@ pub async fn export_mrpack( )) })?; + // remove .DS_Store files from included_overrides + let included_overrides = included_overrides + .into_iter() + .filter(|x| { + if let Some(f) = PathBuf::from(x).file_name() { + if f.to_string_lossy().starts_with(".DS_Store") { + return false; + } + } + true + }) + .collect::>(); + let profile_base_path = &profile.get_profile_full_path().await?; let mut file = File::create(&export_path) diff --git a/theseus/src/api/profile_create.rs b/theseus/src/api/profile_create.rs index fabd313f4..9a6747d8a 100644 --- a/theseus/src/api/profile_create.rs +++ b/theseus/src/api/profile_create.rs @@ -10,10 +10,8 @@ pub use crate::{ State, }; use daedalus::modded::LoaderVersion; -use futures::prelude::*; - use std::path::PathBuf; -use tokio_stream::wrappers::ReadDirStream; + use tracing::{info, trace}; use uuid::Uuid; @@ -23,7 +21,7 @@ use uuid::Uuid; #[theseus_macros::debug_pin] #[allow(clippy::too_many_arguments)] pub async fn profile_create( - name: String, // the name of the profile, and relative path + mut name: String, // the name of the profile, and relative path game_version: String, // the game version of the profile modloader: ModLoader, // the modloader to use loader_version: Option, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader. defaults to latest @@ -35,28 +33,30 @@ pub async fn profile_create( trace!("Creating new profile. {}", name); let state = State::get().await?; let uuid = Uuid::new_v4(); - let path = state.directories.profiles_dir().await.join(&name); + + let mut path = state.directories.profiles_dir().await.join(&name); if path.exists() { - if !path.is_dir() { - return Err(ProfileCreationError::NotFolder.into()); - } - if path.join("profile.json").exists() { - return Err(ProfileCreationError::ProfileExistsError( - path.join("profile.json"), - ) - .into()); + let mut new_name; + let mut new_path; + let mut which = 1; + loop { + new_name = format!("{name} ({which})"); + new_path = state.directories.profiles_dir().await.join(&new_name); + if !new_path.exists() { + break; + } + which += 1; } - if ReadDirStream::new(io::read_dir(&path).await?) - .next() - .await - .is_some() - { - return Err(ProfileCreationError::NotEmptyFolder.into()); - } - } else { - io::create_dir_all(&path).await?; + tracing::debug!( + "Folder collision: {}, renaming to: {}", + path.display(), + new_path.display() + ); + path = new_path; + name = new_name; } + io::create_dir_all(&path).await?; info!( "Creating profile at path {}", From e90574493cca3668a06a44ee4ab58613e4b6806a Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 20 Jul 2023 14:27:29 -0700 Subject: [PATCH 09/10] loading bar --- theseus/src/api/settings.rs | 28 ++++++++++++++++++++++++++++ theseus/src/event/mod.rs | 3 +++ 2 files changed, 31 insertions(+) diff --git a/theseus/src/api/settings.rs b/theseus/src/api/settings.rs index b24b9e03a..aa33dcc06 100644 --- a/theseus/src/api/settings.rs +++ b/theseus/src/api/settings.rs @@ -6,6 +6,7 @@ use io::IOError; use tokio::sync::RwLock; use crate::{ + event::emit::{emit_loading, init_loading}, prelude::DirectoryInfo, state::{self, Profiles}, util::io, @@ -74,17 +75,29 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { .as_error()); } + let loading_bar = init_loading( + crate::LoadingBarType::ConfigChange { + new_path: new_config_dir.clone(), + }, + 100.0, + "Changing configuration directory", + ) + .await?; + + tracing::trace!("Changing config dir, taking control of the state"); // Take control of the state let mut state_write = State::get_write().await?; let old_config_dir = state_write.directories.config_dir.read().await.clone(); + tracing::trace!("Setting configuration setting"); // Set load config dir setting let settings = { let mut settings = state_write.settings.write().await; settings.loaded_config_dir = Some(new_config_dir.clone()); // Some java paths are hardcoded to within our config dir, so we need to update them + tracing::trace!("Updating java keys"); for key in settings.java_globals.keys() { if let Some(java) = settings.java_globals.get_mut(&key) { // If the path is within the old config dir path, update it to the new config dir @@ -98,16 +111,24 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { } } } + tracing::trace!("Syncing settings"); + settings .sync(&state_write.directories.settings_file()) .await?; settings.clone() }; + tracing::trace!("Reinitializing directory"); // Set new state information state_write.directories = DirectoryInfo::init(&settings)?; + let total_entries = std::fs::read_dir(&old_config_dir) + .map_err(|e| IOError::with_path(e, &old_config_dir))? + .count() as f64; // Move all files over from state_write.directories.config_dir to new_config_dir + tracing::trace!("Renaming folder structure"); + let mut i = 0.0; let mut entries = io::read_dir(&old_config_dir).await?; while let Some(entry) = entries .next_entry() @@ -131,10 +152,15 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { let new_path = new_config_dir.join(file_name); io::rename(entry_path, new_path).await?; + + i += 1.0; + emit_loading(&loading_bar, 90.0 * (i / total_entries), None) + .await?; } } // Reset file watcher + tracing::trace!("Reset file watcher"); let mut file_watcher = state::init_watcher().await?; // Reset profiles (for filepaths, file watcher, etc) @@ -143,6 +169,8 @@ pub async fn set_config_dir(new_config_dir: PathBuf) -> crate::Result<()> { ); state_write.file_watcher = RwLock::new(file_watcher); + emit_loading(&loading_bar, 10.0, None).await?; + // TODO: need to be able to safely error out of this function, reverting the changes tracing::info!( "Successfully switched config folder to: {}", diff --git a/theseus/src/event/mod.rs b/theseus/src/event/mod.rs index 27c3a0fd2..2d5f5370a 100644 --- a/theseus/src/event/mod.rs +++ b/theseus/src/event/mod.rs @@ -181,6 +181,9 @@ pub enum LoadingBarType { profile_path: PathBuf, profile_name: String, }, + ConfigChange { + new_path: PathBuf, + }, } #[derive(Serialize, Clone)] From 8394a2ba4c519a7a4b718ac0cb9fb768d2a53ea1 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Fri, 21 Jul 2023 16:56:19 -0700 Subject: [PATCH 10/10] added comment --- theseus/src/state/profiles.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index b61268f10..b36a67f4d 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -47,7 +47,7 @@ pub enum ProfileInstallStage { } /// newtype wrapper over a Profile path, to be usable as a clear identifier for the kind of path used -/// eg: for "a/b/c/profiles/My Mod", the ProfilePathId would be "My Mod" +/// eg: for "a/b/c/profiles/My Mod", the ProfilePathId would be "My Mod" (a relative path) #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash)] #[serde(transparent)] pub struct ProfilePathId(PathBuf);