From 70c7b92e0ec3cab4e415b4e3b4cd315ebfce48bf Mon Sep 17 00:00:00 2001
From: ComixHe <heyuming@deepin.org>
Date: Fri, 1 Sep 2023 17:30:14 +0800
Subject: [PATCH] refact: return dbus error when application service's method
 failed

Signed-off-by: ComixHe <heyuming@deepin.org>
---
 src/dbus/applicationservice.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/dbus/applicationservice.cpp b/src/dbus/applicationservice.cpp
index bda8305..8f05b9d 100644
--- a/src/dbus/applicationservice.cpp
+++ b/src/dbus/applicationservice.cpp
@@ -116,12 +116,16 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
     if (execStr.isEmpty()) {
         auto Actions = m_entry->value(DesktopFileEntryKey, "Exec");
         if (!Actions) {
-            qWarning() << "application has isn't executable.";
+            QString msg{"application can't be executed."};
+            qWarning() << msg;
+            sendErrorReply(QDBusError::Failed, msg);
             return {};
         }
         execStr = Actions->toString(ok);
         if (!ok) {
-            qWarning() << "default action value to string failed. abort...";
+            QString msg{"maybe entry actions's format is invalid, abort launch."};
+            qWarning() << msg;
+            sendErrorReply(QDBusError::Failed, msg);
             return {};
         }
     }
@@ -151,8 +155,10 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
                 process.start(m_launcher, commands);
                 process.waitForFinished();
                 if (auto code = process.exitCode(); code != 0) {
-                    qWarning() << "Launch Application Failed. exitCode:" << code;
-                    return QString{""};
+                    auto msg = QString{"Launch Application Failed"};
+                    qWarning() << msg;
+                    sendErrorReply(QDBusError::Failed, msg);
+                    return {};
                 }
                 return objectPath;
             }
@@ -179,8 +185,10 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
             process.waitForFinished();
             auto exitCode = process.exitCode();
             if (exitCode != 0) {
-                qWarning() << "Launch Application Failed:" << binary << commands;
-                return QString{""};
+                auto msg = QString{"Launch Application Failed"};
+                qWarning() << msg;
+                sendErrorReply(QDBusError::Failed, msg);
+                return {};
             }
             return objectPath;
         },
@@ -203,6 +211,7 @@ bool ApplicationService::SendToDesktop() const noexcept
     auto success = m_desktopSource.sourceFileRef().link(desktopFile);
     if (!success) {
         qDebug() << "create link failed:" << m_desktopSource.sourceFileRef().errorString() << "path:" << desktopFile;
+        sendErrorReply(QDBusError::ErrorType::Failed, m_desktopSource.sourceFileRef().errorString());
     }
 
     return success;
@@ -225,6 +234,7 @@ bool ApplicationService::RemoveFromDesktop() const noexcept
 
     if (!success) {
         qDebug() << "remove desktop file failed:" << desktopFile.errorString();
+        sendErrorReply(QDBusError::ErrorType::Failed, desktopFile.errorString());
     }
 
     return success;