Merge pull request #293 from dwall-rs/main

0.1.17

Author: thep0y

Cargo.lock

@@ -4,7 +4,7 @@ members = ["src-tauri", "daemon"]
 
 [workspace.package]
 authors = ["thep0y"]
-version = "0.1.16"
+version = "0.1.17"
 # homepage = ""
 repository = "https://github.com/dwall-rs/dwall"
 license = "AGPL-3.0"

Cargo.toml

@@ -287,7 +287,7 @@ fn notify_theme_change() -> DwallResult<()> {
     ];
 
     for notification in notifications {
-        let theme_name: Vec<u16> = format!("{}\0", notification).encode_utf16().collect();
+        let theme_name = Vec::from_str(notification);
         unsafe {
             if let Err(e) = SendNotifyMessageW(
                 HWND_BROADCAST,

bun.lockb

@@ -213,7 +213,7 @@ impl Config {
     pub fn github_asset_url(&self, github_url: &str) -> String {
         self.github_mirror_template
             .as_ref()
-            .and_then(|v| if v == "" { None } else { Some(v) })
+            .and_then(|v| if v.is_empty() { None } else { Some(v) })
             .and_then(|template| {
                 use regex::Regex;
 

daemon/src/color_mode.rs

@@ -70,13 +70,19 @@ pub struct MonitorInfoProvider {
     cache: Arc<RwLock<MonitorCache>>,
 }
 
-impl MonitorInfoProvider {
-    /// Creates a new MonitorInfoProvider instance
-    pub fn new() -> Self {
+impl Default for MonitorInfoProvider {
+    fn default() -> Self {
         Self {
             cache: Arc::new(RwLock::new(MonitorCache::new())),
         }
     }
+}
+
+impl MonitorInfoProvider {
+    /// Creates a new MonitorInfoProvider instance
+    pub fn new() -> Self {
+        Default::default()
+    }
 
     /// Gets all available monitors with caching
     pub async fn get_monitors(&self) -> DwallResult<HashMap<String, Monitor>> {
@@ -121,7 +127,7 @@ impl MonitorInfoProvider {
         }
 
         // Check if any monitor IDs changed
-        for (id, _) in &current_monitors {
+        for id in current_monitors.keys() {
             if !cached_monitors.contains_key(id) {
                 return Ok(true);
             }
@@ -304,9 +310,11 @@ impl MonitorManager {
 fn query_monitor_info() -> DwallResult<HashMap<String, Monitor>> {
     debug!("Querying monitor information from system");
     let mut monitors = HashMap::new();
-    let mut index = 0;
 
-    for display_path in display_config::query_display_paths()?.into_iter() {
+    for (index, display_path) in display_config::query_display_paths()?
+        .into_iter()
+        .enumerate()
+    {
         let target_info =
             display_config::query_target_name(display_path.adapter_id, display_path.target_id)?;
         let device_path = target_info.monitorDevicePath.to_string();
@@ -333,11 +341,9 @@ fn query_monitor_info() -> DwallResult<HashMap<String, Monitor>> {
                 id: device_path.clone(),
                 device_path,
                 friendly_name,
-                index: Some(index),
+                index: Some(index as u32),
             },
         );
-
-        index += 1;
     }
 
     info!("Found {} monitors in total", monitors.len());

daemon/src/config.rs

@@ -64,10 +64,8 @@ impl SunPosition {
         let y = year + 4800.0 - a;
         let m = month + 12.0 * a - 3.0;
 
-        let jd = day + ((153.0 * m + 2.0) / 5.0) + 365.0 * y + (y / 4.0) - (y / 100.0)
-            + (y / 400.0)
-            - 32045.5;
-        jd
+        day + ((153.0 * m + 2.0) / 5.0) + 365.0 * y + (y / 4.0) - (y / 100.0) + (y / 400.0)
+            - 32045.5
     }
 
     fn time_factor(&self) -> f64 {

daemon/src/monitor/mod.rs

@@ -21,9 +21,7 @@ impl<const N: usize> WideStringExt for [u16; N] {
         let wide_chars: Vec<u16> = OsStr::new(s).encode_wide().collect();
         let copy_len = wide_chars.len().min(N - 1); // Ensure one position is reserved for the null terminator
 
-        for i in 0..copy_len {
-            buf[i] = wide_chars[i];
-        }
+        buf[..copy_len].copy_from_slice(&wide_chars[..copy_len]);
 
         buf
     }

daemon/src/solar.rs

@@ -1,6 +1,6 @@
 {
   "name": "dwall-settings",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "",
   "type": "module",
   "scripts": {
@@ -11,7 +11,9 @@
     "tauri": "tauri",
     "start:dev": "cargo build -p dwall --features log-color && cross-env RUST_BACKTRACE=1 tauri dev --features log-color",
     "check": "biome check --write src",
-    "dev": "bun run start:dev"
+    "dev": "bun run start:dev",
+    "stage": "cargo build -r -p dwall --features log-color && cross-env RUST_BACKTRACE=1 tauri dev --features log-color devtools --release",
+    "test": "vitest"
   },
   "license": "MIT",
   "dependencies": {
@@ -30,9 +32,11 @@
     "@tauri-apps/cli": "^2.4.1",
     "@types/node": "^22.14.0",
     "cross-env": "^7.0.3",
+    "jsdom": "^26.0.0",
     "sass": "^1.86.3",
     "typescript": "^5.8.3",
     "vite": "^6.2.5",
-    "vite-plugin-solid": "^2.11.6"
+    "vite-plugin-solid": "^2.11.6",
+    "vitest": "^3.1.1"
   }
 }

daemon/src/utils/string.rs

@@ -55,3 +55,4 @@ tauri-plugin-process = "2"
 [features]
 default = []
 log-color = ["dwall/log-color"]
+devtools = ["tauri/devtools"]