Implemented Unicode support in Command class

Author: uglide

redis-desktop-manager/include/redis/Command.h

@@ -22,17 +22,15 @@ class Command
     int getDbIndex() const;
 
     /** @see http://redis.io/topics/protocol for more info **/    
-    QString getFormattedString() const;
+    QByteArray getByteRepresentation() const;
+    static QByteArray getByteRepresentation(const QStringList&);
+    static QByteArray getByteRepresentation(const QString&);
 
     QString getRawString() const;
 
     QObject * getOwner();
     void setOwner(QObject *);
 
-    static QString getFormatted(const QStringList&);
-
-    static QString getFormatted(const QString&);
-
     bool hasCallback();
 
     QString getCallbackName();

redis-desktop-manager/source/redis/Command.cpp

@@ -59,11 +59,6 @@ int Command::getDbIndex() const
     return dbIndex;
 }
 
-QString Command::getFormattedString() const
-{
-    return Command::getFormatted(commandWithArguments);
-}
-
 QString Command::getRawString() const
 {
     return commandWithArguments.join(' ');
@@ -84,31 +79,33 @@ void Command::setOwner(QObject * o)
     owner = o;
 }
 
-QString Command::getFormatted(const QString& command)
+QByteArray Command::getByteRepresentation(const QString& command)
 {
-    QStringList parts = command.split(" ", QString::SkipEmptyParts, Qt::CaseInsensitive);
+   QStringList parts = command.split(" ", QString::SkipEmptyParts, Qt::CaseInsensitive);
 
-    QString formattedCmd("*");
-    formattedCmd.append(QString("%1\r\n").arg(parts.length()));
-
-    for (QString part : parts) {
-        formattedCmd.append(QString("$%1\r\n%2\r\n")
-            .arg(QString("%1").arg(part.length()), part));
-    }
-
-    return formattedCmd;
+   return Command::getByteRepresentation(parts);
 }
 
-QString Command::getFormatted(const QStringList& command)
+QByteArray Command::getByteRepresentation(const QStringList& command)
 {
-    QString formattedCmd("*");
-    formattedCmd.append(QString("%1\r\n").arg(command.length()));
+    QByteArray result;
+    result.append(QString("*%1\r\n").arg(command.length()));
+
+    QByteArray partArray;
 
     for (QString part : command) {
-        formattedCmd.append(QString("$%1\r\n%2\r\n")
-            .arg(QString("%1").arg(part.length()), part));
+        partArray = part.toUtf8();
+        result.append("$");
+        result.append(QString::number(partArray.size()));
+        result.append("\r\n");
+        result.append(partArray);
+        result.append("\r\n");
     }
 
-    return formattedCmd;
+    return result;
 }
 
+QByteArray Command::getByteRepresentation() const
+{
+    return Command::getByteRepresentation(commandWithArguments);
+}

redis-desktop-manager/source/redis/RedisConnection.cpp

@@ -68,15 +68,11 @@ QVariant RedisConnection::execute(QString command)
     if (command.isEmpty()) {
         return QVariant();
     }
-
-    QString formattedCommand = Command::getFormatted(command);
-
-    /*
-     *    Send command
-     */
-    QTextStream out(socket);
-    out << formattedCommand;
-    out.flush();
+    
+    // Send command
+    QByteArray cmd = Command::getByteRepresentation(command);
+    socket->write(cmd);
+    socket->flush();    
 
     if (!socket->waitForReadyRead(config.executeTimeout)) {
 
@@ -130,16 +126,12 @@ void RedisConnection::runCommand(const Command &command)
 
     if (command.isEmpty()) {
         return sendResponse();
-    }
-
-    QString formattedCommand = command.getFormattedString();
+    }    
 
-    /*
-     *    Send command
-     */
-    QTextStream out(socket);
-    out << formattedCommand;
-    out.flush();
+    // Send command
+    QByteArray cmd = command.getByteRepresentation();
+    socket->write(cmd);
+    socket->flush();  
 }
 
 void RedisConnection::readyRead()

redis-desktop-manager/source/redis/RedisConnectionOverSsh.cpp

@@ -206,12 +206,10 @@ QVariant RedisConnectionOverSsh::execute(QString command)
         return QVariant();
     }
 
-    QString formattedCommand = Command::getFormatted(command);
-
     /*
      *    Send command
      */
-    QByteArray byteArray = formattedCommand.toUtf8();
+    QByteArray byteArray = Command::getByteRepresentation(command);
     const char* cString = byteArray.constData();
 
     socket->write(cString, byteArray.size());
@@ -283,14 +281,12 @@ void RedisConnectionOverSsh::runCommand(const Command &command)
 
     if (command.isEmpty()) {
         return sendResponse();
-    }
-
-    QString formattedCommand = command.getFormattedString();
+    }    
 
     /*
      *    Send command
      */
-    QByteArray byteArray = formattedCommand.toUtf8();
+    QByteArray byteArray = command.getByteRepresentation();
     const char* cString = byteArray.constData();
 
     socket->write(cString, byteArray.size());

tests/source/test_command.cpp

@@ -2,17 +2,17 @@
 #include "Command.h"
 
 #include <QTest>
-
-void TestCommand::prepareCommand()
-{
-	//given 
-	//Command class
-
-	//when
-	QVariant actualResult = Command::getFormatted("EXISTS testkey:test");
-
-	//then
-	QCOMPARE(actualResult, QVariant("*2\r\n$6\r\nEXISTS\r\n$12\r\ntestkey:test\r\n"));
+
+void TestCommand::prepareCommand()
+{
+	//given 
+	//Command class
+
+	//when
+    QByteArray actualResult = Command::getByteRepresentation("EXISTS testkey:test");
+
+	//then
+    QCOMPARE(actualResult, QByteArray("*2\r\n$6\r\nEXISTS\r\n$12\r\ntestkey:test\r\n"));
 }