Merge branch 'oneclient/main' into refactor/cleanup

Author: Kathund

.gemini/config.yml

@@ -0,0 +1,4 @@
+code_review:
+  comment_severity_threshold: LOW
+ignore_patterns:
+  - '**/*.gen.ts'

Cargo.lock

@@ -49,6 +49,7 @@ tauri-plugin-clipboard-manager = { version = "=2.2.2" }
 tauri-plugin-deep-link = { version = "=2.2.1" }
 tauri-plugin-dialog = { version = "=2.2.1" }
 tauri-plugin-fs = { version = "=2.2.1" }
+tauri-plugin-os = { version = "=2.2.1" }
 tauri-plugin-single-instance = { version = "=2.2.3" }
 tauri-plugin-updater = { version = "=2.7.1" }
 tauri-plugin-window-state = { version = "=2.2.2" }

Cargo.toml

@@ -37,6 +37,7 @@ tauri-plugin-updater = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
 tauri-plugin-fs = { workspace = true }
+tauri-plugin-os = { workspace = true }
 tauri-plugin-deep-link = { workspace = true }
 
 # code gen

apps/oneclient/desktop/Cargo.toml

@@ -1,3 +1,20 @@
+use std::process::Command;
+use std::time::{SystemTime, UNIX_EPOCH};
+
 fn main() {
+	let output = Command::new("git")
+		.args(&["rev-parse", "HEAD"])
+		.output()
+		.unwrap();
+	let git_hash = String::from_utf8(output.stdout).unwrap();
+	println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+
+	let start = SystemTime::now();
+	let timestamp = start
+		.duration_since(UNIX_EPOCH)
+		.expect("Time went backwards")
+		.as_secs();
+	println!("cargo:rustc-env=BUILD_TIMESTAMP={}", timestamp);
+
 	tauri_build::build();
 }

apps/oneclient/desktop/build.rs

@@ -36,6 +36,8 @@
 		"fs:allow-download-read",
 		"fs:allow-download-write",
 		"fs:allow-data-read-recursive",
-		"fs:allow-data-write-recursive"
+		"fs:allow-data-write-recursive",
+
+		"os:default"
 	]
 }

apps/oneclient/desktop/capabilities/default.json

@@ -4,32 +4,27 @@ use onelauncher_core::api::cluster::dao::ClusterId;
 use onelauncher_core::api::packages::modpack::data::ModpackArchive;
 use onelauncher_core::entity::clusters;
 use onelauncher_core::error::LauncherResult;
-use tauri::Runtime;
 
 use crate::oneclient::bundles::BundlesManager;
+use crate::oneclient::clusters::{OnlineClusterManifest, get_data_storage_versions};
 
 #[taurpc::procedures(path = "oneclient", export_to = "../frontend/src/bindings.gen.ts")]
 pub trait OneClientApi {
-	#[taurpc(alias = "openDevTools")]
-	async fn open_dev_tools<R: Runtime>(webview_window: tauri::WebviewWindow<R>);
-
 	#[taurpc(alias = "getClustersGroupedByMajor")]
 	async fn get_clusters_grouped_by_major() -> LauncherResult<HashMap<u32, Vec<clusters::Model>>>;
 
 	#[taurpc(alias = "getBundlesFor")]
 	async fn get_bundles_for(cluster_id: ClusterId) -> LauncherResult<Vec<ModpackArchive>>;
+
+	#[taurpc(alias = "getVersions")]
+	async fn get_versions() -> LauncherResult<OnlineClusterManifest>;
 }
 
 #[taurpc::ipc_type]
 pub struct OneClientApiImpl;
 
 #[taurpc::resolvers]
 impl OneClientApi for OneClientApiImpl {
-	async fn open_dev_tools<R: Runtime>(self, webview_window: tauri::WebviewWindow<R>) {
-		#[cfg(feature = "devtools")]
-		webview_window.open_devtools();
-	}
-
 	async fn get_clusters_grouped_by_major(
 		self,
 	) -> LauncherResult<HashMap<u32, Vec<clusters::Model>>> {
@@ -72,4 +67,8 @@ impl OneClientApi for OneClientApiImpl {
 
 		Ok(bundles)
 	}
+
+	async fn get_versions(self) -> LauncherResult<OnlineClusterManifest> {
+		get_data_storage_versions().await
+	}
 }