eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Folder names (#318)

Browse Source
This commit is contained in:
Wyatt Verchere
2023-07-21 20:16:07 -07:00
committed by GitHub
parent 4941260805
commit 3fa33dc241
42 changed files with 1129 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
theseus_cli/src/subcommands/profile.rs
View File

@@ -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?;

2
theseus_cli/src/subcommands/user.rs
View File

@@ -151,7 +151,7 @@ impl UserDefault {
) -> Result<()> {
info!("Setting user {} as default", self.user.as_hyphenated());
let state: std::sync::Arc<State> = State::get().await?;
let state = State::get().await?;
let mut settings = state.settings.write().await;
if settings.default_user == Some(self.user) {