From 85f1691cb4e68f8acf921c485bf8ab4f20ceeb1b Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Sun, 17 Aug 2025 14:35:03 -0700
Subject: [PATCH] Treat oneshot systemd services as "active" when "activating"

Oneshot systemd services transition directly from activating to
dead/inactive and never show up as "active". This change treats these
services as "active" when "activating" because that's likely what the
user wants. Otherwise, backup tasks, etc. never show up as active
services in i3status-rs.
---
 src/blocks/service_status.rs | 40 ++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/blocks/service_status.rs b/src/blocks/service_status.rs
index 9df54da81a..521f3cb58c 100644
--- a/src/blocks/service_status.rs
+++ b/src/blocks/service_status.rs
@@ -108,6 +108,7 @@ trait Driver {
 
 struct SystemdDriver {
     proxy: UnitProxy<'static>,
+    service_proxy: ServiceProxy<'static>,
     active_state_changed: PropertyStream<'static, String>,
 }
 
@@ -141,15 +142,23 @@ impl SystemdDriver {
         let path = format!("/org/freedesktop/systemd1/unit/{encoded_service}");
 
         let proxy = UnitProxy::builder(&dbus_conn)
-            .path(path)
+            .path(path.clone())
             .error("Could not set path")?
             .build()
             .await
             .error("Failed to create UnitProxy")?;
 
+        let service_proxy = ServiceProxy::builder(&dbus_conn)
+            .path(path)
+            .error("Could not set path")?
+            .build()
+            .await
+            .error("Failed to create ServiceProxy")?;
+
         Ok(Self {
             active_state_changed: proxy.receive_active_state_changed().await,
             proxy,
+            service_proxy,
         })
     }
 }
@@ -157,11 +166,25 @@ impl SystemdDriver {
 #[async_trait]
 impl Driver for SystemdDriver {
     async fn is_active(&self) -> Result<bool> {
-        self.proxy
+        let active_state = self
+            .proxy
             .active_state()
             .await
-            .error("Could not get active_state")
-            .map(|state| state == "active")
+            .error("Could not get active_state")?;
+
+        Ok(match &*active_state {
+            "active" => true,
+            "activating" => {
+                let service_type = self
+                    .service_proxy
+                    .type_()
+                    .await
+                    .error("Could not get service type")?;
+
+                service_type == "oneshot"
+            }
+            _ => false,
+        })
     }
 
     async fn wait_for_change(&mut self) -> Result<()> {
@@ -178,3 +201,12 @@ trait Unit {
     #[zbus(property)]
     fn active_state(&self) -> zbus::Result<String>;
 }
+
+#[zbus::proxy(
+    interface = "org.freedesktop.systemd1.Service",
+    default_service = "org.freedesktop.systemd1"
+)]
+trait Service {
+    #[zbus(property, name = "Type")]
+    fn type_(&self) -> zbus::Result<String>;
+}