Bugfixes

- Spawn tasks on individual threads
- Don't force a default of fan-curve on reload
- Add missing profile commands
- Begin obsoleting the graphics switch command in favour of supergfxctl
- Slim down the notification daemon to pure ASUS notifications

Bad behaviour in fan-curve new function that was forcing a re-init
to default on reload. Remove this and only save config again after
loading the config file and writing a curve (hidden side effect of
write is that a zeroed array is defaulted to read-from-system - this
needs to be changed too).

Closes #140, #139

asus-notify/src/main.rs

@@ -3,13 +3,8 @@ use rog_aura::AuraEffect;
 use rog_dbus::{DbusProxies, Signals};
 use rog_profiles::Profile;
 use std::error::Error;
-use std::sync::mpsc::channel;
 use std::thread::sleep;
 use std::time::Duration;
-use std::{process, thread};
-use supergfxctl::gfx_vendors::{GfxRequiredUserAction, GfxVendors};
-use supergfxctl::zbus_proxy::GfxProxy;
-use zbus::Connection;
 
 const NOTIF_HEADER: &str = "ROG Control";
 
@@ -37,7 +32,6 @@ macro_rules! base_notification {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("asus-notify version {}", env!("CARGO_PKG_VERSION"));
     println!("   rog-dbus version {}", rog_dbus::VERSION);
-    println!("supergfxctl version {}", supergfxctl::VERSION);
 
     let (proxies, conn) = DbusProxies::new()?;
     let signals = Signals::new(&proxies)?;
@@ -47,8 +41,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let recv = proxies.setup_recv(conn);
     let mut err_count = 0;
 
-    gfx_thread()?;
-
     loop {
         sleep(Duration::from_millis(100));
         if let Err(err) = recv.next_signal() {
@@ -77,56 +69,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 }
 
-fn gfx_thread() -> Result<(), Box<dyn std::error::Error>> {
-    let mut last_notification: Option<NotificationHandle> = None;
-
-    let conn = Connection::new_system()?;
-    let proxy = GfxProxy::new(&conn)?;
-
-    let (tx1, rx1) = channel();
-    proxy.connect_notify_gfx(tx1)?;
-
-    let (tx2, rx2) = channel();
-    proxy.connect_notify_action(tx2)?;
-
-    thread::spawn(move || loop {
-        if proxy
-            .next_signal()
-            .map_err(|e| println!("Error: {}", e))
-            .is_err()
-        {
-            break;
-        }
-
-        if let Ok(data) = rx1.try_recv() {
-            notify!(do_gfx_notif, last_notification, &data);
-        }
-
-        if let Ok(data) = rx2.try_recv() {
-            match data {
-                GfxRequiredUserAction::Logout | GfxRequiredUserAction::Reboot => {
-                    do_gfx_action_notif(&data)
-                        .map_err(|e| {
-                            println!("Error: {}", e);
-                        })
-                        .ok();
-                }
-                GfxRequiredUserAction::Integrated => {
-                    base_notification!(
-                        "You must be in integrated mode first to switch to the requested mode"
-                    )
-                    .map_err(|e| {
-                        println!("Error: {}", e);
-                    })
-                    .ok();
-                }
-                GfxRequiredUserAction::None => {}
-            }
-        }
-    });
-    Ok(())
-}
-
 fn do_thermal_notif(profile: &Profile) -> Result<NotificationHandle, Box<dyn Error>> {
     let icon = match profile {
         Profile::Balanced => "asus_notif_yellow",
@@ -160,62 +102,3 @@ fn do_charge_notif(limit: &u8) -> Result<NotificationHandle, notify_rust::error:
     base_notification!(&format!("Battery charge limit changed to {}", limit))
 }
 
-fn do_gfx_notif(vendor: &GfxVendors) -> Result<NotificationHandle, notify_rust::error::Error> {
-    let icon = match vendor {
-        GfxVendors::Nvidia => "/usr/share/icons/hicolor/scalable/status/gpu-nvidia.svg",
-        GfxVendors::Integrated => "/usr/share/icons/hicolor/scalable/status/gpu-integrated.svg",
-        GfxVendors::Compute => "/usr/share/icons/hicolor/scalable/status/gpu-compute.svg",
-        GfxVendors::Vfio => "/usr/share/icons/hicolor/scalable/status/gpu-vfio.svg",
-        GfxVendors::Hybrid => "/usr/share/icons/hicolor/scalable/status/gpu-hybrid.svg",
-    };
-    Notification::new()
-        .summary(NOTIF_HEADER)
-        .body(&format!(
-            "Graphics mode changed to {}",
-            <&str>::from(vendor)
-        ))
-        .timeout(2000)
-        .icon(icon)
-        .show()
-}
-
-fn do_gfx_action_notif(vendor: &GfxRequiredUserAction) -> Result<(), notify_rust::error::Error> {
-    let mut notif = Notification::new()
-        .summary(NOTIF_HEADER)
-        .timeout(2000)
-        .urgency(notify_rust::Urgency::Critical)
-        .icon("/usr/share/icons/hicolor/scalable/status/notification-reboot.svg")
-        .finalize();
-
-    if matches!(vendor, GfxRequiredUserAction::Logout) {
-        notif.action("logout", "Logout now?");
-    } else if matches!(vendor, GfxRequiredUserAction::Reboot) {
-        notif.action("reboot", "Reboot now?");
-    }
-
-    notif.body("Graphics mode changed");
-    notif.show()?.wait_for_action(|action| match action {
-        "logout" => {
-            let r = process::Command::new("gnome-session-quit").spawn();
-            if r.is_err() {
-                // Try to prompt plasma logout screen via dbus
-                let conn = Connection::new_session().unwrap();
-                conn.call_method(
-                    Some(&"org.kde.LogoutPrompt"),
-                    &"/LogoutPrompt",
-                    Some(&"org.kde.LogoutPrompt"),
-                    &"promptLogout",
-                    &(),
-                ).ok();
-            }
-        }
-        "reboot" => {
-            process::Command::new("systemctl")
-                .arg("reboot")
-                .spawn()
-                .ok();
-        }
-        _ => (),
-    });
-    Ok(())
-}