hk/kunkun
1
0
Fork 0
mirror of https://github.com/kunkunsh/kunkun.git synced 2025-04-04 14:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(desktop): improve app config loading,

Browse Source 
Merge loaded config with default config
This commit is contained in:
Huakun Shen 2025-02-19 08:58:29 -05:00
parent 369a9719fd
commit b986121708
No known key found for this signature in database
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/src-tauri/src/lib.rs
View File

@ -66,6 +66,7 @@ pub fn run() {
// ); // );
// } // }
if KUNKUN_PUBLISH == "true" { 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); println!("KUNKUN_PUBLISH: {}", KUNKUN_PUBLISH);
builder = builder.plugin(tauri_plugin_updater::Builder::new().build()); builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
} }

5
apps/desktop/src/lib/stores/appConfig.ts
View File

@ -48,7 +48,10 @@ function createAppConfig(): WithSyncStore<AppConfig & { language: string }> & Ap
async function init() { async function init() {
debug("Initializing app config") debug("Initializing app config")
const persistStore = await load("kk-config.json", { autoSave: true }) 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) const parseRes = v.safeParse(PersistedAppConfig, loadedConfig)
if (parseRes.success) { if (parseRes.success) {
console.log("Parse Persisted App Config Success", parseRes.output) console.log("Parse Persisted App Config Success", parseRes.output)