Refactor idea

maximbaz · Mar 30, 2024 · df7c4d4 · df7c4d4
1 parent 2a68e4c
commit df7c4d4
Showing 1 changed file with 17 additions and 33 deletions.
diff --git a/src/brightness/ddcutil.rs b/src/brightness/ddcutil.rs
@@ -19,7 +19,9 @@ pub struct DdcUtil {
 
 impl DdcUtil {
     pub fn new(name: &str, min_brightness: u64) -> Result<Self, Box<dyn Error>> {
-        let mut display = find_display_by_name(name).or_else(|| {find_display_by_name_ignore_cap_check(name)}).ok_or("Unable to find display")?;
+        let mut display = find_display_by_name(name, true)
+            .or_else(|| find_display_by_name(name, false))
+            .ok_or("Unable to find display")?;
         let max_brightness = get_max_brightness(&mut display)?;
 
         Ok(Self {
@@ -63,11 +65,16 @@ fn get_max_brightness(display: &mut Display) -> Result<u64, Box<dyn Error>> {
         .maximum() as u64)
 }
 
-fn find_display_by_name(name: &str) -> Option<Display> {
+fn find_display_by_name(name: &str, check_caps: bool) -> Option<Display> {
     let displays = ddc_hi::Display::enumerate()
         .into_iter()
         .filter_map(|mut display| {
-            display.update_capabilities().ok().map(|_| {
+            let caps = if check_caps {
+                display.update_capabilities()
+            } else {
+                Ok(())
+            };
+            caps.ok().map(|_| {
                 let empty = "".to_string();
                 let merged = format!(
                     "{} {}",
@@ -80,44 +87,21 @@ fn find_display_by_name(name: &str) -> Option<Display> {
         .collect_vec();
 
     log::debug!(
-        "Discovered displays: {:?}",
+        "Discovered displays (check_caps={}): {:?}",
+        check_caps,
         displays.iter().map(|(name, _)| name).collect_vec()
     );
 
     displays.into_iter().find_map(|(merged, display)| {
         merged
             .contains(name)
             .then(|| {
-                log::debug!("Using display '{}' for config '{}'", merged, name);
-            })
-            .map(|_| display)
-    })
-}
-
-fn find_display_by_name_ignore_cap_check(name: &str) -> Option<Display> {
-    let displays = ddc_hi::Display::enumerate()
-        .into_iter()
-        .filter_map(|display| {
-                let empty = "".to_string();
-                let merged = format!(
-                    "{} {}",
-                    display.info.model_name.as_ref().unwrap_or(&empty),
-                    display.info.serial_number.as_ref().unwrap_or(&empty)
+                log::debug!(
+                    "Using display '{}' for config '{}' (check_caps={})",
+                    merged,
+                    name,
+                    check_caps
                 );
-                Some((merged, display))
-        })
-        .collect_vec();
-
-    log::debug!(
-        "Discovered displays without capabilities check: {:?}",
-        displays.iter().map(|(name, _)| name).collect_vec()
-    );
-
-    displays.into_iter().find_map(|(merged, display)| {
-        merged
-            .contains(name)
-            .then(|| {
-                log::debug!("Using display '{}' for config '{} - ignored capabilities check'", merged, name);
             })
             .map(|_| display)
     })