From 6a95a975991c6e619ec27557d6e986ab781ab534 Mon Sep 17 00:00:00 2001
From: ComixHe <heyuming@deepin.org>
Date: Tue, 12 Sep 2023 09:58:14 +0800
Subject: [PATCH] refact: use graphical-session.target's InvocationID to
 determine autostart

Signed-off-by: ComixHe <heyuming@deepin.org>
---
 src/dbus/applicationmanager1service.cpp | 26 +++++++++++++++----------
 src/global.h                            | 22 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/dbus/applicationmanager1service.cpp b/src/dbus/applicationmanager1service.cpp
index cfee1f1..024c2fa 100644
--- a/src/dbus/applicationmanager1service.cpp
+++ b/src/dbus/applicationmanager1service.cpp
@@ -64,6 +64,10 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
 
     scanInstances();
 
+    if (auto *ptr = new (std::nothrow) PropertiesForwarder{DDEApplicationManager1ObjectPath, this}; ptr == nullptr) {
+        qCritical() << "new PropertiesForwarder of Application Manager failed.";
+    }
+
     // TODO: This is a workaround, we will use database at the end.
     auto runtimePath = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     if (runtimePath.isEmpty()) {
@@ -71,21 +75,23 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
     }
 
     QDir runtimeDir{runtimePath};
-    auto filename = "deepin-application-manager";
-    if (runtimeDir.exists(filename)) {
-        return;
+    const auto *filename = u8"deepin-application-manager";
+    QFile flag{runtimeDir.filePath(filename)};
+
+    auto sessionId = getCurrentSessionId();
+    if (flag.open(QFile::ReadOnly | QFile::ExistingOnly)) {
+        auto content = flag.readAll();
+        if (!content.isEmpty() and !sessionId.isEmpty() and content == sessionId) {
+            return;
+        }
+        flag.close();
     }
 
-    QFile flag{runtimeDir.filePath(filename)};
-    if (!flag.open(QFile::WriteOnly | QFile::NewOnly)) {
-        qWarning() << "create record file failed.";
+    if (flag.open(QFile::WriteOnly | QFile::Truncate)) {
+        flag.write(sessionId);
     }
 
     scanAutoStart();
-
-    if (auto *ptr = new (std::nothrow) PropertiesForwarder{DDEApplicationManager1ObjectPath, this}; ptr == nullptr) {
-        qCritical() << "new PropertiesForwarder of Application Manager failed.";
-    }
 }
 
 void ApplicationManager1Service::addInstanceToApplication(const QString &unitName, const QDBusObjectPath &systemdUnitPath)
diff --git a/src/global.h b/src/global.h
index f80d432..950b1de 100644
--- a/src/global.h
+++ b/src/global.h
@@ -17,6 +17,7 @@
 #include <QRegularExpression>
 #include <QDBusObjectPath>
 #include <QDBusArgument>
+#include <QDBusMessage>
 #include <unistd.h>
 #include <QUuid>
 #include <QLoggingCategory>
@@ -484,4 +485,25 @@ inline FileTimeInfo getFileTimeInfo(const QFileInfo &file)
     return {mtime, ctime, atime};
 }
 
+inline QByteArray getCurrentSessionId()
+{
+    constexpr auto graphicalTarget = u8"graphical-session.target";
+
+    auto msg = QDBusMessage::createMethodCall("org.freedesktop.systemd1",
+                                              "/org/freedesktop/systemd1/unit/" + escapeToObjectPath(graphicalTarget),
+                                              "org.freedesktop.DBus.Properties",
+                                              "Get");
+    msg << QString{"org.freedesktop.systemd1.Unit"};
+    msg << QString{"InvocationID"};
+    auto bus = QDBusConnection::sessionBus();
+    auto ret = bus.call(msg);
+    if (ret.type() != QDBusMessage::ReplyMessage) {
+        qWarning() << "get graphical session Id failed:" << ret.errorMessage();
+        return {};
+    }
+
+    auto id = ret.arguments().first();
+    return id.value<QDBusVariant>().variant().toByteArray();
+}
+
 #endif