0.7.0 release candidate

fastogt · Feb 28, 2015 · 69cbd14 · 69cbd14
1 parent ceba514
commit 69cbd14
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 #############################################################
-PROJECT("FastoRedis" VERSION 0.7.0.1 LANGUAGES CXX C)
+PROJECT("FastoRedis" VERSION 0.7.0.0 LANGUAGES CXX C)
 #################### Project Settings ####################
 #SET(PROJECT_NAME "FastoRedis" CACHE STRING "Project Name")
 SET(PROJECT_NAME_TITLE ${PROJECT_NAME} CACHE STRING "Title for ${PROJECT_NAME}")
@@ -12,7 +12,7 @@ SET(PROJECT_MAINTAINER_MAIL "[email protected]" CACHE STRING "Internet ma
 SET(PROJECT_MAINTAINER_NAME "Alexandr Topilski" CACHE STRING "Name of ${PROJECT_NAME} mainteiner")
 SET(PROJECT_GITHUB_FORK "www.github.com/fasto/fastoredis" CACHE STRING "Git fork of ${PROJECT_NAME}")
 SET(PROJECT_GITHUB_ISSUES "www.github.com/fasto/fastoredis/issues" CACHE STRING "Git issue link for ${PROJECT_NAME}")
-SET(PROJECT_BUILD_TYPE "beta") #alfa, beta, rc, release
+SET(PROJECT_BUILD_TYPE "rc") #alfa, beta, rc, release
 ##########################################################
 
 STRING(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)

diff --git a/src/core/idriver.cpp b/src/core/idriver.cpp
@@ -50,8 +50,8 @@ struct WinsockInit {
 
         common::buffer_type cstamp = stamp;
 
-        if(cstamp[cstamp.size()-1] == '\n'){
-            cstamp.resize(cstamp.size()-1);
+        if(cstamp[cstamp.size() - 1] == '\n'){
+            cstamp.resize(cstamp.size() - 1);
         }
 
         timeOut = common::convertFromString<common::time64_t>((const char*)(cstamp.c_str() + 1));

diff --git a/src/core/memcached/memcached_driver.cpp b/src/core/memcached/memcached_driver.cpp
@@ -776,7 +776,7 @@ namespace fastoredis
                             strncpy(command, inputLine + offset, n - offset);
                         }
                         offset = n + 1;
-                        FastoObjectCommand* cmd = createCommand(outRoot, command, common::Value::C_USER);
+                        FastoObjectCommand* cmd = createCommand(outRoot, stableCommand(command), common::Value::C_USER);
                         er = impl_->execute(cmd);
                         if(er){
                             res.setErrorInfo(er);

diff --git a/src/core/redis/redis_driver.cpp b/src/core/redis/redis_driver.cpp
@@ -2060,8 +2060,9 @@ namespace fastoredis
                         else{
                             strncpy(command, inputLine + offset, n - offset);
                         }
+
                         offset = n + 1;
-                        RedisCommand* cmd = createCommand(outRoot, command, common::Value::C_USER);
+                        RedisCommand* cmd = createCommand(outRoot, stableCommand(command), common::Value::C_USER);
                         er = impl_->execute(cmd);
                         if(er){
                             res.setErrorInfo(er);

diff --git a/src/core/ssdb/ssdb_driver.cpp b/src/core/ssdb/ssdb_driver.cpp
@@ -1463,7 +1463,7 @@ namespace fastoredis
                             strncpy(command, inputLine + offset, n - offset);
                         }
                         offset = n + 1;
-                        FastoObjectCommand* cmd = createCommand(outRoot, command, common::Value::C_USER);
+                        FastoObjectCommand* cmd = createCommand(outRoot, stableCommand(command), common::Value::C_USER);
                         er = impl_->execute(cmd);
                         if(er){
                             res.setErrorInfo(er);

diff --git a/src/global/global.cpp b/src/global/global.cpp
@@ -137,6 +137,21 @@ namespace fastoredis
 
     }
 
+    std::string stableCommand(const char* command)
+    {
+        if(!command){
+            return std::string();
+        }
+
+        std::string cmd = command;
+
+        if(cmd[cmd.size() - 1] == '\r'){
+            cmd.resize(cmd.size() - 1);
+        }
+
+        return cmd;
+    }
+
     std::pair<std::string, std::string> getKeyValueFromLine(const std::string& input)
     {
         if(input.empty()){

diff --git a/src/global/global.h b/src/global/global.h
@@ -59,6 +59,8 @@ namespace fastoredis
         FastoObjectCommand(FastoObject* parent, common::CommandValue* cmd, const std::string &delemitr);
     };
 
+    std::string stableCommand(const char* command);
+
     std::pair<std::string, std::string> getKeyValueFromLine(const std::string& input);
     std::string getOppositeCommand(const std::string& command, const std::vector<std::pair<std::string, std::string > >& srcOppositeCommands);
 

diff --git a/src/gui/widgets/commands_widget.cpp b/src/gui/widgets/commands_widget.cpp
@@ -44,7 +44,8 @@ namespace fastoredis
     {
         QTime time = QTime::currentTime();
         logTextEdit_->setTextColor(command.type() == common::Value::C_INNER ? QColor(Qt::gray):QColor(Qt::black));
-        logTextEdit_->append(time.toString("h:mm:ss AP: ") + common::convertFromString<QString>(command.message()));
+        QString mess = common::convertFromString<QString>(command.message());
+        logTextEdit_->append(time.toString("h:mm:ss AP: ") + mess);
         QScrollBar *sb = logTextEdit_->verticalScrollBar();
         sb->setValue(sb->maximum());
     }

diff --git a/src/resources/fastoredis/images/128x128/ssdb.png b/src/resources/fastoredis/images/128x128/ssdb.png
diff --git a/src/resources/fastoredis/images/256x256/ssdb.png b/src/resources/fastoredis/images/256x256/ssdb.png
diff --git a/src/resources/fastoredis/images/64x64/ssdb.png b/src/resources/fastoredis/images/64x64/ssdb.png
diff --git a/src/shell/shell_widget.cpp b/src/shell/shell_widget.cpp
@@ -175,7 +175,7 @@ namespace fastoredis
         }
         else if(type == SSDB){
             input_ = new SsdbShell;
-            setToolTip(tr("Based on libmemcached version: %1").arg(input_->version()));
+            setToolTip(tr("Based on ssdb-cli version: %1").arg(input_->version()));
         }
         else{
             NOTREACHED();