Improve keys loading

Author: uglide

3rdparty/qredisclient

@@ -3,8 +3,8 @@
 #include <qredisclient/redisclient.h>
 #include <qredisclient/utils/text.h>
 
-#include <QObject>
 #include <QFile>
+#include <QObject>
 
 #include "hashkey.h"
 #include "listkey.h"
@@ -21,8 +21,15 @@ void KeyFactory::loadKey(
     int dbIndex,
     std::function<void(QSharedPointer<ValueEditor::Model>, const QString&)>
         callback) {
-  auto loadModel = [this, connection, keyFullPath, dbIndex, callback](
-                       RedisClient::Response resp, QString) {
+  auto processError = [callback, keyFullPath](const QString& err) {
+    QString msg(QCoreApplication::translate(
+        "RDM", "Cannot load key %1, connection error occurred: %2"));
+    callback(QSharedPointer<ValueEditor::Model>(),
+             msg.arg(printableString(keyFullPath)).arg(err));
+  };
+
+  auto loadModel = [this, connection, keyFullPath, dbIndex, callback,
+                    processError](RedisClient::Response resp) {
     QSharedPointer<ValueEditor::Model> result;
 
     if (resp.isErrorMessage() ||
@@ -46,8 +53,8 @@ void KeyFactory::loadKey(
       return;
     }
 
-    auto parseTtl = [this, type, connection, keyFullPath, dbIndex,
-                     callback](const RedisClient::Response& ttlResult) {
+    auto parseTtl = [this, type, connection, keyFullPath, dbIndex, callback,
+                     processError](const RedisClient::Response& ttlResult) {
       long long ttl = -1;
 
       if (ttlResult.type() == RedisClient::Response::Integer) {
@@ -64,27 +71,17 @@ void KeyFactory::loadKey(
       callback(result, QString());
     };
 
-    auto processTtlError = [callback, result, keyFullPath](const QString& err) {
-      QString msg(QCoreApplication::translate(
-          "RDM", "Cannot load TTL for key %1, connection error occurred: %2"));
-      callback(result, msg.arg(printableString(keyFullPath)).arg(err));
-    };
-
-    connection->cmd({"ttl", keyFullPath}, this, -1, parseTtl, processTtlError);
+    connection->cmd({"ttl", keyFullPath}, this, -1, parseTtl, processError);
   };
 
-  RedisClient::Command typeCmd({"type", keyFullPath}, this, loadModel, dbIndex);
-
   try {
-    RedisClient::Response typeResult = connection->runCommand(typeCmd);
-    if (typeResult.isPermissionError()) {
-      emit error(typeResult.value().toString());
-    }
+    connection->cmd({"type", keyFullPath}, this, dbIndex, loadModel,
+                    processError);
   } catch (const RedisClient::Connection::Exception& e) {
-    callback(
-        QSharedPointer<ValueEditor::Model>(),
-        QCoreApplication::translate("RDM", "Cannot retrieve type of the key: ") +
-            QString(e.what()));
+    callback(QSharedPointer<ValueEditor::Model>(),
+             QCoreApplication::translate("RDM",
+                                         "Cannot retrieve type of the key: ") +
+                 QString(e.what()));
   }
 }
 
@@ -122,14 +119,14 @@ void KeyFactory::submitNewKeyRequest(NewKeyRequest r) {
         auto val = r.value();
 
         if (!r.valueFilePath().isEmpty() && QFile::exists(r.valueFilePath())) {
-            QFile valueFile(r.valueFilePath());
+          QFile valueFile(r.valueFilePath());
 
-            if (!valueFile.open(QIODevice::ReadOnly)) {
-                return onRowAdded(QCoreApplication::translate(
-                                      "RDM", "Cannot open file with key value"));
-            }
+          if (!valueFile.open(QIODevice::ReadOnly)) {
+            return onRowAdded(QCoreApplication::translate(
+                "RDM", "Cannot open file with key value"));
+          }
 
-            val["value"] = valueFile.readAll();            
+          val["value"] = valueFile.readAll();
         }
 
         result->addRow(val, onRowAdded);

src/app/models/key-models/keyfactory.cpp

@@ -28,9 +28,9 @@ void ValueEditor::TabsModel::openTab(
           .arg(key->getDbIndex()),
       key.toWeakRef());
 
-  QSharedPointer<RedisClient::Connection> conn;
+  QSharedPointer<RedisClient::Connection> conn;  
 
-  if (inNewTab || m_viewModels.count() == 0) {
+  if (inNewTab || m_viewModels.count() == 0) {    
     beginInsertRows(QModelIndex(), m_viewModels.count(), m_viewModels.count());
     m_viewModels.append(viewModel);
     endInsertRows();
@@ -89,6 +89,20 @@ void ValueEditor::TabsModel::openTab(
     m_events->registerLoggerForConnection(*conn);
   }
 
+  viewModel->setConnection(conn);
+
+  connect(conn.data(), &RedisClient::Connection::shutdownStart,
+          this, [this, viewModel](){
+      if (!viewModel) return;
+     viewModel->setTabError(QCoreApplication::translate("RDM", "Connection error"));
+
+     int modelIndex = m_viewModels.indexOf(viewModel);
+
+     if (modelIndex != -1) {
+         emit dataChanged(index(modelIndex, 0), index(modelIndex, 0));
+     }
+  });
+
   try {
     QtConcurrent::run([this, conn, key, viewModelWeekRef, callbackWrapper]() {
       if (!conn->isConnected())

src/modules/value-editor/tabsmodel.cpp

@@ -7,6 +7,8 @@
 
 ValueEditor::ValueViewModel::ValueViewModel(const QString& loadingTitle)
     : BaseListModel(),
+      m_model(nullptr),
+      m_connection(nullptr),
       m_startFramePosition(0),
       m_lastLoadedRowFrameSize(0),
       m_singlePageMode(false),
@@ -37,6 +39,11 @@ QString ValueEditor::ValueViewModel::tabLoadingTitle() const {
     return m_tabTitle;
 }
 
+void ValueEditor::ValueViewModel::setTabError(const QString &t)
+{
+    m_tabTitle = t;
+}
+
 bool ValueEditor::ValueViewModel::isModelLoaded() const {
     return !m_model.isNull();
 }
@@ -69,6 +76,11 @@ void ValueEditor::ValueViewModel::setModel(QSharedPointer<Model> model) {
   emit modelLoaded();
 }
 
+void ValueEditor::ValueViewModel::setConnection(QSharedPointer<RedisClient::Connection> c)
+{
+    m_connection = c;
+}
+
 void ValueEditor::ValueViewModel::renameKey(const QString& newKeyName) {
   if (!m_model) {
     qWarning() << "Model is not loaded";

src/modules/value-editor/valueviewmodel.cpp

@@ -32,8 +32,12 @@ class ValueViewModel : public BaseListModel {
   QSharedPointer<Model> model();
   void setModel(QSharedPointer<Model> model);
 
+  void setConnection(QSharedPointer<RedisClient::Connection> c);
+
   QString tabLoadingTitle() const;
 
+  void setTabError(const QString& t);
+
   void close();
 
  public:
@@ -84,6 +88,7 @@ class ValueViewModel : public BaseListModel {
 
  private:
   QSharedPointer<Model> m_model;
+  QSharedPointer<RedisClient::Connection> m_connection;
   int m_startFramePosition;
   int m_lastLoadedRowFrameSize;
   bool m_singlePageMode;

src/modules/value-editor/valueviewmodel.h

@@ -462,7 +462,7 @@ ApplicationWindow {
                 target: valuesModel
                 ignoreUnknownSignals: true
 
-                function onKeyError(error) {
+                function onTabError(index, error) {
                     if (index != -1)
                         tabs.currentIndex = index