fix: migrate default dock folders

Migrate existing default dock folder entries to the new model.
Preserve user-visible folder behavior after the fashion mode changes.

Author: shule1987

panels/dock/taskmanager/dconfig/org.deepin.ds.dock.taskmanager.json

@@ -96,6 +96,16 @@
 			"description": "The items which is docked when dock is started.",
 			"permissions": "readwrite",
 			"visibility": "private"
+		},
+		"defaultDockFoldersMigrationVersion": {
+			"value": 0,
+			"serial": 0,
+			"flags": [],
+			"name": "defaultDockFoldersMigrationVersion",
+			"name[zh_CN]": "默认驻留文件夹迁移版本",
+			"description": "Internal version used to migrate the default dock folders once.",
+			"permissions": "readwrite",
+			"visibility": "private"
 		}
 	}
 }

panels/dock/taskmanager/globals.h

@@ -27,6 +27,7 @@ static inline const QString TASKMANAGER_CGROUPS_BASED_GROUPING_SKIP_APPIDS = "cg
 static inline const QString TASKMANAGER_CGROUPS_BASED_GROUPING_SKIP_CATEGORIES = "cgroupsBasedGroupingSkipCategories";
 static inline const QString TASKMANAGER_DOCKEDITEMS_KEY = "Docked_Items";
 constexpr auto TASKMANAGER_DOCKEDELEMENTS_KEY = "dockedElements";
+constexpr auto TASKMANAGER_DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION_KEY = "defaultDockFoldersMigrationVersion";
 
 // model roleNames
 constexpr auto MODEL_WINID = "winId";

panels/dock/taskmanager/taskmanager.cpp

@@ -63,6 +63,48 @@ Q_LOGGING_CATEGORY(taskManagerLog, "org.deepin.dde.shell.dock.taskmanager", QtDe
 
 namespace dock {
 
+static QStringList mergedDockedElementsOrder(const QStringList &currentDockedElements, const QStringList &orderedDockElements)
+{
+    QStringList mergedDockedElements;
+    for (const QString &dockElement : orderedDockElements) {
+        if (currentDockedElements.contains(dockElement) && !mergedDockedElements.contains(dockElement)) {
+            mergedDockedElements.append(dockElement);
+        }
+    }
+
+    for (int i = 0; i < currentDockedElements.size(); ++i) {
+        const QString &dockElement = currentDockedElements.at(i);
+        if (mergedDockedElements.contains(dockElement)) {
+            continue;
+        }
+
+        int insertIndex = mergedDockedElements.size();
+        for (int j = i - 1; j >= 0; --j) {
+            const QString &previousElement = currentDockedElements.at(j);
+            const int previousIndex = mergedDockedElements.indexOf(previousElement);
+            if (previousIndex >= 0) {
+                insertIndex = previousIndex + 1;
+                break;
+            }
+        }
+
+        if (insertIndex == mergedDockedElements.size()) {
+            for (int j = i + 1; j < currentDockedElements.size(); ++j) {
+                const QString &nextElement = currentDockedElements.at(j);
+                const int nextIndex = mergedDockedElements.indexOf(nextElement);
+                if (nextIndex >= 0) {
+                    insertIndex = nextIndex;
+                    break;
+                }
+            }
+        }
+
+        mergedDockedElements.insert(insertIndex, dockElement);
+    }
+
+    return mergedDockedElements;
+}
+
 // 通过AM(Application Manager)匹配应用程序的辅助函数
 static QString getDesktopIdByPid(const QStringList &identifies)
 {
@@ -1643,12 +1685,7 @@ void TaskManager::activateWindow(uint32_t windowID)
 void TaskManager::saveDockElementsOrder(const QStringList &dockElements)
 {
     const QStringList &dockedElements = TaskManagerSettings::instance()->dockedElements();
-    QStringList newDockedElements;
-    for (const auto &dockElement : dockElements) {
-        if (dockedElements.contains(dockElement) && !newDockedElements.contains(dockElement)) {
-            newDockedElements.append(dockElement);
-        }
-    }
+    const QStringList newDockedElements = mergedDockedElementsOrder(dockedElements, dockElements);
     TaskManagerSettings::instance()->setDockedElements(newDockedElements);
 }
 

panels/dock/taskmanager/taskmanagersettings.cpp

@@ -6,9 +6,10 @@
 #include "taskmanagersettings.h"
 
 #include <QDir>
-#include <QStandardPaths>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QSet>
+#include <QStandardPaths>
 
 #include <string>
 
@@ -17,6 +18,24 @@
 namespace dock {
 namespace {
 static const QString DOWNLOADS_PLACEHOLDER = QStringLiteral("folder/$DOWNLOADS");
+static const QString APPLICATIONS_FOLDER_DOCK_ELEMENT = QStringLiteral("folder//usr/share/applications");
+static constexpr int DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION = 1;
+
+static QStringList stockDesktopDockedElements()
+{
+    return {
+        QStringLiteral("desktop/dde-file-manager"),
+        QStringLiteral("desktop/deepin-app-store"),
+        QStringLiteral("desktop/org.deepin.browser"),
+        QStringLiteral("desktop/deepin-mail"),
+        QStringLiteral("desktop/deepin-terminal"),
+        QStringLiteral("desktop/dde-calendar"),
+        QStringLiteral("desktop/deepin-music"),
+        QStringLiteral("desktop/deepin-editor"),
+        QStringLiteral("desktop/deepin-calculator"),
+        QStringLiteral("desktop/org.deepin.dde.control-center"),
+    };
+}
 
 static QString resolveDockedElement(const QString &element)
 {
@@ -47,6 +66,76 @@ static QStringList resolveDockedElements(const QStringList &elements)
 
     return resolvedElements;
 }
+
+static QSet<QString> asSet(const QStringList &elements)
+{
+    QSet<QString> elementSet;
+    for (const QString &element : elements) {
+        elementSet.insert(element);
+    }
+
+    return elementSet;
+}
+
+static QStringList defaultFolderDockedElements()
+{
+    return resolveDockedElements({DOWNLOADS_PLACEHOLDER, APPLICATIONS_FOLDER_DOCK_ELEMENT});
+}
+
+static bool matchesLegacyDefaultDockedLayout(const QStringList &elements)
+{
+    const QSet<QString> expectedDesktopElements = asSet(stockDesktopDockedElements());
+    const QSet<QString> expectedFolderElements = asSet(defaultFolderDockedElements());
+
+    QSet<QString> desktopElements;
+    QSet<QString> folderElements;
+    for (const QString &element : elements) {
+        if (element.startsWith(QStringLiteral("desktop/"))) {
+            desktopElements.insert(element);
+            continue;
+        }
+
+        if (element.startsWith(QStringLiteral("folder/"))) {
+            folderElements.insert(element);
+            continue;
+        }
+
+        return false;
+    }
+
+    if (desktopElements != expectedDesktopElements) {
+        return false;
+    }
+
+    for (const QString &folderElement : folderElements) {
+        if (!expectedFolderElements.contains(folderElement)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static QStringList mergedWithDefaultDockFolders(const QStringList &elements)
+{
+    QStringList mergedElements = elements;
+    int insertIndex = mergedElements.indexOf(QStringLiteral("desktop/dde-file-manager"));
+    if (insertIndex < 0) {
+        insertIndex = -1;
+    }
+
+    for (const QString &folderElement : defaultFolderDockedElements()) {
+        const int existingIndex = mergedElements.indexOf(folderElement);
+        if (existingIndex >= 0) {
+            insertIndex = existingIndex;
+            continue;
+        }
+
+        mergedElements.insert(++insertIndex, folderElement);
+    }
+
+    return resolveDockedElements(mergedElements);
+}
 }
 
 static inline QString bool2EnableStr(bool enable)
@@ -96,6 +185,7 @@ TaskManagerSettings::TaskManagerSettings(QObject *parent)
     m_cgroupsBasedGroupingSkipAppIds = m_taskManagerDconfig->value(TASKMANAGER_CGROUPS_BASED_GROUPING_SKIP_APPIDS, {"deepin-terminal"}).toStringList();
     m_cgroupsBasedGroupingSkipCategories = m_taskManagerDconfig->value(TASKMANAGER_CGROUPS_BASED_GROUPING_SKIP_CATEGORIES, {"TerminalEmulator"}).toStringList();
     migrateFromDockedItems();
+    migrateDefaultDockFolders();
 }
 
 bool TaskManagerSettings::isAllowedForceQuit()
@@ -207,6 +297,28 @@ void TaskManagerSettings::migrateFromDockedItems()
     }
 }
 
+void TaskManagerSettings::migrateDefaultDockFolders()
+{
+    const int migrationVersion = m_taskManagerDconfig->value(TASKMANAGER_DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION_KEY, 0).toInt();
+    if (migrationVersion >= DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION) {
+        return;
+    }
+
+    QStringList migratedDockedElements = m_dockedElements;
+    if (matchesLegacyDefaultDockedLayout(migratedDockedElements)) {
+        migratedDockedElements = mergedWithDefaultDockFolders(migratedDockedElements);
+    }
+
+    const bool dockedElementsChanged = migratedDockedElements != m_dockedElements;
+    if (dockedElementsChanged) {
+        m_dockedElements = migratedDockedElements;
+        saveDockedElements();
+    }
+
+    m_taskManagerDconfig->setValue(TASKMANAGER_DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION_KEY,
+                                   DEFAULT_DOCK_FOLDERS_MIGRATION_VERSION);
+}
+
 void TaskManagerSettings::saveDockedElements()
 {
     m_taskManagerDconfig->setValue(TASKMANAGER_DOCKEDELEMENTS_KEY, m_dockedElements);

panels/dock/taskmanager/taskmanagersettings.h

@@ -45,6 +45,7 @@ class TaskManagerSettings : public QObject
 private:
     explicit TaskManagerSettings(QObject *parent = nullptr);
     inline void migrateFromDockedItems();
+    inline void migrateDefaultDockFolders();
     inline void saveDockedElements();
 
 Q_SIGNALS: