anime: CLI and user-daemon work

daemon/src/ctrl_anime.rs

@@ -16,10 +16,10 @@ const ON_OFF: u8 = 0x04;
 use log::{error, info, warn};
 use rog_anime::{AniMeDataBuffer, AniMePacketType};
 use rusb::{Device, DeviceHandle};
-use zvariant::ObjectPath;
 use std::error::Error;
 use std::time::Duration;
 use zbus::dbus_interface;
+use zvariant::ObjectPath;
 
 use crate::GetSupported;
 
@@ -52,7 +52,10 @@ pub trait Dbus {
 impl crate::ZbusAdd for CtrlAnimeDisplay {
     fn add_to_server(self, server: &mut zbus::ObjectServer) {
         server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/Anime"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Anime"),
+                self,
+            )
             .map_err(|err| {
                 warn!("CtrlAnimeDisplay: add_to_server {}", err);
                 err

daemon/src/ctrl_charge.rs

@@ -2,13 +2,13 @@ use crate::{config::Config, error::RogError, GetSupported};
 //use crate::dbus::DbusEvents;
 use log::{info, warn};
 use serde_derive::{Deserialize, Serialize};
-use zvariant::ObjectPath;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
 use zbus::dbus_interface;
+use zvariant::ObjectPath;
 
 static BAT_CHARGE_PATH: &str = "/sys/class/power_supply/BAT0/charge_control_end_threshold";
 
@@ -64,7 +64,10 @@ impl CtrlCharge {
 impl crate::ZbusAdd for CtrlCharge {
     fn add_to_server(self, server: &mut zbus::ObjectServer) {
         server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/Charge"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Charge"),
+                self,
+            )
             .map_err(|err| {
                 warn!("CtrlCharge: add_to_server {}", err);
                 err

daemon/src/ctrl_fan_cpu.rs

@@ -3,13 +3,13 @@ use crate::{config::Config, GetSupported};
 use log::{info, warn};
 use rog_types::profile::{FanLevel, Profile, ProfileEvent};
 use serde_derive::{Deserialize, Serialize};
-use zvariant::ObjectPath;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
 use zbus::{dbus_interface, fdo::Error};
+use zvariant::ObjectPath;
 
 static FAN_TYPE_1_PATH: &str = "/sys/devices/platform/asus-nb-wmi/throttle_thermal_policy";
 static FAN_TYPE_2_PATH: &str = "/sys/devices/platform/asus-nb-wmi/fan_boost_mode";
@@ -181,7 +181,10 @@ impl DbusFanAndCpu {
 impl crate::ZbusAdd for DbusFanAndCpu {
     fn add_to_server(self, server: &mut zbus::ObjectServer) {
         server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/Profile"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Profile"),
+                self,
+            )
             .map_err(|err| {
                 warn!("DbusFanAndCpu: add_to_server {}", err);
                 err

daemon/src/ctrl_gfx/gfx.rs

@@ -7,7 +7,6 @@ use logind_zbus::{
     ManagerProxy, SessionProxy,
 };
 use rog_types::gfx_vendors::{GfxPower, GfxRequiredUserAction, GfxVendors};
-use zvariant::ObjectPath;
 use std::{io::Write, ops::Add, path::Path, time::Instant};
 use std::{iter::FromIterator, thread::JoinHandle};
 use std::{process::Command, thread::sleep, time::Duration};
@@ -16,6 +15,7 @@ use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
 use system::{GraphicsDevice, PciBus};
 use zbus::{dbus_interface, Connection};
+use zvariant::ObjectPath;
 
 use crate::*;
 

daemon/src/ctrl_leds.rs

@@ -14,13 +14,13 @@ use rog_types::{
     aura_modes::{AuraEffect, AuraModeNum, LedBrightness},
     LED_MSG_LEN,
 };
-use zvariant::ObjectPath;
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
 use zbus::dbus_interface;
+use zvariant::ObjectPath;
 
 use crate::GetSupported;
 

daemon/src/ctrl_rog_bios.rs

@@ -1,7 +1,6 @@
 use crate::{config::Config, error::RogError, GetSupported};
 use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use zvariant::ObjectPath;
 use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::{Read, Write};
@@ -10,6 +9,7 @@ use std::process::Command;
 use std::sync::Arc;
 use std::sync::Mutex;
 use zbus::dbus_interface;
+use zvariant::ObjectPath;
 
 const INITRAMFS_PATH: &str = "/usr/sbin/update-initramfs";
 const DRACUT_PATH: &str = "/usr/bin/dracut";
@@ -102,7 +102,10 @@ impl CtrlRogBios {
 impl crate::ZbusAdd for CtrlRogBios {
     fn add_to_server(self, server: &mut zbus::ObjectServer) {
         server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/RogBios"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/RogBios"),
+                self,
+            )
             .map_err(|err| {
                 warn!("CtrlRogBios: add_to_server {}", err);
                 err

daemon/src/ctrl_supported.rs

@@ -31,7 +31,10 @@ impl SupportedFunctions {
 impl crate::ZbusAdd for SupportedFunctions {
     fn add_to_server(self, server: &mut zbus::ObjectServer) {
         server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/Supported"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Supported"),
+                self,
+            )
             .map_err(|err| {
                 warn!("SupportedFunctions: add_to_server {}", err);
                 err

daemon/src/daemon.rs

@@ -175,10 +175,13 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
         });
 
     object_server
-        .with(&ObjectPath::from_str_unchecked("/org/asuslinux/Charge"), |obj: &CtrlCharge| {
-            let x = obj.limit();
-            obj.notify_charge(x as u8)
-        })
+        .with(
+            &ObjectPath::from_str_unchecked("/org/asuslinux/Charge"),
+            |obj: &CtrlCharge| {
+                let x = obj.limit();
+                obj.notify_charge(x as u8)
+            },
+        )
         .map_err(|err| {
             warn!("object_server notify_charge error: {}", err);
         })