consider systemd services in 'start' or 'mounting' good; fmt

1 files changed, 70 insertions, 19 deletions

diff --git a/src/dbus.rs b/src/dbus.rs
index d23c7b6..1bc5655 100644
--- a/src/dbus.rs
+++ b/src/dbus.rs
@@ -1,14 +1,24 @@
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};
+use std::{
+    collections::{btree_map::Entry::*, BTreeMap},
+    path::PathBuf,
+    sync::Arc,
+};
+use tokio::sync::Mutex;
 use zbus::{
-    proxy, Proxy,
+    address::{
+        transport::{Transport, Unix, UnixSocket},
+        Address,
+    },
+    connection::Builder,
+    proxy,
     zvariant::{OwnedObjectPath, Type},
-    Connection, connection::Builder, address::{Address, transport::{Unix, Transport, UnixSocket}},
+    Connection, Proxy,
 };
-use std::{sync::Arc, collections::{BTreeMap, btree_map::Entry::*}, path::PathBuf};
-use tokio::sync::Mutex;
 
-static CONNECTIONS: Mutex<(BTreeMap<String, Arc<Connection>>, Option<Arc<Connection>>)> = Mutex::const_new((BTreeMap::new(), None));
+static CONNECTIONS: Mutex<(BTreeMap<String, Arc<Connection>>, Option<Arc<Connection>>)> =
+    Mutex::const_new((BTreeMap::new(), None));
 
 #[derive(Debug, Type, Deserialize, Serialize)]
 struct ServiceStatus {
@@ -43,7 +53,7 @@ async fn ensure_system_conn() -> Result<Arc<Connection>> {
             let system_bus = Arc::new(Connection::system().await?);
             connections.1 = Some(system_bus.clone());
             Ok(system_bus)
-        },
+        }
     }
 }
 
@@ -55,14 +65,19 @@ async fn ensure_user_conn(user: &str) -> Result<Arc<Connection>> {
         Vacant(ve) => {
             let mut path = PathBuf::new();
             path.push("/run/user");
-            path.push(format!("{}", users::get_user_by_name(user).ok_or(anyhow!("Couldn't find user"))?.uid()));
+            path.push(format!(
+                "{}",
+                users::get_user_by_name(user)
+                    .ok_or(anyhow!("Couldn't find user"))?
+                    .uid()
+            ));
             path.push("bus");
 
             let trans = Transport::Unix(Unix::new(UnixSocket::File(path)));
 
             let conn = Builder::address(Address::new(trans))?.build().await?;
             Ok(ve.insert(Arc::new(conn)).clone())
-        },
+        }
     }
 }
 
@@ -74,15 +89,32 @@ pub(crate) async fn check_systemd_all(user: Option<&str>) -> Result<String> {
 
     let manager = ManagerProxy::new(&conn).await?;
 
-    let (good, bad) = manager.list_units().await?.into_iter().fold((0, vec![]), |(old_good, mut old_bad), unit| {
-        if matches!(unit.substate.as_str(), "active" | "inactive" | "plugged" | "mounted" | "dead" | "listening" | "running" | "exited" | "waiting" | "abandoned" | "elapsed") {
-            (old_good + 1, old_bad)
-        }
-        else {
-            old_bad.push(format!("{}: {}", unit.name, unit.substate));
-            (old_good, old_bad)
-        }
-    });
+    let (good, bad) = manager.list_units().await?.into_iter().fold(
+        (0, vec![]),
+        |(old_good, mut old_bad), unit| {
+            if matches!(
+                unit.substate.as_str(),
+                "active"
+                    | "inactive"
+                    | "plugged"
+                    | "mounted"
+                    | "mounting"
+                    | "dead"
+                    | "listening"
+                    | "running"
+                    | "exited"
+                    | "waiting"
+                    | "abandoned"
+                    | "elapsed"
+                    | "start"
+            ) {
+                (old_good + 1, old_bad)
+            } else {
+                old_bad.push(format!("{}: {}", unit.name, unit.substate));
+                (old_good, old_bad)
+            }
+        },
+    );
 
     if bad.is_empty() {
         Ok(format!("{good} good services"))
@@ -104,10 +136,29 @@ pub(crate) async fn check_systemd_unit(user: Option<&str>, unit: &str) -> Result
         manager.get_unit(&format!("{unit}.service")).await
     }?;
 
-    let unit_proxy = Proxy::new(&conn, "org.freedesktop.systemd1", unit_object_path, "org.freedesktop.systemd1.Unit").await?;
+    let unit_proxy = Proxy::new(
+        &conn,
+        "org.freedesktop.systemd1",
+        unit_object_path,
+        "org.freedesktop.systemd1.Unit",
+    )
+    .await?;
 
     let substate: String = unit_proxy.get_property("SubState").await?;
-    if matches!(substate.as_str(), "active" | "inactive" | "plugged" | "mounted" | "dead" | "listening" | "running" | "exited" | "waiting" | "abandoned" | "elapsed") {
+    if matches!(
+        substate.as_str(),
+        "active"
+            | "inactive"
+            | "plugged"
+            | "mounted"
+            | "dead"
+            | "listening"
+            | "running"
+            | "exited"
+            | "waiting"
+            | "abandoned"
+            | "elapsed"
+    ) {
         Ok(format!("{unit}: {substate}"))
     } else {
         Err(anyhow!("{unit}: {substate}"))