...flakes

1 files changed, 91 insertions, 1 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp
index 308659e9..6376b527 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp
@@ -8,7 +8,12 @@
 #include <QDBusUnixFileDescriptor>
 #include <QDBusObjectPath>
 
+#include <set>
+
 Systemd::Systemd(QObject* parent) : QObject(parent) {
+  ListUnitsEntry::registerMetaType();
+  qDBusRegisterMetaType<ListUnitsResult>();
+
   this->systemdManager = new DBusSystemdManager(
     "org.freedesktop.systemd1",
     "/org/freedesktop/systemd1",
@@ -22,8 +27,9 @@ Systemd::Systemd(QObject* parent) : QObject(parent) {
     this
   );
 
+
   QDBusReply<QDBusObjectPath> sessionPath = this->logindManager->GetSession("auto");
-  qDebug() << sessionPath;
+  // qDebug() << sessionPath;
   this->logindSession = new DBusLogindSession(
     "org.freedesktop.login1",
     sessionPath.value().path(),
@@ -42,6 +48,12 @@ Systemd::Systemd(QObject* parent) : QObject(parent) {
   QObject::connect(this->logindSession, &DBusLogindSession::Lock, this, &Systemd::lock);
   QObject::connect(this->logindSession, &DBusLogindSession::Unlock, this, &Systemd::unlock);
   QObject::connect(this->logindSessionProperties, &DBusProperties::PropertiesChanged, this, &Systemd::onLogindSessionPropertiesChanged);
+  this->systemdManager->Subscribe();
+  QObject::connect(this->systemdManager, &DBusSystemdManager::UnitNew, this, &Systemd::onUserUnitNew);
+  QObject::connect(this->systemdManager, &DBusSystemdManager::UnitRemoved, this, &Systemd::onUserUnitRemoved);
+
+  for (const auto& unit: this->systemdManager->ListUnits().value())
+    this->onUserUnitNew(unit.primaryName, unit.unitPath);
 }
 
 void Systemd::onLogindSessionPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties) {
@@ -50,6 +62,82 @@ void Systemd::onLogindSessionPropertiesChanged(const QString& interface_name, co
   if (changed_properties.contains("LockedHint") || invalidated_properties.contains("LockedHint"))
     emit this->lockedHintChanged();
 }
+void Systemd::onUserUnitNew(const QString& id, const QDBusObjectPath& object_path) {
+  for (auto unit: this->mUserUnits.valueList())
+    if (unit->path() == object_path)
+      return;
+
+  for (const auto& unit: this->systemdManager->ListUnits().value())
+    if (unit.unitPath == object_path) {
+      this->mUserUnits.insertObject(new SystemdUnit(this, object_path, id));
+      return;
+    }
+}
+void Systemd::onUserUnitRemoved(const QString& id, const QDBusObjectPath& object_path) {
+  std::set<SystemdUnit*> toRemove;
+  for (auto unit: this->mUserUnits.valueList())
+    if (unit->path() == object_path)
+      toRemove.insert(unit);
+
+  for (auto unit: toRemove) {
+    this->mUserUnits.removeObject(unit);
+    delete unit;
+  }
+}
+
+SystemdUnit::SystemdUnit(QObject* parent, const QDBusObjectPath& path, const QString& id): QObject(parent), mPath(path), mId(id) {
+  this->mUnitProperties = new DBusProperties(
+                                             "org.freedesktop.systemd1",
+                                             this->path().path(),
+                                             QDBusConnection::sessionBus(),
+                                             this
+                                             );
+}
+std::unique_ptr<DBusSystemdUnit> SystemdUnit::systemdUnit() {
+  return std::make_unique<DBusSystemdUnit>(
+                          "org.freedesktop.systemd1",
+                          this->path().path(),
+                          QDBusConnection::sessionBus(),
+                          nullptr
+                          );
+}
+std::unique_ptr<DBusSystemdService> SystemdUnit::systemdService() {
+  if (!this->id().endsWith(".service"))
+    return std::unique_ptr<DBusSystemdService>();
+
+  return std::make_unique<DBusSystemdService>(
+                          "org.freedesktop.systemd1",
+                          this->path().path(),
+                          QDBusConnection::sessionBus(),
+                          nullptr
+                          );
+}
+QList<QString> SystemdUnit::runtimeDirectory() {
+  if (std::unique_ptr<DBusSystemdService> systemdService = this->systemdService()) {
+    if (!this->mRuntimeDirectory)
+      this->mRuntimeDirectory = systemdService->runtimeDirectory();
+    return *this->mRuntimeDirectory;
+  }
+
+  return QList<QString>{};
+}
+QString SystemdUnit::activeState() {
+  if (!this->mActiveState) {
+    QObject::connect(this->mUnitProperties, &DBusProperties::PropertiesChanged, this, &SystemdUnit::onUnitPropertiesChanged);
+    this->mActiveState = this->systemdUnit()->activeState();
+  }
+
+  return *this->mActiveState;
+}
+
+const QDBusObjectPath& SystemdUnit::path() const { return this->mPath; }
+const QString& SystemdUnit::id() const { return this->mId; }
+void SystemdUnit::onUnitPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties) {
+  if (changed_properties.contains("ActiveState") || invalidated_properties.contains("ActiveState")) {
+    this->mActiveState = this->systemdUnit()->activeState();
+    emit this->activeStateChanged();
+  }
+}
 
 void Systemd::stopUserUnit(const QString& unit, const QString& mode) { this->systemdManager->StopUnit(unit, mode); }
 
@@ -63,6 +151,8 @@ void Systemd::lockSession() { this->logindSession->call("Lock"); }
 void Systemd::suspend() { this->logindManager->Suspend(true); }
 void Systemd::hibernate() { this->logindManager->Hibernate(true); }
 
+ObjectModel<SystemdUnit>* Systemd::userUnits() { return &this->mUserUnits; }
+
 std::string SystemdInhibitorParams::toString(SystemdInhibitorParams::WhatItem what) {
   if (what == SystemdInhibitorParams::Shutdown)
     return "shutdown";