backlightd is now able to auto adjust brightness of monitors

Author: ShellCode33

backlight_ipc/src/lib.rs

@@ -7,12 +7,19 @@ use serde::{Deserialize, Serialize};
 
 pub const DEFAULT_UNIX_SOCKET_PATH: &str = "/run/backlightd.sock";
 
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub enum BacklightMode {
+    Auto,
+    Manual,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub enum BacklightCommand {
     SetBrightness(u8),
     IncreaseBrightness(u8),
     DecreaseBrightness(u8),
     Refresh,
+    SetMode(BacklightMode),
 }
 
 // The following abstraction allow us to easily change the protocol if need be.

backlightctl/src/main.rs

@@ -1,7 +1,7 @@
 use std::{os::unix::net::UnixStream, path::PathBuf, process::exit};
 
-use backlight_ipc::{BacklightCommand, DEFAULT_UNIX_SOCKET_PATH};
-use clap::Parser;
+use backlight_ipc::{BacklightCommand, BacklightMode, DEFAULT_UNIX_SOCKET_PATH};
+use clap::{error::ErrorKind, CommandFactory, Parser};
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
@@ -11,6 +11,10 @@ struct BacklightctlCli {
     #[structopt(allow_hyphen_values = true)]
     brightness: Option<String>,
 
+    /// Set backlightd mode to auto (the daemon will automatically adjust brightness)
+    #[clap(short, long, default_value_t = false)]
+    auto: bool,
+
     /// Refresh the list of known monitors (called by the udev rule)
     #[clap(short, long, default_value_t = false)]
     refresh: bool,
@@ -23,10 +27,23 @@ struct BacklightctlCli {
 fn main() {
     let cli = BacklightctlCli::parse();
 
+    if cli.auto && cli.brightness.is_some() {
+        BacklightctlCli::command()
+            .error(
+                ErrorKind::ArgumentConflict,
+                "You cannot use both --brightness and --auto",
+            )
+            .exit();
+    }
+
     let brightness_cmd = if let Some(brightness) = cli.brightness {
         if brightness.chars().last().is_some_and(|c| c != '%') {
-            eprintln!("Brightness value is missing a % sign at the end");
-            exit(1);
+            BacklightctlCli::command()
+                .error(
+                    ErrorKind::InvalidValue,
+                    "Brightness value is missing a % sign at the end",
+                )
+                .exit();
         }
 
         let potential_brightness_modifier = brightness.chars().next();
@@ -41,14 +58,22 @@ fn main() {
             let brightness = match brightness.parse::<u8>() {
                 Ok(percent) => percent,
                 Err(err) => {
-                    eprintln!("Unable to parse brightness value {brightness}: {err}");
-                    exit(1);
+                    BacklightctlCli::command()
+                        .error(
+                            ErrorKind::InvalidValue,
+                            format!("Unable to parse brightness value {brightness}: {err}"),
+                        )
+                        .exit();
                 }
             };
 
             if brightness > 100 {
-                eprintln!("Brightness value must be a percentage between -100% and 100%");
-                exit(1);
+                BacklightctlCli::command()
+                    .error(
+                        ErrorKind::InvalidValue,
+                        "Brightness value must be a percentage between -100% and 100%",
+                    )
+                    .exit();
             }
 
             Some(BacklightCommand::IncreaseBrightness(brightness))
@@ -62,14 +87,22 @@ fn main() {
             let brightness = match brightness.parse::<usize>() {
                 Ok(percent) => percent,
                 Err(err) => {
-                    eprintln!("Unable to parse brightness value {brightness}: {err}");
-                    exit(1);
+                    BacklightctlCli::command()
+                        .error(
+                            ErrorKind::InvalidValue,
+                            format!("Unable to parse brightness value {brightness}: {err}"),
+                        )
+                        .exit();
                 }
             };
 
             if brightness > 100 {
-                eprintln!("Brightness value must be a percentage between -100% and +100%");
-                exit(1);
+                BacklightctlCli::command()
+                    .error(
+                        ErrorKind::InvalidValue,
+                        "Brightness value must be a percentage between -100% and 100%",
+                    )
+                    .exit();
             }
 
             Some(BacklightCommand::DecreaseBrightness(brightness as u8))
@@ -82,14 +115,22 @@ fn main() {
             let brightness = match brightness.parse::<usize>() {
                 Ok(percent) => percent,
                 Err(err) => {
-                    eprintln!("Unable to parse brightness value {brightness}: {err}");
-                    exit(1);
+                    BacklightctlCli::command()
+                        .error(
+                            ErrorKind::InvalidValue,
+                            format!("Unable to parse brightness value {brightness}: {err}"),
+                        )
+                        .exit();
                 }
             };
 
             if brightness > 100 {
-                eprintln!("Brightness value must be a percentage between -100% and +100%");
-                exit(1);
+                BacklightctlCli::command()
+                    .error(
+                        ErrorKind::InvalidValue,
+                        "Brightness value must be a percentage between -100% and 100%",
+                    )
+                    .exit();
             }
 
             Some(BacklightCommand::SetBrightness(brightness as u8))
@@ -113,6 +154,13 @@ fn main() {
         }
     }
 
+    if cli.auto {
+        if let Err(err) = BacklightCommand::SetMode(BacklightMode::Auto).serialize_into(&stream) {
+            eprintln!("{err}");
+            exit(1);
+        }
+    }
+
     if let Some(brightness_cmd) = brightness_cmd {
         if let Err(err) = brightness_cmd.serialize_into(&stream) {
             eprintln!("{err}");

backlightd/Cargo.toml

@@ -7,4 +7,7 @@ edition = "2021"
 ddc-hi = "0.4.1"
 backlight_ipc = { path = "../backlight_ipc" }
 anyhow = "1.0.93"
+sunrise-next = "1.2"
 chrono = "0.4.38"
+ureq = { version = "2.10.1", features = ["json", "proxy-from-env"] }
+serde = "1.0"