feat(dbus): implement comprehensive DBus service interface

add-uos · add-uos · commit 882e4095c8e3 · 2025-10-28T10:54:12.000+08:00
Add DBus service files and implement full interface for deepin-compressor:
- Install DBus service and interface XML files via CMake
- Create com.deepin.Compressor.service with proper service name and executable path
- Define DBus interface with methods for window management (show/hide/raise/quit)
- Add compression operations (compressFiles, extractFiles, previewArchive)
- Update ApplicationAdaptor to handle MainWindow instead of QApplication
- Register DBus service in CompressorApplication constructor
- Modify main.cpp to use correct service name and object paths

The implementation provides a complete DBus API for external applications
to interact with the compressor application programmatically, enabling
integration with desktop environments and other system services.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -135,3 +135,11 @@ install(DIRECTORY assets/deepin-compressor DESTINATION ${CMAKE_INSTALL_DATADIR}/
 
 # 支持压缩的格式
 #install(FILES conf/compressor-singlecompress.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-compressor/compressedformat/)
+
+# Install DBus service file
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.service
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services/)
+
+# Install DBus interface XML file
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.xml
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/)
diff --git a/src/com.deepin.Compressor.service b/src/com.deepin.Compressor.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.deepin.Compressor
+Exec=/usr/bin/deepin-compressor
diff --git a/src/com.deepin.Compressor.xml b/src/com.deepin.Compressor.xml
@@ -0,0 +1,36 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="com.deepin.Compressor">
+    <method name="showWindow">
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="hideWindow">
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="raiseWindow">
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="raise">
+      <arg direction="in" type="s" name="sFile"/>
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="quitWindow">
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="compressFiles">
+      <arg direction="in" type="as" name="filePaths"/>
+      <arg direction="in" type="s" name="destinationPath"/>
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="extractFiles">
+      <arg direction="in" type="s" name="archivePath"/>
+      <arg direction="in" type="s" name="destinationPath"/>
+      <arg direction="out" type="b"/>
+    </method>
+    <method name="previewArchive">
+      <arg direction="in" type="s" name="archivePath"/>
+      <arg direction="out" type="b"/>
+    </method>
+  </interface>
+</node>
diff --git a/src/main.cpp b/src/main.cpp
@@ -217,30 +217,31 @@ int main(int argc, char *argv[])
     showWatermark(sJsonStr, &w);
 
     qDebug() << "Creating DBus adaptor and connecting to session bus";
-    ApplicationAdaptor adaptor(&app);
+    ApplicationAdaptor adaptor(&w);
     QDBusConnection dbus = QDBusConnection::sessionBus();
     
     if(!orderObject){
         qDebug() << "Registering standard DBus service";
-        if (dbus.registerService("com.deepin.compressor")) {
+        if (dbus.registerService("com.deepin.Compressor")) {
+            dbus.registerObject("/com/deepin/Compressor", &w);
             qDebug() << "DBus service registered successfully, moving window to center";
             Dtk::Widget::moveToCenter(&w);
         } else {
-            qWarning() << "Failed to register standard DBus service";
+            qWarning() << "Failed to register standard DBus service:" << dbus.lastError().message();
         }
     } else {
         qDebug() << "Registering WPS-specific DBus service";
-        QString serviceName = "com.deepin.compressor"+QString::number(QGuiApplication::applicationPid());
+        QString serviceName = "com.deepin.Compressor"+QString::number(QGuiApplication::applicationPid());
         if (dbus.registerService(serviceName)) {
             qDebug() << "WPS DBus service registered successfully";
-            QString objectPath = "/"+QString::number(QGuiApplication::applicationPid());
-            dbus.registerObject(objectPath, &app);
+            QString objectPath = "/com/deepin/Compressor/"+QString::number(QGuiApplication::applicationPid());
+            dbus.registerObject(objectPath, &w);
             adaptor.setCompressFile(newfilelist.first());
             Dtk::Widget::moveToCenter(&w);
             w.setProperty(ORDER_JSON, sJsonStr);
             qDebug() << "Window properties set for WPS mode";
         } else {
-            qWarning() << "Failed to register WPS DBus service";
+            qWarning() << "Failed to register WPS DBus service:" << dbus.lastError().message();
         }
 
         qDebug() << "Connecting to WPS cryptfs DBus interface";
diff --git a/src/source/common/dbusadpator.cpp b/src/source/common/dbusadpator.cpp
@@ -3,24 +3,30 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include "dbusadpator.h"
+#include "mainwindow.h"
+#include "archivemanager.h"
+
 #include <QFileInfo>
 #include <QtDebug>
 #include <DSettings>
-#include "dbusadpator.h"
 #include <QMainWindow>
 #include <QDBusInterface>
 #include <QDBusReply>
+#include <QDir>
+
 const QString SOPENLIST = "openfiles";
 
-ApplicationAdaptor::ApplicationAdaptor(QApplication *application)
-    : QDBusAbstractAdaptor(application), app(application)
+ApplicationAdaptor::ApplicationAdaptor(MainWindow *mainwindow)
+    : QDBusAbstractAdaptor(mainwindow), m_mainWindow(mainwindow)
 {
     qDebug() << "ApplicationAdaptor initialized";
-    connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
-    connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
-            SLOT(focusChangedSlot(QWidget*, QWidget*)));
 }
 
+void ApplicationAdaptor::setMainWindow(MainWindow *mainWindow)
+{
+    m_mainWindow = mainWindow;
+}
 
 /**
  * @brief setCurOpenFile    设置当前的压缩包文件名
@@ -32,16 +38,18 @@ void ApplicationAdaptor::setCompressFile(const QString &sFile)
     m_sFile = sFile;
 }
 
-
-void ApplicationAdaptor::raise(const QString &sFile)
+bool ApplicationAdaptor::raise(const QString &sFile)
 {
     qDebug() << "Raise window request for file:" << sFile;
     if(m_sFile.isEmpty() || m_sFile.isNull()) {
         qWarning() << "No compress file set, cannot raise window";
-        return;
+        return false;
     }
-    if(m_curShowWidget && (m_sFile == sFile))
+    if(m_curShowWidget && (m_sFile == sFile)) {
         m_curShowWidget->activateWindow();
+        return true;
+    }
+    return false;
 }
 
 void ApplicationAdaptor::onActiveWindow(qint64 pid)
@@ -84,5 +92,119 @@ void ApplicationAdaptor::onActiveWindow(qint64 pid)
             }
         }
     }
+}
+
+// Window management methods
+bool ApplicationAdaptor::showWindow()
+{
+    qDebug() << "DBus: showWindow called";
+    if (m_mainWindow) {
+        m_mainWindow->show();
+        m_mainWindow->raise();
+        m_mainWindow->activateWindow();
+        return true;
+    }
+    return false;
+}
+
+bool ApplicationAdaptor::hideWindow()
+{
+    qDebug() << "DBus: hideWindow called";
+    if (m_mainWindow) {
+        m_mainWindow->hide();
+        return true;
+    }
+    return false;
+}
+
+bool ApplicationAdaptor::raiseWindow()
+{
+    qDebug() << "DBus: raiseWindow called";
+    if (m_mainWindow) {
+        m_mainWindow->raise();
+        m_mainWindow->activateWindow();
+        return true;
+    }
+    return false;
+}
+
+bool ApplicationAdaptor::quitWindow()
+{
+    qDebug() << "DBus: quitWindow called";
+    if (m_mainWindow) {
+        m_mainWindow->close();
+        return true;
+    }
+    return false;
+}
+
+bool ApplicationAdaptor::compressFiles(const QStringList &filePaths)
+{
+    qDebug() << "DBus: compressFiles called with" << filePaths.size();
+    
+    if (filePaths.isEmpty()) {
+        qWarning() << "No files provided for compression";
+        return false;
+    }
+    
+    if (!m_mainWindow) {
+        qWarning() << "MainWindow not available";
+        return false;
+    }
+
+    for (const QString &filePath : filePaths) {
+        if (!QFileInfo::exists(filePath)) {
+            qWarning() << "File does not exist:" << filePath;
+            return false;
+        }
+    }
+
+    showWindow();
+    m_mainWindow->slotDragSelectedFiles(QStringList{filePaths});
+    return true;
+}
+
+bool ApplicationAdaptor::extractFiles(const QString &archivePath, const QString &destinationPath)
+{
+    qDebug() << "DBus: extractFiles called for" << archivePath << "to" << destinationPath;
+    
+    if (!QFileInfo::exists(archivePath)) {
+        qWarning() << "Archive file does not exist:" << archivePath;
+        return false;
+    }
+    
+    if (!m_mainWindow) {
+        qWarning() << "MainWindow not available";
+        return false;
+    }
+
+    QFileInfo destInfo(destinationPath);
+    if (!destInfo.isDir() || !destInfo.isWritable()) {
+        qWarning() << "Destination path is not a writable directory:" << destinationPath;
+        return false;
+    }
+
+    showWindow();
+    m_mainWindow->slotDragSelectedFiles(QStringList{archivePath});
+    m_mainWindow->slotUncompressClicked(destinationPath);
+    return true;
+}
+
+bool ApplicationAdaptor::previewArchive(const QString &archivePath)
+{
+    qDebug() << "DBus: previewArchive called for" << archivePath;
+    
+    if (!QFileInfo::exists(archivePath)) {
+        qWarning() << "Archive file does not exist:" << archivePath;
+        return false;
+    }
+    
+    if (!m_mainWindow) {
+        qWarning() << "MainWindow not available";
+        return false;
+    }
 
+    showWindow();
+    m_mainWindow->slotDragSelectedFiles(QStringList{archivePath});
+    return true;
 }
diff --git a/src/source/common/dbusadpator.h b/src/source/common/dbusadpator.h
@@ -4,49 +4,88 @@
 #ifndef DBUS_ADAPTOR
 #define DBUS_ADAPTOR
 
-#include <QtDBus/QDBusAbstractAdaptor>
-
-#include "QApplication"
+#include <QDBusAbstractAdaptor>
+#include <QApplication>
 #include <QWidget>
 #include <QSettings>
+#include <QStringList>
+
+class MainWindow;
 
 /**
  * @file d-bus适配器，开放归档管理器d-bus接口
  */
 class ApplicationAdaptor: public QDBusAbstractAdaptor
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.deepin.compressor")
+    Q_CLASSINFO("D-Bus Interface", "com.deepin.Compressor")
     Q_CLASSINFO("D-Bus Introspection", ""
-                "  <interface name=\"com.deepin.compressor\">\n"
+                "  <interface name=\"com.deepin.Compressor\">\n"
 
+                "    <method name=\"showWindow\">\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"hideWindow\">\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"raiseWindow\">\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"quitWindow\">\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"compressFiles\">\n"
+                "      <arg direction=\"in\" type=\"as\" name=\"filePaths\"/>\n"
+                "      <arg direction=\"in\" type=\"s\" name=\"destinationPath\"/>\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"extractFiles\">\n"
+                "      <arg direction=\"in\" type=\"s\" name=\"archivePath\"/>\n"
+                "      <arg direction=\"in\" type=\"s\" name=\"destinationPath\"/>\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
+                "    <method name=\"previewArchive\">\n"
+                "      <arg direction=\"in\" type=\"s\" name=\"archivePath\"/>\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
+                "    </method>\n"
                 "    <method name=\"raise\">\n"
-                "      <arg direction=\"in\" type=\"none\" name=\"raise\"/>\n"
+                "      <arg direction=\"in\" type=\"s\" name=\"sFile\"/>\n"
+                "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
-
                 "  </interface>\n")
 
 public:
-    ApplicationAdaptor(QApplication *application);
+    ApplicationAdaptor(MainWindow *mainwindow);
     /**
      * @brief setCurOpenFile    设置当前的压缩包文件名
      * @param sFile    压缩包文件名
      */
     void setCompressFile(const QString &sFile);
-
+    void setMainWindow(MainWindow *mainWindow);
 
 public Q_SLOTS:
     /**
      * @brief raise    dbus接口
      * @param sFile    压缩包文件名的窗口激活
      */
-    void raise(const QString &sFile);
+    bool raise(const QString &sFile);
     /**
      * @brief onActiveWindow    激活窗口
      * @param pid    对应进程id
      */
     void onActiveWindow(qint64 pid);
 
+    // Window management methods
+    bool showWindow();
+    bool hideWindow();
+    bool raiseWindow();
+    bool quitWindow();
+    
+    // Compression related methods
+    bool compressFiles(const QStringList &filePaths);
+    bool extractFiles(const QString &archivePath, const QString &destinationPath);
+    bool previewArchive(const QString &archivePath);
+
 private slots:
     /**
      * @brief focusChangedSlot    激活窗口切换
@@ -61,6 +100,7 @@ private slots:
     QApplication *app = nullptr;            //运行应用程序实例
     QWidget *m_curShowWidget = nullptr;     //当前显示窗口
     QString m_sFile;                        //压缩包文件名
+    MainWindow *m_mainWindow = nullptr;     //主窗口指针
 };
 
 #endif /* ifndef _DMR_DBUS_ADAPTOR */
diff --git a/src/source/compressorapplication.cpp b/src/source/compressorapplication.cpp
diff --git a/src/source/mainwindow.cpp b/src/source/mainwindow.cpp
diff --git a/src/source/mainwindow.h b/src/source/mainwindow.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[D-BUS Service]`
	`2`	`+Name=com.deepin.Compressor`
	`3`	`+Exec=/usr/bin/deepin-compressor`