Merge branch 'console'

Author: uglide

.travis.yml

@@ -13,9 +13,11 @@ before_script:
 script: 
   - qmake -qt=qt5 -v
   - qmake -qt=qt5
+  - make clean
   - make -s
   - cd ./../tests/
   - qmake
+  - make clean
   - make -s
   - ./../bin/tests/tests -platform minimal -txt
 services:

redis-desktop-manager/forms/serverInfoViewTab.ui

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>serverInfoViewTab</class>
+ <widget class="QWidget" name="serverInfoViewTab">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>309</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="serverName">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListView" name="serverInfoView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

redis-desktop-manager/images/redis-desktop-manager.ico

@@ -16,7 +16,7 @@ class connection : public QDialog
 
 private:
 	Ui::connectionDialog ui;
-	Main * mainForm;
+	MainWin * mainForm;
 	RedisServerItem * server;
 
 	bool inEditMode;

redis-desktop-manager/include/connection.h

@@ -13,21 +13,26 @@
 class RedisKeyItem;
 class Updater;
 
-class Main : public QMainWindow
+class MainWin : public QMainWindow
 {
 	Q_OBJECT
 
 public:
 	RedisConnectionsManager * connections;
 
-	Main(QWidget *parent = 0);
-	~Main();	
+	MainWin(QWidget *parent = 0);
+	~MainWin();	
 private:
 	bool loadingInProgress;
 	Ui::demoClass ui;		
 	Updater * updater;
 
 	void loadKeyTab(RedisKeyItem *);
+	void addTab(QString&, QWidget*);
+
+	/** @return >=0 if exist **/
+	int getTabIndex(QString&);
+
     QString getConfigPath(const QString&);
 
 	void initFormButtons();
@@ -36,6 +41,8 @@ class Main : public QMainWindow
 	void initUpdater();
 	void initFilter();
 
+	QStandardItem * getSelectedItemInConnectionsTree();
+
 	private slots:
 		void OnAddConnectionClick();
 		void OnConnectionTreeClick(const QModelIndex & index);
@@ -48,6 +55,8 @@ class Main : public QMainWindow
 		void OnImportConnectionsClick();
 		void OnSetFilter();
 		void OnClearFilter();
+		void OnServerInfoOpen();
+		void OnConsoleOpen();
 };
 
 #endif // DEMO_H

redis-desktop-manager/include/demo.h

@@ -16,6 +16,7 @@ class RedisServerItem :  public QStandardItem
 	RedisServerItem(RedisConnectionAbstract * c);
 
 	bool loadDatabases();	
+	QStringList getInfo();
 
 	void reload();
 	void unload();

redis-desktop-manager/include/models/items/RedisServerItem.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <QtCore>
+
+class Command
+{
+public:
+	/** @see http://redis.io/topics/protocol for more info **/	
+	static QString getFormatted(QString command);
+};
+

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

@@ -34,29 +34,9 @@ class RedisConnectionAbstract
 	void selectDb(int dbIndex);
 
 	QStringList getKeys(QString pattern = "*");
+
 protected:
 	bool connected;
-	
-	enum ResponseType 
-	{
-		Status, Error, Integer, Bulk, MultiBulk, Unknown			
-	};
-
-	/** @see http://redis.io/topics/protocol for more info **/	
-	QString prepareCommand(QString command);
-
-	QVariant parseResponse(QString response);	
-
-	ResponseType getResponseType(QString r);	
-
-	QString getStringResponse(QString response);
-
-	bool isFullResponseRecieved(QString r);
-	bool isIntReplyValid(QString r);
-	bool isBulkReplyValid(QString r);
-	bool isMultiBulkReplyValid(QString r);	
-	bool waitForData(int ms);
 
-	int getSizeOfBulkReply(QString mb);		
 };
 

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

@@ -26,7 +26,7 @@ class RedisConnectionConfig
 	static const int executeTimeout = 30000;
 
 	RedisConnectionConfig(const QString & host, const QString & name = "", const int port = DEFAULT_REDIS_PORT) 
-		: host(host), port(port), name(name), sshPort(DEFAULT_SSH_PORT)
+		: name(name), host(host), port(port), sshPort(DEFAULT_SSH_PORT)
 	{};
 
 	RedisConnectionConfig & operator = (RedisConnectionConfig & other) 

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

@@ -30,11 +30,11 @@ class RedisConnectionOverSsh : public QObject, public RedisConnectionAbstract
 	QTimer syncTimer;
 	bool socketConnected;
 
+	bool waitForData(int ms);	
+
 	protected slots:
 		void OnSshConnectionError(QxtSshClient::Error);
 		void OnSshConnected();
 		void OnSocketReadyRead();
-		void OnAuthRequired(QList<QxtSshClient::AuthenticationMethod>);
-
 };