Introduce some exit codes (flameshot-org#3321) (flameshot-org#4121)

* Reuse FlameshotDaemon::call in copyToClipboard

* Introduce some exit codes (flameshot-org#3321)

Author: guyueshui

data/man/man1/flameshot.1

@@ -292,6 +292,10 @@ cursor by default.
 Shows help for \fBflameshot screen\fR subcommand.
 .
 .\"----------------------------------------------------------------------------
+.SH RETURN VALUE
+Returns 0 on normal exit, 2 on screenshot aborted, 3 on dbus connection lost, 130 on SIGINT received, 143 on SIGTERM received.
+.
+.\"----------------------------------------------------------------------------
 .SH SEE ALSO
 .PP
 You may also find more detailed online documentation on upstream project homepage.

src/core/flameshot.h

@@ -19,6 +19,17 @@ class UploadHistory;
 class QHotkey;
 #endif
 
+enum ErrCode : uint8_t
+{
+    E_OK = 0,
+    E_GENERAL,
+    E_ABORTED,
+    E_DBUSCONN,
+    E_SIG_BASE = 128,
+    E_SIGINT = E_SIG_BASE + 2,
+    E_SIGTERM = E_SIG_BASE + 15,
+};
+
 class Flameshot : public QObject
 {
     Q_OBJECT

src/core/flameshotdaemon.cpp

@@ -182,10 +182,7 @@ void FlameshotDaemon::copyToClipboard(const QString& text,
 #else
     auto m = createMethodCall(QStringLiteral("attachTextToClipboard"));
     m << text << notification;
-
-    QDBusConnection sessionBus = QDBusConnection::sessionBus();
-    checkDBusConnection(sessionBus);
-    sessionBus.call(m);
+    call(m);
 #endif
 }
 
@@ -283,7 +280,7 @@ void FlameshotDaemon::quitIfIdle()
         return;
     }
     if (!m_hostingClipboard && m_widgets.isEmpty()) {
-        qApp->exit(0);
+        qApp->exit(E_OK);
     }
 }
 
@@ -443,7 +440,7 @@ void FlameshotDaemon::checkDBusConnection(const QDBusConnection& connection)
 {
     if (!connection.isConnected()) {
         AbstractLogger::error() << tr("Unable to connect via DBus");
-        qApp->exit(1);
+        qApp->exit(E_DBUSCONN);
     }
 }
 

src/core/signaldaemon.cpp

@@ -1,4 +1,5 @@
 #include "signaldaemon.h"
+#include "flameshot.h"
 #include <QApplication>
 #include <QSocketNotifier>
 #include <csignal>
@@ -45,7 +46,7 @@ void SignalDaemon::handleSigTerm()
     char tmp = 0;
     ::read(sigtermFd[1], &tmp, sizeof(tmp));
 
-    QApplication::quit();
+    QApplication::exit(E_SIGTERM);
     snTerm->setEnabled(true);
 }
 
@@ -56,7 +57,7 @@ void SignalDaemon::handleSigInt()
     char tmp = 0;
     ::read(sigintFd[1], &tmp, sizeof(tmp));
 
-    QApplication::quit();
+    QApplication::exit(E_SIGINT);
 
     snInt->setEnabled(true);
 }

src/main.cpp

@@ -74,7 +74,7 @@ int requestCaptureAndWait(const CaptureRequest& req)
 #else
         // if this instance is not daemon, make sure it exit after caputre finish
         if (FlameshotDaemon::instance() == nullptr && !Flameshot::instance()->haveExternalWidget()) {
-            qApp->exit(0);
+            qApp->exit(E_OK);
         }
 #endif
     });
@@ -85,7 +85,7 @@ int requestCaptureAndWait(const CaptureRequest& req)
             : AbstractLogger::Target::Default &
                 ~AbstractLogger::Target::Notification);
         AbstractLogger::info(logTarget) << "Screenshot aborted.";
-        qApp->exit(1);
+        qApp->exit(E_ABORTED);
     });
     return qApp->exec();
 }