From 4ff60db55695725745510a828a7815ddc6bd82a3 Mon Sep 17 00:00:00 2001
From: black-desk <me@black-desk.cn>
Date: Mon, 4 Sep 2023 18:39:09 +0800
Subject: [PATCH] refact: improve scanAutoStart

improve scanAutoStart
---
 src/dbus/applicationmanager1service.cpp | 27 +++++++++++--------------
 src/dbus/applicationmanager1service.h   |  2 +-
 src/global.h                            |  2 ++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/dbus/applicationmanager1service.cpp b/src/dbus/applicationmanager1service.cpp
index b4c734f..f84bb5f 100644
--- a/src/dbus/applicationmanager1service.cpp
+++ b/src/dbus/applicationmanager1service.cpp
@@ -53,23 +53,24 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
 
     scanInstances();
 
+    // TODO: This is a workaround, we will use database at the end.
     auto runtimePath = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     if (runtimePath.isEmpty()) {
-        runtimePath = QString{"/run/user/%1"}.arg(getCurrentUID());
+        runtimePath = QString{"/run/user/%1/"}.arg(getCurrentUID());
     }
 
-    bool firstStart{false};
     QDir runtimeDir{runtimePath};
-    if (!runtimeDir.exists("ApplicationManager")) {
-        QFile flag{runtimeDir.filePath("ApplicationManager")};
-        if (!flag.open(QFile::WriteOnly | QFile::NewOnly)) {
-            qWarning() << "create record file failed.";
-        } else {
-            firstStart = true;
-        }
+    auto filename = "deepin-application-manager";
+    if (runtimeDir.exists(filename)) {
+        return;
     }
 
-    scanAutoStart(firstStart);
+    QFile flag{runtimeDir.filePath(filename)};
+    if (!flag.open(QFile::WriteOnly | QFile::NewOnly)) {
+        qWarning() << "create record file failed.";
+    }
+
+    scanAutoStart();
 }
 
 void ApplicationManager1Service::addInstanceToApplication(const QString &unitName, const QDBusObjectPath &systemdUnitPath)
@@ -177,12 +178,8 @@ void ApplicationManager1Service::scanInstances() noexcept
     }
 }
 
-void ApplicationManager1Service::scanAutoStart(bool firstStart) noexcept
+void ApplicationManager1Service::scanAutoStart() noexcept
 {
-    if (!firstStart) {
-        return;
-    }
-
     auto autostartDirs = getAutoStartDirs();
     QStringList needToLaunch;
     applyIteratively(QList<QDir>{autostartDirs.cbegin(), autostartDirs.cend()}, [&needToLaunch](const QFileInfo &info) {
diff --git a/src/dbus/applicationmanager1service.h b/src/dbus/applicationmanager1service.h
index 381f7d4..06b27f8 100644
--- a/src/dbus/applicationmanager1service.h
+++ b/src/dbus/applicationmanager1service.h
@@ -56,7 +56,7 @@ private:
 
     void scanApplications() noexcept;
     void scanInstances() noexcept;
-    void scanAutoStart(bool firstStart) noexcept;
+    void scanAutoStart() noexcept;
     void addInstanceToApplication(const QString &unitName, const QDBusObjectPath &systemdUnitPath);
     void removeInstanceFromApplication(const QString &unitName, const QDBusObjectPath &systemdUnitPath);
 };
diff --git a/src/global.h b/src/global.h
index 53afaed..64263ed 100644
--- a/src/global.h
+++ b/src/global.h
@@ -395,6 +395,8 @@ inline QStringList getAutoStartDirs()
         XDGConfigDirs.append("/etc/xdg");
     }
 
+    // FIXME: What if XDG_CONFIG_HOME already in XDG_CONFIG_DIRS?
+
     auto XDGConfigHome = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME"));
     if (XDGConfigHome.isEmpty()) {
         XDGConfigHome = QString::fromLocal8Bit(qgetenv("HOME")) + QDir::separator() + ".config";