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

box::pin in run(),clippy (#115)

Browse Source
This commit is contained in:
Wyatt Verchere
2023-05-12 11:53:41 -07:00
committed by GitHub
parent ee0c91aa80
commit 5cb54b44be
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
theseus/src/api/profile.rs
View File

@@ -391,23 +391,26 @@ pub async fn remove_project(
/// failing with an error if no credentials are available /// failing with an error if no credentials are available
#[tracing::instrument] #[tracing::instrument]
pub async fn run(path: &Path) -> crate::Result<Arc<RwLock<MinecraftChild>>> { pub async fn run(path: &Path) -> crate::Result<Arc<RwLock<MinecraftChild>>> {
let state = State::get().await?; Box::pin(async move {
let state = State::get().await?;
// Get default account and refresh credentials (preferred way to log in) // Get default account and refresh credentials (preferred way to log in)
let default_account = state.settings.read().await.default_user; let default_account = state.settings.read().await.default_user;
let credentials = if let Some(default_account) = default_account { let credentials = if let Some(default_account) = default_account {
refresh(default_account).await? refresh(default_account).await?
} else {
// If no default account, try to use a logged in account
let users = auth::users().await?;
let last_account = users.first();
if let Some(last_account) = last_account {
refresh(last_account.id).await?
} else { } else {
return Err(crate::ErrorKind::NoCredentialsError.as_error()); // If no default account, try to use a logged in account
} let users = auth::users().await?;
}; let last_account = users.first();
run_credentials(path, &credentials).await if let Some(last_account) = last_account {
refresh(last_account.id).await?
} else {
return Err(crate::ErrorKind::NoCredentialsError.as_error());
}
};
run_credentials(path, &credentials).await
})
.await
} }
/// Run Minecraft using a profile, and credentials for authentication /// Run Minecraft using a profile, and credentials for authentication

2
theseus_gui/src-tauri/src/api/profile.rs
View File

@@ -216,7 +216,7 @@ pub async fn profile_edit(
path: &Path, path: &Path,
edit_profile: EditProfile, edit_profile: EditProfile,
) -> Result<()> { ) -> Result<()> {
profile::edit(&path, |prof| { profile::edit(path, |prof| {
if let Some(metadata) = edit_profile.metadata.clone() { if let Some(metadata) = edit_profile.metadata.clone() {
if let Some(name) = metadata.name { if let Some(name) = metadata.name {
prof.metadata.name = name prof.metadata.name = name

4
theseus_playground/src/main.rs
View File

@@ -6,8 +6,8 @@
use dunce::canonicalize; use dunce::canonicalize;
use theseus::jre::autodetect_java_globals; use theseus::jre::autodetect_java_globals;
use theseus::prelude::*; use theseus::prelude::*;
use theseus::profile::install;
use theseus::profile_create::profile_create;
use tokio::time::{sleep, Duration}; use tokio::time::{sleep, Duration};
use tracing_error::ErrorLayer; use tracing_error::ErrorLayer;