Optimize restoring expanded namespaces on reload

Author: uglide

src/modules/connections-tree/items/abstractnamespaceitem.cpp

@@ -21,7 +21,12 @@ AbstractNamespaceItem::AbstractNamespaceItem(
       m_combinator(nullptr) {}
 
 QList<QSharedPointer<TreeItem>> AbstractNamespaceItem::getAllChilds() const {
-  return m_childItems;
+    return m_childItems;
+}
+
+QList<QSharedPointer<AbstractNamespaceItem>> AbstractNamespaceItem::getAllChildNamespaces() const
+{
+    return m_childNamespaces.values();
 }
 
 QSharedPointer<TreeItem> AbstractNamespaceItem::child(uint row) const {

src/modules/connections-tree/items/abstractnamespaceitem.h

@@ -24,6 +24,8 @@ class AbstractNamespaceItem : public TreeItem, public MemoryUsage {
 
   QList<QSharedPointer<TreeItem>> getAllChilds() const override;
 
+  QList<QSharedPointer<AbstractNamespaceItem>> getAllChildNamespaces() const;
+
   uint childCount(bool recursive = false) const override;
 
   QSharedPointer<TreeItem> child(uint row) const override;

src/modules/connections-tree/model.cpp

@@ -4,6 +4,7 @@
 #include <QWeakPointer>
 #include <algorithm>
 #include "items/serveritem.h"
+#include "items/databaseitem.h"
 
 using namespace ConnectionsTree;
 
@@ -184,11 +185,10 @@ void Model::onItemChildsLoaded(QWeakPointer<TreeItem> item) {
     emit expand(index);
 
     QSettings settings;
-    if (settings.value("app/reopenNamespacesOnReload", true).toBool()) {
-      restoreOpenedNamespaces(index);
-    } else {
-      qDebug() << "Namespace reopening is disabled in settings";
-      m_expanded.clear();
+    m_expanded.clear();
+
+    if (settings.value("app/reopenNamespacesOnReload", true).toBool()) {     
+      restoreOpenedNamespaces(treeItem.staticCast<AbstractNamespaceItem>());
     }
   } else if (treeItem->type() == "server" || treeItem->type() == "namespace") {
     emit expand(index);
@@ -334,13 +334,17 @@ void Model::removeRootItem(QSharedPointer<ServerItem> item) {
   endRemoveRows();
 }
 
-void Model::restoreOpenedNamespaces(const QModelIndex &dbIndex) {
-  m_expanded.clear();
+void Model::restoreOpenedNamespaces(QSharedPointer<AbstractNamespaceItem> ns)
+{
+    if (ns->type() == "namespace" && !ns->isExpanded())
+        return;
+
+    if (ns->isExpanded())
+        emit expand(getIndexFromItem(ns.staticCast<TreeItem>().toWeakRef()));
 
-  QModelIndex searchFrom = index(0, 0, dbIndex);
-  QModelIndexList matches =
-      match(searchFrom, itemIsInitiallyExpanded, true, -1,
-            Qt::MatchFixedString | Qt::MatchCaseSensitive | Qt::MatchRecursive);
+    auto childs = ns->getAllChildNamespaces();
 
-  foreach (QModelIndex i, matches) { emit expand(i); }
+    for (auto childNs : childs) {
+        restoreOpenedNamespaces(childNs);
+    }
 }

src/modules/connections-tree/model.h

@@ -11,6 +11,7 @@
 namespace ConnectionsTree {
 
 class ServerItem;
+class AbstractNamespaceItem;
 
 class Model : public QAbstractItemModel {
   Q_OBJECT
@@ -114,9 +115,9 @@ class Model : public QAbstractItemModel {
  protected:
   void addRootItem(QSharedPointer<ServerItem> item);
 
-  void removeRootItem(QSharedPointer<ServerItem> item);
+  void removeRootItem(QSharedPointer<ServerItem> item);  
 
-  void restoreOpenedNamespaces(const QModelIndex &dbIndex);
+  void restoreOpenedNamespaces(QSharedPointer<AbstractNamespaceItem> ns);
 
  private:
   QList<QSharedPointer<TreeItem>> m_treeItems;