From b986121708dbf24c7aa720eea960e42689273680 Mon Sep 17 00:00:00 2001 From: Huakun Shen Date: Wed, 19 Feb 2025 08:58:29 -0500 Subject: [PATCH] feat(desktop): improve app config loading, Merge loaded config with default config --- apps/desktop/src-tauri/src/lib.rs | 1 + apps/desktop/src/lib/stores/appConfig.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs index 76ead7c..8ccf218 100644 --- a/apps/desktop/src-tauri/src/lib.rs +++ b/apps/desktop/src-tauri/src/lib.rs @@ -66,6 +66,7 @@ pub fn run() { // ); // } if KUNKUN_PUBLISH == "true" { + // only include updater with KUNKUN_PUBLISH = true, this is used to avoid using updater in beta build CI, which requires secrets for the updater endpoint if updater is included println!("KUNKUN_PUBLISH: {}", KUNKUN_PUBLISH); builder = builder.plugin(tauri_plugin_updater::Builder::new().build()); } diff --git a/apps/desktop/src/lib/stores/appConfig.ts b/apps/desktop/src/lib/stores/appConfig.ts index 0feb422..eccaad0 100644 --- a/apps/desktop/src/lib/stores/appConfig.ts +++ b/apps/desktop/src/lib/stores/appConfig.ts @@ -48,7 +48,10 @@ function createAppConfig(): WithSyncStore & Ap async function init() { debug("Initializing app config") const persistStore = await load("kk-config.json", { autoSave: true }) - const loadedConfig = await persistStore.get("config") + let loadedConfig = await persistStore.get("config") + if (typeof loadedConfig === "object") { + loadedConfig = { ...defaultAppConfig, ...loadedConfig } + } const parseRes = v.safeParse(PersistedAppConfig, loadedConfig) if (parseRes.success) { console.log("Parse Persisted App Config Success", parseRes.output)