refactor: add desktop plugin definitions and improve plugin loading

- Added desktop plugin definitions in dfm_plugin_defines.h:
  * Added Core::kDesktop for core desktop plugins
  * Added Edge::kDesktop for edge desktop plugins
  * Added desktopCorePlugins() and desktopAllPlugins() utility functions
- Improved plugin loading mechanism:
  * Replaced static lazy load list with dynamic filter function
  * Added plugin filter based on desktop core plugins list
  * Removed hardcoded plugin names from lazy loading list
- Updated package dependencies:
  * Removed qt5dxcb-plugin and dcc-wallpapersetting-plugin from Recommends

Log:

debian/control

@@ -80,7 +80,7 @@ Depends:
  qtxdg-dev-tools
 Conflicts: dde-workspace (<< 2.90.5), dde-file-manager-oem, dde-desktop-plugins
 Replaces: dde-file-manager-oem, dde-file-manager (<< 6.0.1), dde-desktop-plugins
-Recommends: qt5dxcb-plugin, deepin-screensaver, dcc-wallpapersetting-plugin
+Recommends: deepin-screensaver
 Description: deepin desktop-environment - desktop module
  Deepin Desktop Environment (DDE) - desktop module.
 

include/dfm-base/dfm_plugin_defines.h

@@ -11,6 +11,8 @@
 
 DFMBASE_BEGIN_NAMESPACE
 
+// TODO: auto register
+
 namespace Plugins {
 namespace Core {
 inline constexpr std::initializer_list<const char *> kCommon {
@@ -27,6 +29,10 @@ inline constexpr std::initializer_list<const char *> kFileManager {
     "dfmplugin-detailspace", "dfmplugin-sidebar", "dfmplugin-titlebar",
     "dfmplugin-workspace", "dfmplugin-smbbrowser"
 };
+
+inline constexpr std::initializer_list<const char *> kDesktop {
+    "ddplugin-core", "ddplugin-canvas", "ddplugin-background", "ddplugin-organizer"
+};
 }   // namespace Core
 
 namespace Edge {
@@ -38,6 +44,10 @@ inline constexpr std::initializer_list<const char *> kFileManager {
     "dfmplugin-trash", "dfmplugin-recent", "dfmplugin-avfsbrowser",
     "dfmplugin-search", "dfmplugin-myshares", "dfmplugin-vault"
 };
+
+inline constexpr std::initializer_list<const char *> kDesktop {
+    "ddplugin-wallpapersetting"
+};
 }   // namespace Edge
 
 namespace Utils {
@@ -49,13 +59,32 @@ inline QStringList filemanagerCorePlugins()
     std::copy(Plugins::Core::kFileManager.begin(), Plugins::Core::kFileManager.end(), std::back_inserter(result));
     return result;
 }
+
 inline QStringList filemanagerAllPlugins()
 {
     QStringList result { filemanagerCorePlugins() };
     std::copy(Plugins::Edge::kCommon.begin(), Plugins::Edge::kCommon.end(), std::back_inserter(result));
     std::copy(Plugins::Edge::kFileManager.begin(), Plugins::Edge::kFileManager.end(), std::back_inserter(result));
     return result;
 }
+
+inline QStringList desktopCorePlugins()
+{
+    QStringList result;
+    std::copy(Plugins::Core::kCommon.begin(), Plugins::Core::kCommon.end(), std::back_inserter(result));
+    std::copy(Plugins::Core::kCommonVirtual.begin(), Plugins::Core::kCommonVirtual.end(), std::back_inserter(result));
+    std::copy(Plugins::Core::kDesktop.begin(), Plugins::Core::kDesktop.end(), std::back_inserter(result));
+    return result;
+}
+
+inline QStringList desktopAllPlugins()
+{
+    QStringList result { desktopCorePlugins() };
+    std::copy(Plugins::Edge::kCommon.begin(), Plugins::Edge::kCommon.end(), std::back_inserter(result));
+    std::copy(Plugins::Edge::kDesktop.begin(), Plugins::Edge::kDesktop.end(), std::back_inserter(result));
+    return result;
+}
+
 }   // namespace Utils
 }   // namespace Plugins
 

src/external/dde-shell-plugins/panel-desktop/main.cpp

@@ -12,6 +12,7 @@
 #include <dfm-base/base/application/settings.h>
 #include <dfm-base/dfm_global_defines.h>
 #include <dfm-base/utils/windowutils.h>
+#include <dfm-base/dfm_plugin_defines.h>
 
 #include <dfm-framework/dpf.h>
 
@@ -58,6 +59,24 @@ static const char *const kLibCore = "libdd-core-plugin.so";
 
 namespace desktop {
 
+static bool lazyLoadFilter(const QString &name)
+{
+    static const QStringList kLazyLoadPluginNames { "ddplugin-wallpapersetting", "dfmplugin-bookmark", "dfmplugin-propertydialog",
+                                                    "dfmplugin-tag", "dfmplugin-burn", "dfmplugin-dirshare", "dfmplugin-emblem" };
+
+    if (kLazyLoadPluginNames.contains(name))
+        return true;
+
+    static const auto &kAllNames {
+        DFMBASE_NAMESPACE::Plugins::Utils::desktopCorePlugins()
+    };
+
+    if (!kAllNames.contains(name))
+        return true;
+
+    return false;
+}
+
 static bool pluginsLoad()
 {
     QString msg;
@@ -79,13 +98,6 @@ static bool pluginsLoad()
 
     qCInfo(logAppDesktop) << "Using plugins dir:" << pluginsDirs;
 
-    // TODO(xust): the GVolumeMonitor object MUST be initialized in MAIN thread, so a initialize operation is added in dbusregister::initialize.
-    // the function `DFMIO::DFMUtils::fileIsRemovable` indirectly initialized the GVolumeMonitor object and the function is invoked everywhere.
-    // solve the indirectly initialize issue and then push the plugin to lazy list.
-    static const QStringList kLazyLoadPluginNames { "ddplugin-wallpapersetting", "dfmplugin-bookmark", "dfmplugin-propertydialog",
-                                                    "dfmplugin-tag", "dfmplugin-burn", "dfmplugin-dirshare", "dfmplugin-emblem",
-                                                    "dfmplugin-filepreview" };
-
     QStringList blackNames { DConfigManager::instance()->value(kPluginsDConfName, "desktop.blackList").toStringList() };
 #ifdef COMPILE_ON_V2X
     if (DFMBASE_NAMESPACE::WindowUtils::isWayLand()) {
@@ -95,7 +107,8 @@ static bool pluginsLoad()
         }
     }
 #endif
-    DPF_NAMESPACE::LifeCycle::initialize({ kDesktopPluginInterface, kCommonPluginInterface }, pluginsDirs, blackNames, kLazyLoadPluginNames);
+    DPF_NAMESPACE::LifeCycle::initialize({ kDesktopPluginInterface, kCommonPluginInterface }, pluginsDirs, blackNames);
+    DPF_NAMESPACE::LifeCycle::setLazyloadFilter(lazyLoadFilter);
 
     qCInfo(logAppDesktop) << "Depend library paths:" << DApplication::libraryPaths();
     qCInfo(logAppDesktop) << "Load plugin paths: " << dpf::LifeCycle::pluginPaths();