wip

Author: jacob-pro

Cargo.lock

@@ -32,7 +32,6 @@ human-repr = "1.1.0"
 image = "0.24.7"
 itertools = "0.11.0"
 log = "0.4.14"
-maplit = "1.0.2"
 png = "0.17.10"
 pollster = "0.3.0"
 serde = { version = "1.0.110", features = ["derive"] }

Cargo.toml

@@ -1,9 +1,9 @@
 use crate::calculator::calculate_brightness;
-use crate::config::{BrightnessValues, Location, MonitorOverride};
+use crate::config::{BrightnessValues, Location, MonitorOverride, MonitorProperty};
 use brightness::blocking::{Brightness, BrightnessDevice};
-use maplit::btreemap;
+use itertools::Itertools;
 use serde::Serialize;
-use std::collections::BTreeMap;
+use std::collections::HashMap;
 use std::time::{SystemTime, UNIX_EPOCH};
 use sunrise_sunset_calculator::SunriseSunsetParameters;
 use wildmatch::WildMatch;
@@ -34,12 +34,22 @@ impl From<sunrise_sunset_calculator::SunriseSunsetResult> for SunriseSunsetResul
 
 #[derive(Debug, Serialize)]
 pub struct MonitorResult {
-    pub device_name: String,
-    pub properties: BTreeMap<&'static str, String>,
+    pub properties: MonitorProperties,
     pub brightness: Option<BrightnessDetails>,
     pub error: Option<String>,
 }
 
+#[derive(Debug, Serialize)]
+pub struct MonitorProperties {
+    pub device_name: String,
+    #[cfg(windows)]
+    pub device_description: String,
+    #[cfg(windows)]
+    pub device_key: String,
+    #[cfg(windows)]
+    pub device_path: String,
+}
+
 #[derive(Debug, Serialize)]
 pub struct BrightnessDetails {
     pub expiry_time: Option<i64>,
@@ -50,15 +60,15 @@ pub struct BrightnessDetails {
 
 pub struct MonitorOverrideCompiled {
     pub pattern: WildMatch,
-    pub key: String,
+    pub key: MonitorProperty,
     pub brightness: Option<BrightnessValues>,
 }
 
 impl From<&MonitorOverride> for MonitorOverrideCompiled {
     fn from(value: &MonitorOverride) -> Self {
         Self {
             pattern: WildMatch::new(&value.pattern),
-            key: value.key.clone(),
+            key: value.key,
             brightness: value.brightness.clone(),
         }
     }
@@ -67,10 +77,11 @@ impl From<&MonitorOverride> for MonitorOverrideCompiled {
 /// Find the first override that matches this monitor's properties
 fn match_monitor<'o>(
     overrides: &'o [MonitorOverrideCompiled],
-    monitor: &BTreeMap<&'static str, String>,
+    monitor: &MonitorProperties,
 ) -> Option<&'o MonitorOverrideCompiled> {
+    let map = monitor.to_map();
     for o in overrides {
-        if let Some(value) = monitor.get(o.key.as_str()) {
+        if let Some(value) = map.get(&o.key) {
             if o.pattern.matches(value) {
                 return Some(o);
             }
@@ -108,8 +119,7 @@ pub fn apply_brightness(
     let monitor_results = monitors
         .into_iter()
         .map(|m| {
-            let device_name = m.device_name().unwrap_or_default();
-            let properties = get_properties(&m).unwrap_or_default();
+            let properties = MonitorProperties::from_device(&m);
             let monitor_values = match match_monitor(&overrides, &properties) {
                 None => Some(BrightnessValues {
                     brightness_day,
@@ -132,25 +142,28 @@ pub fn apply_brightness(
                 );
                 log::debug!(
                     "Computed brightness for '{}' = {:?} (day={}) (night={})",
-                    device_name,
+                    properties.device_name,
                     brightness,
                     brightness_day,
                     brightness_night
                 );
 
                 let error = m.set(brightness.brightness).err();
                 if let Some(err) = error.as_ref() {
-                    log::error!("Failed to set brightness for '{}': {:?}", device_name, err);
+                    log::error!(
+                        "Failed to set brightness for '{}': {:?}",
+                        properties.device_name,
+                        err
+                    );
                 } else {
                     log::info!(
                         "Successfully set brightness for '{}' to {}%",
-                        device_name,
+                        properties.device_name,
                         brightness.brightness
                     );
                 }
 
                 MonitorResult {
-                    device_name,
                     properties,
                     brightness: Some(BrightnessDetails {
                         expiry_time: brightness.expiry_time,
@@ -161,15 +174,18 @@ pub fn apply_brightness(
                     error: error.map(|e| e.to_string()),
                 }
             } else {
-                log::info!("Skipping '{}' due to monitor override", device_name,);
+                log::info!(
+                    "Skipping '{}' due to monitor override",
+                    properties.device_name
+                );
                 MonitorResult {
-                    device_name,
                     properties,
                     brightness: None,
                     error: None,
                 }
             }
         })
+        .sorted_by_key(|m| m.properties.device_name.clone())
         .collect::<Vec<_>>();
 
     ApplyResults {
@@ -179,24 +195,30 @@ pub fn apply_brightness(
     }
 }
 
-#[cfg(windows)]
-pub fn get_properties(
-    device: &BrightnessDevice,
-) -> Result<BTreeMap<&'static str, String>, brightness::Error> {
-    use brightness::blocking::windows::BrightnessExt;
-    Ok(btreemap! {
-        "device_name" => device.device_name()?,
-        "device_description" => device.device_description()?,
-        "device_key" => device.device_registry_key()?,
-        "device_path" => device.device_path()?,
-    })
-}
+impl MonitorProperties {
+    fn from_device(device: &BrightnessDevice) -> Self {
+        #[cfg(windows)]
+        use brightness::blocking::windows::BrightnessExt;
+        Self {
+            device_name: device.device_name().unwrap(),
+            #[cfg(windows)]
+            device_description: device.device_description().unwrap(),
+            #[cfg(windows)]
+            device_key: device.device_registry_key().unwrap(),
+            #[cfg(windows)]
+            device_path: device.device_path().unwrap(),
+        }
+    }
 
-#[cfg(target_os = "linux")]
-pub fn get_properties(
-    device: &BrightnessDevice,
-) -> Result<BTreeMap<&'static str, String>, brightness::Error> {
-    Ok(btreemap! {
-        "device_name" => device.device_name()?,
-    })
+    pub fn to_map(&self) -> HashMap<MonitorProperty, &str> {
+        let mut map = HashMap::<_, &str>::new();
+        map.insert(MonitorProperty::DeviceName, &self.device_name);
+        #[cfg(windows)]
+        {
+            map.insert(MonitorProperty::DeviceDescription, &self.device_description);
+            map.insert(MonitorProperty::DeviceKey, &self.device_key);
+            map.insert(MonitorProperty::DevicePath, &self.device_path);
+        }
+        map
+    }
 }

src/apply.rs

@@ -1,7 +1,7 @@
 //! SSB Config file definition
-
 use crate::common::config_directory;
 use anyhow::Context;
+use enum_iterator::Sequence;
 use serde::{Deserialize, Serialize};
 use std::fs;
 use std::io::Write;
@@ -34,10 +34,33 @@ pub struct SsbConfig {
     pub overrides: Vec<MonitorOverride>,
 }
 
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, Eq, Hash, PartialEq, Sequence)]
+#[serde(rename_all = "snake_case")]
+pub enum MonitorProperty {
+    DeviceName,
+    #[cfg(windows)]
+    DeviceDescription,
+    #[cfg(windows)]
+    DeviceKey,
+    #[cfg(windows)]
+    DevicePath,
+}
+
+impl MonitorProperty {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            MonitorProperty::DeviceName => "Device Name",
+            MonitorProperty::DeviceDescription => "Device Description",
+            MonitorProperty::DeviceKey => "Device Key",
+            MonitorProperty::DevicePath => "Device Path",
+        }
+    }
+}
+
 #[derive(Debug, Deserialize, Serialize, Validate, Clone)]
 pub struct MonitorOverride {
     pub pattern: String,
-    pub key: String,
+    pub key: MonitorProperty,
     #[validate]
     pub brightness: Option<BrightnessValues>,
 }

src/config.rs

@@ -4,6 +4,7 @@ use crate::controller::Message;
 use crate::gui::brightness_settings::BrightnessSettingsPage;
 use crate::gui::help::HelpPage;
 use crate::gui::location_settings::LocationSettingsPage;
+use crate::gui::monitor_overrides::MonitorOverridePage;
 use crate::gui::status::StatusPage;
 use crate::gui::UserEvent;
 use egui::{Align, Color32, Layout, ScrollArea};
@@ -24,6 +25,7 @@ pub struct SsbEguiApp {
     brightness_settings_page: BrightnessSettingsPage,
     pub location_settings_page: LocationSettingsPage,
     help_page: HelpPage,
+    monitor_override_page: MonitorOverridePage,
     context: AppState,
     pub modal: Option<Box<dyn Modal>>,
 }
@@ -55,6 +57,7 @@ enum PageId {
     Status,
     BrightnessSettings,
     LocationSettings,
+    MonitorOverrides,
     Help,
 }
 
@@ -65,6 +68,7 @@ impl PageId {
             PageId::BrightnessSettings => "Brightness Settings",
             PageId::LocationSettings => "Location Settings",
             PageId::Help => "Help",
+            PageId::MonitorOverrides => "Monitor Overrides",
         }
     }
 
@@ -74,6 +78,7 @@ impl PageId {
             PageId::BrightnessSettings => "🔅",
             PageId::LocationSettings => "🌐",
             PageId::Help => "❔",
+            PageId::MonitorOverrides => "💻",
         }
     }
 }
@@ -143,6 +148,7 @@ impl SsbEguiApp {
             selected_page: PageId::Status,
             brightness_settings_page: BrightnessSettingsPage::from_config(&config_read),
             location_settings_page: LocationSettingsPage::from_config(&config_read),
+            monitor_override_page: MonitorOverridePage::from_config(&config_read),
             modal: None,
             context: AppState {
                 main_loop,
@@ -221,6 +227,9 @@ impl SsbEguiApp {
                     self.location_settings_page.render(ui, &mut self.context)
                 }
                 PageId::Help => self.help_page.render(ui, &mut self.context),
+                PageId::MonitorOverrides => {
+                    self.monitor_override_page.render(ui, &mut self.context)
+                }
             }
         });
     }

src/gui/app.rs

@@ -2,6 +2,7 @@ pub mod app;
 mod brightness_settings;
 mod help;
 mod location_settings;
+mod monitor_overrides;
 mod status;
 
 use crate::common::APP_NAME;