chore: add Open interface and script tweak

- add Open dbus interface
linuxdeepin · Jun 14, 2024 · a301078 · a301078
1 parent 83c2a17
commit a301078
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/assets/dbus/org.freedesktop.FileManager1.xml b/assets/dbus/org.freedesktop.FileManager1.xml
@@ -16,5 +16,8 @@
     <method name="Trash">
       <arg name="URIs" type="as" direction="in"/>
     </method>
+    <method name="Open">
+      <arg name="Args" type="as" direction="in"/>
+    </method>
   </interface>
 </node>
diff --git a/assets/scripts/dde-file-manager b/assets/scripts/dde-file-manager
@@ -4,15 +4,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-f="${1#file://}"
+args=""
+for arg in "$@"; do
+    args+="$arg,"
+done
 
-# dde-file-manager --show-item xxx
-if [[ "$1" == "--show-item" ]]; then
-    dbus-send --print-reply --dest=org.freedesktop.FileManager1 /org/freedesktop/FileManager1 org.freedesktop.FileManager1.ShowItems "array:string:${@:2}" "string:"
-# dde-file-manager /path/to/xxx or file:///path/to/xxx
-elif [ -e "$f" ]; then
-    dbus-send --print-reply --dest=org.freedesktop.FileManager1 /org/freedesktop/FileManager1 org.freedesktop.FileManager1.ShowItems "array:string:$f" "string:"
-else
-    exec /usr/libexec/dde-file-manager "$@"
-fi
+args=${args%,}
 
+dbus-send --print-reply --dest=org.freedesktop.FileManager1 /org/freedesktop/FileManager1 org.freedesktop.FileManager1.Open array:string:"$args"
diff --git a/src/plugins/server/serverplugin-filemanager1/filemanager1dbus.cpp b/src/plugins/server/serverplugin-filemanager1/filemanager1dbus.cpp
@@ -84,3 +84,11 @@ void FileManager1DBus::Trash(const QStringList &URIs)
     QJsonDocument doc(argsObj);
     QProcess::startDetached("dde-file-manager", QStringList() << "--event" << doc.toJson());
 }
+
+void FileManager1DBus::Open(const QStringList &Args)
+{
+    if (QProcess::startDetached("file-manager.sh", QStringList() << Args))
+        return;
+
+    QProcess::startDetached("dde-file-manager", QStringList() << Args);
+}
diff --git a/src/plugins/server/serverplugin-filemanager1/filemanager1dbus.h b/src/plugins/server/serverplugin-filemanager1/filemanager1dbus.h
@@ -24,6 +24,7 @@ public slots:
     void ShowItemProperties(const QStringList &URIs, const QString &StartupId);
     void ShowItems(const QStringList &URIs, const QString &StartupId);
     void Trash(const QStringList &URIs);
+    void Open(const QStringList &Args);
 };
 
 #endif   // FILEMANAGER1DBUS_H