You've already forked AstralRinth
forked from didirus/AstralRinth
16f297b546
* Adds markup to Settings page. * Fixes card styling. Makes theme a dropdown. Fleshes out theme store and helpers. * Settings wired up to backend. Omorphia package bumped. * settings not syncing * Further polishes Global Settings. * Post-merge cleanup. * Cleans up code. Ensures Java versions are present. * Wires up auto-detect modal. Wires up Java version browse. Styling updates. * Styling inputs. Adjusts modals. * Removes theme helpers. Removes unnecessary classes. * Always displays settings save btn. Watch code removed. New Card added. * Cleans up merge from master. Adds AnimatedLogo to settings. * Installs updated Omorphia. Removes unnecessary styles. Fixes loading logo position. * Starts wiring up theming to settings. Adds Tauri command to get just theme. * Settings page polish. allowList updated. * Condenses modals into one. Implements JRE checking. * Updates Omorphia package. Removes unnecessary styles. * Removes get_theme. Styling changes. * Changes appbar background for light-mode. * Fixes * fix color with var --------- Co-authored-by: thesuzerain <wverchere@gmail.com> Co-authored-by: Jai A <jaiagr+gpg@pm.me>
83 lines
2.8 KiB
Rust
83 lines
2.8 KiB
Rust
use crate::api::Result;
|
|
use serde::{Deserialize, Serialize};
|
|
use theseus::prelude::*;
|
|
|
|
// Identical to theseus::settings::Settings except for the custom_java_args field
|
|
// This allows us to split the custom_java_args string into a Vec<String> here and join it back into a string in the backend
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
pub struct FrontendSettings {
|
|
pub theme: Theme,
|
|
pub memory: MemorySettings,
|
|
pub game_resolution: WindowSize,
|
|
pub custom_java_args: String,
|
|
pub custom_env_args: String,
|
|
pub java_globals: JavaGlobals,
|
|
pub default_user: Option<uuid::Uuid>,
|
|
pub hooks: Hooks,
|
|
pub max_concurrent_downloads: usize,
|
|
pub version: u32,
|
|
}
|
|
|
|
// Get full settings
|
|
// invoke('settings_get')
|
|
#[tauri::command]
|
|
pub async fn settings_get() -> Result<FrontendSettings> {
|
|
let backend_settings = settings::get().await?;
|
|
let frontend_settings = FrontendSettings {
|
|
theme: backend_settings.theme,
|
|
memory: backend_settings.memory,
|
|
game_resolution: backend_settings.game_resolution,
|
|
custom_java_args: backend_settings.custom_java_args.join(" "),
|
|
custom_env_args: backend_settings
|
|
.custom_env_args
|
|
.into_iter()
|
|
.map(|(s1, s2)| format!("{s1}={s2}"))
|
|
.collect::<Vec<String>>()
|
|
.join(" "),
|
|
java_globals: backend_settings.java_globals,
|
|
default_user: backend_settings.default_user,
|
|
hooks: backend_settings.hooks,
|
|
max_concurrent_downloads: backend_settings.max_concurrent_downloads,
|
|
version: backend_settings.version,
|
|
};
|
|
Ok(frontend_settings)
|
|
}
|
|
|
|
// Set full settings
|
|
// invoke('settings_set', settings)
|
|
#[tauri::command]
|
|
pub async fn settings_set(settings: FrontendSettings) -> Result<()> {
|
|
let custom_env_args: Vec<(String, String)> = settings
|
|
.custom_env_args
|
|
.split_whitespace()
|
|
.map(|s| s.to_string())
|
|
.flat_map(|f| {
|
|
let mut split = f.split('=');
|
|
if let (Some(name), Some(value)) = (split.next(), split.next()) {
|
|
Some((name.to_string(), value.to_string()))
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.collect::<Vec<(String, String)>>();
|
|
|
|
let backend_settings = Settings {
|
|
theme: settings.theme,
|
|
memory: settings.memory,
|
|
game_resolution: settings.game_resolution,
|
|
custom_java_args: settings
|
|
.custom_java_args
|
|
.split_whitespace()
|
|
.map(|s| s.to_string())
|
|
.collect(),
|
|
custom_env_args,
|
|
java_globals: settings.java_globals,
|
|
default_user: settings.default_user,
|
|
hooks: settings.hooks,
|
|
max_concurrent_downloads: settings.max_concurrent_downloads,
|
|
version: settings.version,
|
|
};
|
|
settings::set(backend_settings).await?;
|
|
Ok(())
|
|
}
|