RedisDesktopManager 0.9.0-alpha4

.gitmodules

@@ -9,10 +9,4 @@
 	url = https://github.com/uglide/qredisclient.git
 [submodule "3rdparty/gbreakpad"]
 	path = 3rdparty/gbreakpad
-	url = https://chromium.googlesource.com/breakpad/breakpad
-[submodule "3rdparty/qgamp"]
-	path = 3rdparty/qgamp
-	url = https://github.com/uglide/qgamp.git
-[submodule "src/qml/3rdparty/php-unserialize-js"]
-	path = src/qml/3rdparty/php-unserialize-js
-	url = https://github.com/uglide/php-unserialize-js.git
+	url = https://github.com/google/breakpad.git

.travis.yml

@@ -15,7 +15,7 @@ install:
   fi
 - cd ./src && ./configure && cd ./../
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-       source /opt/qt57/bin/qt57-env.sh
+       source /opt/qt58/bin/qt58-env.sh
        ; 
   fi
 - qmake -v

3rdparty/3rdparty.pri

@@ -9,10 +9,6 @@ OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnseria
 # qredisclient
 include($$PWD/qredisclient/qredisclient.pri)
 
-#qgamp
-include($$PWD/qgamp/qgamp.pri)
-DEFINES += GMP_ID=\\\"UA-68484170-1\\\"
-
 # Easylogging
 INCLUDEPATH += $$PWD/easyloggingpp/src
 HEADERS += $$PWD/easyloggingpp/src/easylogging++.h

appveyor.yml

@@ -3,7 +3,7 @@ version: 0.9.0.{build}
 clone_depth: 5
 install:
 - git submodule update --init --recursive
-- set QTDIR=C:\Qt\5.7\msvc2015
+- set QTDIR=C:\Qt\5.8\msvc2015
 - set PATH=%QTDIR%\bin;%PATH%
 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
 - nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2

build/common_functions

@@ -11,18 +11,20 @@ function build_breakpad {
     git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss || true
     touch README
     ./configure
-    make -j 2	
+    make -s -j 2	
 }
 
 function build_libssh2 {
-    cd $DEPS_DIR
-    git clone https://github.com/libssh2/libssh2.git libssh2 || true
-    cd libssh2
-    mkdir bin || rm -fR ./bin && mkdir bin
-    cd bin
-    cmake -DCRYPTO_BACKEND=OpenSSL -DENABLE_ZLIB_COMPRESSION=ON ..
-    cmake --build .
-    sudo make install
+    if [ ! -f /usr/local/lib/libssh2.a ]; then
+        cd $DEPS_DIR
+        git clone https://github.com/libssh2/libssh2.git libssh2 || true
+        cd libssh2
+        mkdir bin || rm -fR ./bin && mkdir bin
+        cd bin
+        cmake -DCRYPTO_BACKEND=OpenSSL -DENABLE_ZLIB_COMPRESSION=ON ..
+        cmake --build .
+        sudo make install
+    fi
 }
 
 function print_line {

src/app/app.cpp

@@ -7,7 +7,6 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <easylogging++.h>
-#include <googlemp.h>
 #include <qredisclient/redisclient.h>
 
 #include "logger.h"
@@ -21,21 +20,14 @@
 #include "modules/value-editor/valueviewmodel.h"
 #include "modules/value-editor/viewmodel.h"
 #include "modules/value-editor/sortfilterproxymodel.h"
+#include "modules/value-editor/formattersmanager.h"
 #include "modules/console/consolemodel.h"
 #include "modules/server-stats/serverstatsmodel.h"
 #include "modules/bulk-operations/bulkoperationsmanager.h"
 
 
 INITIALIZE_EASYLOGGINGPP
 
-static QObject *analytics_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-
-    GoogleMP *gmp = GoogleMP::instance();
-    return gmp;
-}
 
 Application::Application(int &argc, char **argv)
     : QApplication(argc, argv),
@@ -45,8 +37,7 @@ Application::Application(int &argc, char **argv)
     // Init components required for models and qml
     initLog();
     initAppInfo();
-    initAppFonts();
-    initAppAnalytics();
+    initAppFonts();    
     initRedisClient();
     initUpdater();    
     installTranslator();
@@ -65,6 +56,9 @@ void Application::initModels()
 
     connect(m_connections.data(), &ConnectionsManager::openServerStats,
             m_serverStatsModel.data(), &TabViewModel::openTab);
+
+    m_formattersManager = QSharedPointer<ValueEditor::FormattersManager>(new ValueEditor::FormattersManager());
+    m_formattersManager->loadFormatters();
 }
 
 void Application::initAppInfo()
@@ -103,17 +97,10 @@ void Application::initAppFonts()
     QApplication::setFont(defaultFont);
 }
 
-void Application::initAppAnalytics()
-{
-    GoogleMP::startSession(QDateTime::currentMSecsSinceEpoch());
-    GoogleMP::instance()->reportEvent("rdm:cpp", "app start", "");
-}
-
 void Application::registerQmlTypes()
 {
     qmlRegisterType<ValueEditor::ValueViewModel>("rdm.models", 1, 0, "ValueViewModel");   
-    qmlRegisterType<SortFilterProxyModel>("rdm.models", 1, 0, "SortFilterProxyModel");
-    qmlRegisterSingletonType<GoogleMP>("MeasurementProtocol", 1, 0, "Analytics", analytics_singletontype_provider);
+    qmlRegisterType<SortFilterProxyModel>("rdm.models", 1, 0, "SortFilterProxyModel");    
     qRegisterMetaType<ServerConfig>();
 }
 
@@ -124,14 +111,15 @@ void Application::registerQmlRootObjects()
     m_engine.rootContext()->setContextProperty("connectionsManager", m_connections.data());
     m_engine.rootContext()->setContextProperty("viewModel", m_keyValues.data()); // TODO: Remove legacy name usage in qml    
     m_engine.rootContext()->setContextProperty("valuesModel", m_keyValues.data());
+    m_engine.rootContext()->setContextProperty("formattersManager", m_formattersManager.data());
     m_engine.rootContext()->setContextProperty("consoleModel", m_consoleModel.data());
     m_engine.rootContext()->setContextProperty("serverStatsModel", m_serverStatsModel.data());
     m_engine.rootContext()->setContextProperty("appLogger", m_logger);
     m_engine.rootContext()->setContextProperty("bulkOperations", m_bulkOperations.data());
 }
 
 void Application::initQml()
-{
+{    
     registerQmlTypes();
     registerQmlRootObjects();
     m_engine.load(QUrl(QStringLiteral("qrc:///app.qml")));

src/app/app.h

@@ -4,7 +4,6 @@
 #include <QQmlApplicationEngine>
 #include <QFontDatabase>
 #include <QMenu>
-#include <googlemp.h>
 
 #ifndef RDM_VERSION
 #include "../version.h"
@@ -16,6 +15,7 @@ class Updater;
 class LogHandler;
 class TabViewModel;
 namespace ValueEditor { class ViewModel; }
+namespace ValueEditor { class FormattersManager; }
 namespace BulkOperations { class Manager; }
 
 
@@ -30,8 +30,7 @@ class Application : public QApplication
 
 private:
     void initAppInfo();
-    void initAppFonts();
-    void initAppAnalytics();
+    void initAppFonts();    
     void registerQmlTypes();
     void registerQmlRootObjects();
     void initLog();
@@ -48,6 +47,7 @@ private slots:
     QSharedPointer<ConnectionsManager> m_connections;
     QSharedPointer<Updater> m_updater;
     QSharedPointer<ValueEditor::ViewModel> m_keyValues;
+    QSharedPointer<ValueEditor::FormattersManager> m_formattersManager;
     QSharedPointer<BulkOperations::Manager> m_bulkOperations;
     QSharedPointer<TabViewModel> m_consoleModel;
     QSharedPointer<TabViewModel> m_serverStatsModel;

src/app/models/configmanager.cpp

@@ -19,16 +19,7 @@ ConfigManager::ConfigManager(const QString &basePath)
 
 QString ConfigManager::getApplicationConfigPath(const QString &configFile, bool checkPath)
 {
-    QString configDir;
-#ifdef Q_OS_MACX
-    configDir = QDir::toNativeSeparators(
-                    QString("%1/%2").arg(m_basePath).arg("/Library/Preferences/rdm/")
-                );
-#else
-    configDir = QDir::toNativeSeparators(
-                    QString("%1/%2").arg(m_basePath).arg(".rdm")
-                );
-#endif
+    QString configDir = getConfigPath(m_basePath);
     QDir settingsPath(configDir);
 
     if (!settingsPath.exists() && settingsPath.mkpath(configDir)) {
@@ -189,6 +180,21 @@ void ConfigManager::setPermissions(QFile &file)
 #endif
 }
 
+QString ConfigManager::getConfigPath(QString basePath)
+{
+    QString configDir;
+#ifdef Q_OS_MACX
+    configDir = QDir::toNativeSeparators(
+                    QString("%1/%2").arg(basePath).arg("/Library/Preferences/rdm/")
+                );
+#else
+    configDir = QDir::toNativeSeparators(
+                    QString("%1/%2").arg(basePath).arg(".rdm")
+                );
+#endif
+    return configDir;
+}
+
 bool saveJsonArrayToFile(const QJsonArray &c, const QString &f)
 {
     QJsonDocument config(c);

src/app/models/configmanager.h

@@ -11,11 +11,12 @@ class ConfigManager
     QString getApplicationConfigPath(const QString &, bool checkPath=true);
     bool migrateOldConfig(const QString &oldFileName, const QString &newFileName);
 public:
+    static QString getConfigPath(QString basePath = QDir::homePath());
     static QJsonArray xmlConfigToJsonArray(const QString &xmlConfigPath);
 
 private:
     static bool chechPath(const QString&);
-    static void setPermissions(QFile&);
+    static void setPermissions(QFile&);    
 private:
     QString m_basePath;
 };

src/app/models/key-models/abstractkey.h

@@ -94,7 +94,7 @@ template < typename T > class KeyModel : public ValueEditor::Model
     virtual void setTTL(const long long ttl) override
     {
         RedisClient::Response result;
-        qDebug(QString("TTL=%1").arg(ttl).toLatin1().constData());
+        qDebug() << QString("TTL=%1").arg(ttl);
         try {
             if (ttl >= 0)
                 result = m_connection->commandSync({"EXPIRE", m_keyFullPath, QString::number(ttl).toLatin1()}, m_dbIndex);
@@ -105,7 +105,7 @@ template < typename T > class KeyModel : public ValueEditor::Model
         }
 
         if (result.getValue().toInt() == 0) {
-            throw Exception("Not supprt TTL at this key");
+            throw Exception("Not support TTL at this key");
         }
         if (ttl >= 0)
             m_ttl = ttl;

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

@@ -73,7 +73,7 @@ void StringKeyModel::loadRows(unsigned long, unsigned long, std::function<void(c
         m_connection->command({"GET", m_keyFullPath}, getConnector().data(),
                               [this, callback](RedisClient::Response r, QString e)
         {
-            if (r.getType() != RedisClient::Response::Bulk) {
+            if (r.getType() != RedisClient::Response::Bulk || !e.isEmpty()) {
                 return callback(QString("Cannot load value"));
             }
 

src/app/models/treeoperations.cpp

@@ -20,14 +20,21 @@ TreeOperations::TreeOperations(QSharedPointer<RedisClient::Connection> connectio
 
 void TreeOperations::getDatabases(std::function<void (RedisClient::DatabaseList)> callback)
 {
-    if (!m_connection->isConnected()) {
+    bool connected = m_connection->isConnected();
+
+    if (!connected) {
         try {
-            m_connection->connect(true);
+            connected = m_connection->connect(true);
         } catch (const RedisClient::Connection::Exception& e) {
             throw ConnectionsTree::Operations::Exception(QObject::tr("Connection error: ") + QString(e.what()));
         }
     }
 
+    if (!connected) {
+        throw ConnectionsTree::Operations::Exception(
+                    QObject::tr("Cannot connect to server '%1'. Check log for details.").arg(m_connection->getConfig().name()));
+    }
+
     if (m_connection->getServerVersion() < 2.8)
         throw ConnectionsTree::Operations::Exception(QObject::tr("RedisDesktopManager >= 0.9.0 doesn't support old versions of "
                                                      "redis-server (< 2.8). Please use RedisDesktopManager 0.8.8 or upgrade your redis-server."));
@@ -116,9 +123,9 @@ void TreeOperations::deleteDbKey(ConnectionsTree::KeyItem& key, std::function<vo
           return;
         }
 
-        QRegExp filter(key.getFullPath(), Qt::CaseSensitive, QRegExp::Wildcard);
-        emit m_manager.closeDbKeys(m_connection, key.getDbIndex(), filter);
         key.setRemoved();
+        QRegExp filter(key.getFullPath(), Qt::CaseSensitive, QRegExp::Wildcard);
+        emit m_manager.closeDbKeys(m_connection, key.getDbIndex(), filter);        
     };
 
     try {
@@ -130,7 +137,9 @@ void TreeOperations::deleteDbKey(ConnectionsTree::KeyItem& key, std::function<vo
 
 void TreeOperations::deleteDbNamespace(ConnectionsTree::NamespaceItem &ns)
 {
-    QString pattern = QString("%1:*").arg(QString::fromUtf8(ns.getFullPath()));
+    QString pattern = QString("%1%2*")
+            .arg(QString::fromUtf8(ns.getFullPath()))
+            .arg(static_cast<ServerConfig>(m_connection->getConfig()).namespaceSeparator());
     QRegExp filter(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
 
     int dbIndex = ns.getDbIndex();

src/app/qmlutils.cpp

@@ -24,6 +24,24 @@ long QmlUtils::binaryStringLength(const QVariant &value)
     return val.size();
 }
 
+QString QmlUtils::humanSize(long size)
+{
+    double num = size;
+    QStringList list;
+    list << "KB" << "MB" << "GB";
+
+    QStringListIterator i(list);
+    QString unit("bytes");
+
+    while(num >= 1024.0 && i.hasNext())
+     {
+        unit = i.next();
+        num /= 1024.0;
+    }
+    return QString().setNum(num,'f',2)+" "+unit;
+}
+
+
 QVariant QmlUtils::valueToBinary(const QVariant &value)
 {
     if (!value.canConvert(QVariant::ByteArray)) {
@@ -48,13 +66,18 @@ QVariant QmlUtils::binaryListToValue(const QVariantList &binaryList)
     return value;
 }
 
-QVariant QmlUtils::printable(const QVariant &value)
+QVariant QmlUtils::printable(const QVariant &value, bool htmlEscaped)
 {
     if (!value.canConvert(QVariant::ByteArray)) {
         return QVariant();
     }
     QByteArray val = value.toByteArray();
-    return printableString(val);
+
+    if (htmlEscaped) {
+        return printableString(val).toHtmlEscaped();
+    } else {
+        return printableString(val);
+    }
 }
 
 QVariant QmlUtils::printableToValue(const QVariant &printable)

src/app/qmlutils.h

@@ -11,9 +11,10 @@ class QmlUtils : public QObject
 public:    
     Q_INVOKABLE bool isBinaryString(const QVariant &value);
     Q_INVOKABLE long binaryStringLength(const QVariant &value);
+    Q_INVOKABLE QString humanSize(long size);
     Q_INVOKABLE QVariant valueToBinary(const QVariant &value);
     Q_INVOKABLE QVariant binaryListToValue(const QVariantList& binaryList);
-    Q_INVOKABLE QVariant printable(const QVariant &value);
+    Q_INVOKABLE QVariant printable(const QVariant &value, bool htmlEscaped=false);
     Q_INVOKABLE QVariant printableToValue(const QVariant &printable);
     Q_INVOKABLE QVariant toUtf(const QVariant &value);
     Q_INVOKABLE QString getPathFromUrl(const QUrl &url);