feat: load all root applet by default

load all root applet by default. Issue: linuxdeepin/developer-center#5965
linuxdeepin · Oct 25, 2023 · 8468167 · 8468167
1 parent 7f7a835
commit 8468167
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/frame/pluginloader.cpp b/frame/pluginloader.cpp
@@ -191,6 +191,25 @@ QList<DPluginMetaData> DPluginLoader::plugins() const
     return d->m_plugins.values();
 }
 
+QList<DPluginMetaData> DPluginLoader::rootPlugins() const
+{
+    D_DC(DPluginLoader);
+    QList<DPluginMetaData> rootPlugins;
+    for (auto item : plugins()) {
+        auto parent = parentPlugin(item.pluginId());
+
+        // root plugin can't has parent.
+        if (parent.isValid())
+            continue;
+
+        if (rootPlugins.contains(item))
+            continue;
+
+        rootPlugins << item;
+    }
+    return rootPlugins;
+}
+
 void DPluginLoader::addPackageDir(const QString &dir)
 {
     D_D(DPluginLoader);

diff --git a/frame/pluginloader.h b/frame/pluginloader.h
@@ -27,6 +27,7 @@ class Q_DECL_EXPORT DPluginLoader : public QObject, public DTK_CORE_NAMESPACE::D
 
     static DPluginLoader *instance();
     QList<DPluginMetaData> plugins() const;
+    QList<DPluginMetaData> rootPlugins() const;
     void addPackageDir(const QString &dir);
     void addPluginDir(const QString &dir);
 

diff --git a/shell/main.cpp b/shell/main.cpp
@@ -41,10 +41,14 @@ int main(int argc, char *argv[])
     QList<DApplet *> applets;
     if (parser.isSet(testOption)) {
         pluginIds << "org.deepin.ds.corona-example";
-    }
-    if (parser.isSet(coronaOption)) {
+    } else if (parser.isSet(coronaOption)) {
         pluginIds << parser.values(coronaOption);
+    } else {
+        for (auto item : DPluginLoader::instance()->rootPlugins()) {
+            pluginIds << item.pluginId();
+        }
     }
+
     qInfo() << "Loading plugin id" << pluginIds;
     for (auto pluginId : pluginIds) {
         auto applet = DPluginLoader::instance()->loadApplet(pluginId);