feat: [AM] adapt new AM

open computer:/// trash:/// with xdg-open on V23, and gio open on UOS. Log: as title.
linuxdeepin · May 7, 2024 · 787ad8c · 787ad8c
1 parent 6b553a4
commit 787ad8c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/debian/dde-desktop.install b/debian/dde-desktop.install
@@ -1,5 +1,6 @@
 usr/bin/dde-desktop
 usr/lib/*/dde-file-manager/plugins/desktop-core/*.so
+usr/bin/dfm-open.sh
 usr/share/applications/dde-computer.desktop
 usr/share/applications/dde-trash.desktop
 usr/share/applications/dde-home.desktop

diff --git a/src/apps/dde-desktop/CMakeLists.txt b/src/apps/dde-desktop/CMakeLists.txt
@@ -47,6 +47,7 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 install(FILES data/com.deepin.dde.desktop.service DESTINATION share/dbus-1/services)
 
 # computer and trash
+install(FILES data/applications/dfm-open.sh DESTINATION bin/)
 install(FILES data/applications/dde-computer.desktop DESTINATION share/applications/)
 install(FILES data/applications/dde-trash.desktop DESTINATION share/applications/)
 install(FILES data/applications/dde-home.desktop DESTINATION share/applications/)

diff --git a/src/apps/dde-desktop/data/applications/dde-computer.desktop b/src/apps/dde-desktop/data/applications/dde-computer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=System;
 Comment=Show basic info of the computer.
-Exec=gio open computer:///
+Exec=dfm-open.sh computer:///
 GenericName=Computer
 Icon=computer
 Name=Computer

diff --git a/src/apps/dde-desktop/data/applications/dde-trash.desktop b/src/apps/dde-desktop/data/applications/dde-trash.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=System;
 Comment=Open trash.
-Exec=gio open trash:///
+Exec=dfm-open.sh trash:///
 GenericName=Open Trash.
 Icon=user-trash
 Name=Trash

diff --git a/src/apps/dde-desktop/data/applications/dfm-open.sh b/src/apps/dde-desktop/data/applications/dfm-open.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+sys_name=$(grep "^SystemName=" /etc/os-version | cut -d'=' -f2)
+sys_ver=$(grep "^MajorVersion=" /etc/os-version | cut -d'=' -f2)
+
+# this is for adapt the new ApplicationManager.
+# open computer/trash root with 'gio open',
+# the cgroups of the opened app is not belongs to dde-file-manager,
+# which cause the opened apps in dock panel is not dde-file-manager,
+# and the new opened dde-file-manager window also wrapped into trash/computer entry.
+# the 'xdg-open' in V23 accept the computer/trash scheme,
+# So, after opening a directory with xdg-open,
+# the application's cgroup can be categorized into the file manager as expected.
+
+if [ "$sys_name" = "Deepin" ] && [ "$sys_ver" = "23" ]; then
+	echo "open $1 with xdg-open."
+	xdg-open $1
+else
+	echo "open $1 with gio open."
+	gio open $1
+fi
+