Major update to supergfx and others

asus-notify/src/main.rs

@@ -2,11 +2,14 @@ use notify_rust::{Hint, Notification, NotificationHandle};
 use rog_aura::AuraEffect;
 use rog_dbus::{DbusProxies, Signals};
 use rog_profiles::Profile;
-use supergfxctl::gfx_vendors::{GfxRequiredUserAction, GfxVendors};
 use std::error::Error;
-use std::process;
+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";
 
@@ -42,6 +45,9 @@ 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() {
@@ -67,23 +73,57 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         if let Ok(data) = signals.charge.try_recv() {
             notify!(do_charge_notif, last_notification, &data);
         }
-        if let Ok(data) = signals.gfx_vendor.try_recv() {
+    }
+}
+
+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) = signals.gfx_action.try_recv() {
+
+        if let Ok(data) = rx2.try_recv() {
             match data {
                 GfxRequiredUserAction::Logout | GfxRequiredUserAction::Reboot => {
-                    do_gfx_action_notif(&data)?;
+                    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>> {