From 8851263925c99fa2eed973404f56583f3e8d4375 Mon Sep 17 00:00:00 2001
From: Ye ShanShan <yeshanshan@uniontech.com>
Date: Fri, 12 Apr 2024 15:15:12 +0800
Subject: [PATCH] fix: missing package parsed when ReloadApplicaitons

Restart timer to merge directory changed and dpkg hook event.
Reload applications when called from dbus.

issue: https://github.com/linuxdeepin/developer-center/issues/7830
---
 src/dbus/applicationmanager1service.cpp | 15 ++++++++++-----
 src/dbus/applicationmanager1service.h   |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/dbus/applicationmanager1service.cpp b/src/dbus/applicationmanager1service.cpp
index 61935af..5951ae4 100644
--- a/src/dbus/applicationmanager1service.cpp
+++ b/src/dbus/applicationmanager1service.cpp
@@ -25,8 +25,9 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
     , m_storage(std::move(storage))
 {
     using namespace std::chrono_literals;
-    m_reloadTimer.setInterval(1s);
-    connect(&m_reloadTimer, &QTimer::timeout, [this] { m_reloadTimer.stop(); });
+    m_reloadTimer.setInterval(50);
+    m_reloadTimer.setSingleShot(true);
+    connect(&m_reloadTimer, &QTimer::timeout, this, &ApplicationManager1Service::doReloadApplications);
 }
 
 void ApplicationManager1Service::initService(QDBusConnection &connection) noexcept
@@ -613,12 +614,16 @@ void ApplicationManager1Service::updateApplication(const QSharedPointer<Applicat
 
 void ApplicationManager1Service::ReloadApplications()
 {
-    if (m_reloadTimer.isActive()) {
-        qInfo() << "reloadTimer is running, ignore...";
+    if (calledFromDBus() && !m_reloadTimer.isActive()) {
+        doReloadApplications();
         return;
     }
-
     m_reloadTimer.start();
+}
+
+void ApplicationManager1Service::doReloadApplications()
+{
+    qInfo() << "reload applications.";
 
     auto desktopFileDirs = getDesktopFileDirs();
     desktopFileDirs.append(getAutoStartDirs());  // detect autostart apps add/remove/update
diff --git a/src/dbus/applicationmanager1service.h b/src/dbus/applicationmanager1service.h
index e3d3ce0..2a24c31 100644
--- a/src/dbus/applicationmanager1service.h
+++ b/src/dbus/applicationmanager1service.h
@@ -66,6 +66,8 @@ Q_SIGNALS:
     void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
     void listChanged();
 
+private Q_SLOTS:
+    void doReloadApplications();
 private:
     std::unique_ptr<Identifier> m_identifier;
     std::weak_ptr<ApplicationManager1Storage> m_storage;