fix(tb): state being reset

Author: eythaann

changelog.md

@@ -11,6 +11,10 @@
 - log system.
 - icon pack extractor and cache system.
 
+### fix
+
+- toolbar and dock state resetting on widget reload.
+
 ## [2.5.3]
 
 ### fix

src/background/state/application/toolbar_items.rs

@@ -1,15 +1,14 @@
-use std::{
-    collections::HashSet,
-    fs::{create_dir_all, OpenOptions},
-    io::Write,
-};
+use std::collections::HashSet;
 
 use seelen_core::{
     resource::WidgetId,
     state::{ToolbarItem, ToolbarItem2, ToolbarJsScope, ToolbarState},
 };
 
-use crate::{error::Result, utils::constants::SEELEN_COMMON};
+use crate::{
+    error::Result,
+    utils::{atomic_write_file, constants::SEELEN_COMMON},
+};
 
 use super::FullState;
 
@@ -71,17 +70,9 @@ impl FullState {
     }
 
     pub fn write_toolbar_items(&self, items: &ToolbarState) -> Result<()> {
-        let dir = SEELEN_COMMON.widget_data_dir(&WidgetId::known_toolbar());
-        create_dir_all(&dir)?;
-
-        let mut file = OpenOptions::new()
-            .write(true)
-            .create(true)
-            .truncate(true)
-            .open(dir.join("state.yml"))?;
-        file.lock()?;
-        file.write_all(serde_yaml::to_string(items)?.as_bytes())?;
-        file.flush()?;
-        Ok(())
+        let path = SEELEN_COMMON
+            .widget_data_dir(&WidgetId::known_toolbar())
+            .join("state.yml");
+        atomic_write_file(&path, serde_yaml::to_string(items)?.as_bytes())
     }
 }

src/background/state/application/weg_items.rs

@@ -1,17 +1,16 @@
-use std::{
-    fs::{create_dir_all, OpenOptions},
-    io::Write,
-};
-
 use seelen_core::{
     handlers::SeelenEvent,
     resource::WidgetId,
     state::{WegItem, WegItems},
 };
 
 use crate::{
-    app::emit_to_webviews, error::Result, modules::apps::application::msix::MsixAppsManager,
-    trace_lock, utils::constants::SEELEN_COMMON, widgets::weg::weg_items_impl::SEELEN_WEG_STATE,
+    app::emit_to_webviews,
+    error::Result,
+    modules::apps::application::msix::MsixAppsManager,
+    trace_lock,
+    utils::{atomic_write_file, constants::SEELEN_COMMON},
+    widgets::weg::weg_items_impl::SEELEN_WEG_STATE,
 };
 
 use super::FullState;
@@ -66,17 +65,9 @@ impl FullState {
     }
 
     pub fn write_weg_items(&self, items: &WegItems) -> Result<()> {
-        let dir = SEELEN_COMMON.widget_data_dir(&WidgetId::known_weg());
-        create_dir_all(&dir)?;
-
-        let mut file = OpenOptions::new()
-            .write(true)
-            .create(true)
-            .truncate(true)
-            .open(dir.join("state.yml"))?;
-        file.lock()?;
-        file.write_all(serde_yaml::to_string(items)?.as_bytes())?;
-        file.flush()?;
-        Ok(())
+        let path = SEELEN_COMMON
+            .widget_data_dir(&WidgetId::known_weg())
+            .join("state.yml");
+        atomic_write_file(&path, serde_yaml::to_string(items)?.as_bytes())
     }
 }

src/background/state/infrastructure.rs

@@ -29,8 +29,12 @@ pub fn state_get_toolbar_items() -> ToolbarState {
 #[tauri::command(async)]
 pub fn state_write_toolbar_items(mut items: ToolbarState) -> Result<()> {
     items.sanitize();
-    let guard = FULL_STATE.load();
-    guard.write_toolbar_items(&items)
+    FULL_STATE.rcu(|state| {
+        let mut state = state.cloned();
+        state.toolbar_items = items.clone();
+        state
+    });
+    FULL_STATE.load().write_toolbar_items(&items)
 }
 
 #[tauri::command(async)]
@@ -46,7 +50,12 @@ pub fn state_write_weg_items(window: tauri::Window, mut items: WegItems) -> Resu
     {
         return Ok(());
     }
-    guard.write_weg_items(&items)
+    FULL_STATE.rcu(|state| {
+        let mut state = state.cloned();
+        state.weg_items = items.clone();
+        state
+    });
+    FULL_STATE.load().write_weg_items(&items)
 }
 
 #[tauri::command(async)]

src/background/utils/mod.rs

@@ -12,6 +12,8 @@ pub use winver::*;
 
 use std::{
     collections::HashMap,
+    fs::{create_dir_all, File},
+    io::Write,
     path::{Path, PathBuf},
     sync::{atomic::AtomicBool, Arc, LazyLock},
     time::{Duration, Instant, SystemTime, UNIX_EPOCH},
@@ -26,6 +28,23 @@ use windows::{
 
 use crate::{error::Result, get_tokio_handle};
 
+/// Writes `content` to `path` atomically: writes to a sibling `.tmp` file first,
+/// syncs to disk, then renames into place. This guarantees the target file is
+/// never left empty or partially written, even if the process is killed mid-write.
+pub fn atomic_write_file(path: &Path, content: &[u8]) -> Result<()> {
+    let dir = path.parent().ok_or("Path has no parent directory")?;
+    create_dir_all(dir)?;
+
+    let tmp_path = path.with_extension("tmp");
+    let mut file = File::create(&tmp_path)?;
+    file.write_all(content)?;
+    file.flush()?;
+    file.sync_all()?;
+    drop(file); // must close before rename on Windows
+    std::fs::rename(&tmp_path, path)?;
+    Ok(())
+}
+
 pub fn pcwstr(s: &str) -> windows::core::PCWSTR {
     windows::core::PCWSTR::from_raw(s.encode_utf16().chain(Some(0)).collect_vec().as_ptr())
 }

src/background/widgets/mod.rs

@@ -28,7 +28,7 @@ use crate::{
     error::Result,
     resources::RESOURCES,
     state::application::FULL_STATE,
-    utils::{constants::SEELEN_COMMON, lock_free::SyncHashMap},
+    utils::{atomic_write_file, constants::SEELEN_COMMON, lock_free::SyncHashMap},
     widgets::{manager::WIDGET_MANAGER, webview::WidgetWebviewLabel},
     windows_api::{
         input::{Keyboard, Mouse},
@@ -190,7 +190,7 @@ pub fn write_data_file(
 ) -> Result<()> {
     let base_path = widget_data_dir(&webview)?;
     let path = resolve_safe_path(&base_path, &filename)?;
-    std::fs::write(path, content)?;
+    atomic_write_file(&path, content.as_bytes())?;
     Ok(())
 }
 

src/ui/react/toolbar/modules/shared/state/default.ts

@@ -36,7 +36,6 @@ export function restoreStateToDefault() {
     right: [
       "@seelen/tb-system-tray" as PluginId,
       "@seelen/tb-keyboard-selector" as PluginId,
-      "@seelen/keyboard-selector" as PluginId,
       "@seelen/tb-bluetooth-popup" as PluginId,
       "@seelen/tb-network-popup" as PluginId,
       "@seelen/tb-media-popup" as PluginId,