Plugin: add CDatabaseFilter

Author: KangLin

Src/CMakeLists.txt

@@ -55,11 +55,12 @@ list(APPEND PLUGIN_INSTALL_HEADER_FILES
     ParameterCompone/ParameterSSH.h
     ParameterCompone/ParameterSSHTunnelUI.h
     ParameterCompone/Stats.h
-    ParameterCompone/ParameterDatabase.h
-    ParameterCompone/ParameterDatabaseUI.h
     CheckBoxHeader.h
-    Database.h
-    DatabaseTree.h
+    Database/Database.h
+    Database/DatabaseTree.h
+    Database/DatabaseFilter.h
+    Database/ParameterDatabase.h
+    Database/ParameterDatabaseUI.h
     )
 
 list(APPEND PLUGIN_HEADER_FILES
@@ -106,16 +107,17 @@ list(APPEND PLUGIN_SOURCE_FILES
     ParameterCompone/ParameterSSH.cpp
     ParameterCompone/ParameterSSHTunnelUI.cpp
     ParameterCompone/Stats.cpp
-    ParameterCompone/ParameterDatabase.cpp
-    ParameterCompone/ParameterDatabaseUI.cpp
     DlgInputPassword.cpp
     DlgUserPassword.cpp
     Hook.cpp
     Unix/DesktopShortcuts.cpp
     StatsAppUsage.cpp
     CheckBoxHeader.cpp
-    Database.cpp
-    DatabaseTree.cpp
+    Database/Database.cpp
+    Database/DatabaseTree.cpp
+    Database/DatabaseFilter.cpp
+    Database/ParameterDatabase.cpp
+    Database/ParameterDatabaseUI.cpp
     )
 
 set(PLUGIN_UI_FILES
@@ -127,7 +129,7 @@ set(PLUGIN_UI_FILES
     ParameterCompone/ParameterNetUI.ui
     ParameterCompone/ParameterRecordUI.ui
     ParameterCompone/ParameterSSHTunnelUI.ui
-    ParameterCompone/ParameterDatabaseUI.ui
+    Database/ParameterDatabaseUI.ui
     )
 
 if(WIN32)
@@ -356,6 +358,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> # See: http://www.it1352.com/478094.html
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/ParameterCompone
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/Channel
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/Database
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
         ${PLUGIN_INCLUDE_DIRS}
     INSTALL_HEADER_FILES ${PLUGIN_INSTALL_HEADER_FILES}

Src/Database.cpp Src/Database/Database.cppSrc/Database.cpp renamed to Src/Database/Database.cpp

@@ -11,8 +11,9 @@
 #include "RabbitCommonDir.h"
 #include "RabbitCommonTools.h"
 #include "IconUtils.h"
-#include "Database.h"
 
+#include "Database.h"
+#include "ParameterDatabase.h"
 static Q_LOGGING_CATEGORY(log, "DB")
 CDatabase::CDatabase(QObject *parent)
     : QObject{parent}

Src/Database.h Src/Database/Database.hSrc/Database.h renamed to Src/Database/Database.h

@@ -7,8 +7,8 @@
 #include <QDateTime>
 #include <QJsonObject>
 #include "plugin_export.h"
-#include "ParameterDatabase.h"
 
+class CParameterDatabase;
 class PLUGIN_EXPORT CDatabase : public QObject
 {
     Q_OBJECT

Src/Database/DatabaseFilter.cpp

@@ -0,0 +1,148 @@
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QLoggingCategory>
+
+#include "DatabaseFilter.h"
+
+static Q_LOGGING_CATEGORY(log, "DB.Filter")
+CDatabaseFilter::CDatabaseFilter(const QString& szSuffix, QObject *parent)
+    : CDatabase{parent}
+    , m_szTableName("filter")
+{
+    if(!szSuffix.isEmpty()) {
+        QString szSuf = szSuffix;
+        szSuf = szSuf.replace("/", "_");
+        m_szTableName = m_szTableName + "_" + szSuf;
+        m_szConnectName = "connect_filter_" + szSuf;
+    }
+}
+
+bool CDatabaseFilter::contains(const QString& szKey)
+{
+    bool bRet = false;
+    QSqlQuery query(GetDatabase());
+
+    // Check if it already exists
+    query.prepare("SELECT `key` FROM " + m_szTableName
+                  + " WHERE `key` = :key "
+                  );
+    query.bindValue(":key", szKey);
+    bRet = query.exec();
+    if(!bRet) {
+        qCritical(log) << "Failed to contains[" + szKey + "]:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return false;
+    }
+    return query.next();
+}
+
+int CDatabaseFilter::AddKey(const QString &szKey)
+{
+
+    if(contains(szKey)) return false;
+
+    QSqlQuery query(GetDatabase());
+    query.prepare(
+        "INSERT INTO " + m_szTableName + " (`key`) VALUES (:key) "
+        );
+    query.bindValue(":key", szKey);
+    bool bRet = query.exec();
+
+    if (!bRet) {
+        qCritical(log) << "Failed to add key[" + szKey + "]:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return -1;
+    }
+    return 0;
+}
+
+int CDatabaseFilter::RemoveKey(const QString &szKey)
+{
+    QSqlQuery query(GetDatabase());
+    query.prepare("DELETE FROM " + m_szTableName + " WHERE `key` = :key");
+    query.bindValue(":key", szKey);
+
+    bool bRet = query.exec();
+    if (!bRet) {
+        qCritical(log) << "Failed to remove key[" + szKey + "]:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return -1;
+    }
+    return 0;
+}
+
+int CDatabaseFilter::Clear()
+{
+    QSqlQuery query(GetDatabase());
+    query.prepare("DELETE FROM " + m_szTableName);
+    bool bRet = query.exec();
+    if (!bRet) {
+        qCritical(log) << "Failed to clear:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return -1;
+    }
+    return 0;
+}
+
+bool CDatabaseFilter::isEmpty()
+{
+    QSqlQuery query(GetDatabase());
+    query.prepare("SELECT `key` FROM " + m_szTableName);
+    bool bRet = query.exec();
+    if(!bRet) {
+        qCritical(log) << "Failed to isEmpty:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return true;
+    }
+    return !query.next();
+}
+
+bool CDatabaseFilter::ExportToJson(QJsonObject &obj)
+{
+    return true;
+}
+
+bool CDatabaseFilter::ImportFromJson(const QJsonObject &obj)
+{
+    return true;
+}
+
+bool CDatabaseFilter::OnInitializeSqliteDatabase()
+{
+    return true;
+}
+
+bool CDatabaseFilter::OnInitializeMySqlDatabase()
+{
+    return true;
+}
+
+bool CDatabaseFilter::OnInitializeDatabase()
+{
+    QSqlQuery query(GetDatabase());
+
+    bool success = query.exec(
+        "CREATE TABLE IF NOT EXISTS "
+        + m_szTableName +
+        " ("
+        "    `key` TEXT PRIMARY KEY NOT NULL"
+        " )"
+        );
+
+    if (!success) {
+        qCritical(log) << "Failed to create folders sqlite table:"
+                       << m_szTableName << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
+        return false;
+    }
+
+    return true;
+}

Src/Database/DatabaseFilter.h

@@ -0,0 +1,29 @@
+// Author: Kang Lin <kl222@126.com>
+
+#pragma once
+
+#include "Database.h"
+
+class PLUGIN_EXPORT CDatabaseFilter : public CDatabase
+{
+public:
+    explicit CDatabaseFilter(const QString& szSuffix = QString(), QObject* parent = nullptr);
+
+    bool contains(const QString& szKey);
+    int AddKey(const QString& szKey);
+    int RemoveKey(const QString& szKey);
+    int Clear();
+    virtual bool isEmpty();
+
+    virtual bool OnInitializeDatabase() override;
+    virtual bool ExportToJson(QJsonObject &obj) override;
+    virtual bool ImportFromJson(const QJsonObject &obj) override;
+
+private:
+    QString m_szTableName;
+
+protected:
+    virtual bool OnInitializeSqliteDatabase() override;
+    virtual bool OnInitializeMySqlDatabase() override;
+};
+