Plugin: modify Datbase interface

Author: KangLin

Src/CMakeLists.txt

@@ -56,6 +56,7 @@ list(APPEND PLUGIN_INSTALL_HEADER_FILES
     ParameterCompone/Stats.h
     CheckBoxHeader.h
     Database.h
+    DatabaseTree.h
     )
 
 list(APPEND PLUGIN_HEADER_FILES
@@ -108,6 +109,7 @@ list(APPEND PLUGIN_SOURCE_FILES
     StatsAppUsage.cpp
     CheckBoxHeader.cpp
     Database.cpp
+    DatabaseTree.cpp
     )
 
 set(PLUGIN_UI_FILES

Src/Database.cpp

@@ -81,31 +81,41 @@ void CDatabase::CloseDatabase()
     QSqlDatabase::removeDatabase(m_szConnectName);
 }
 
-CDatabaseIcon::CDatabaseIcon(QObject *parent) : CDatabase(parent)
+CDatabaseIcon::CDatabaseIcon(QObject *parent)
+    : CDatabase(parent)
 {
     m_szConnectName = "icon_connect";
+    m_szTableName = "icon";
+}
+
+CDatabaseIcon::CDatabaseIcon(const QString &szPrefix, QObject *parent)
+    : CDatabaseIcon(parent)
+{
+    if(!szPrefix.isEmpty())
+        m_szTableName = szPrefix + "_" + m_szTableName;
 }
 
 bool CDatabaseIcon::OnInitializeDatabase()
 {
     QSqlQuery query(GetDatabase());
 
     // Create icon table
-    bool success = query.exec(
-        "CREATE TABLE IF NOT EXISTS icon ("
+    QString szSql =
+        "CREATE TABLE IF NOT EXISTS " + m_szTableName + " ("
         "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
         "    name TEXT UNIQUE,"       // Icon name. see QIcon::name()
         "    hash TEXT,"              // Icon hash value
         "    data BLOB,"              // Icon binary data
         "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
         ")"
-        );
+        ;
+    bool success = query.exec(szSql);
     if (!success) {
-        qCritical(log) << "Failed to create icon table:" << query.lastError().text();
+        qCritical(log) << "Failed to create icon table:" << m_szTableName << query.lastError().text();
         return false;
     }
-    query.exec("CREATE INDEX IF NOT EXISTS idx_icon_name ON icon(name)");
-    query.exec("CREATE INDEX IF NOT EXISTS idx_icon_hash ON icon(hash)");
+    query.exec("CREATE INDEX IF NOT EXISTS idx_" + m_szTableName + "_name ON " + m_szTableName + "(name)");
+    query.exec("CREATE INDEX IF NOT EXISTS idx_" + m_szTableName + "_hash ON " + m_szTableName + "(hash)");
     return true;
 }
 
@@ -114,6 +124,7 @@ int CDatabaseIcon::GetIcon(const QIcon &icon)
     bool bRet = false;
     if(icon.isNull()) return 0;
 
+    QString szSql;
     QSqlQuery query(GetDatabase());
     QString szName = icon.name();
     if(szName.isEmpty()) {
@@ -122,8 +133,11 @@ int CDatabaseIcon::GetIcon(const QIcon &icon)
         QString szHash = RabbitCommon::CIconUtils::hashIconData(data);
         if(data.isEmpty() || szHash.isEmpty())
             return 0;
-        query.prepare("SELECT id, data FROM icon WHERE hash=:hash");
+        szSql = "SELECT id, data FROM " + m_szTableName + " WHERE hash=:hash";
+        query.prepare(szSql);
         query.bindValue(":hash", szHash);
+        // qDebug(log) << "prepare:" << query.executedQuery();
+        // qDebug(log) << "Bound values:" << query.boundValues();
         bRet = query.exec();
         if(!bRet) {
             qCritical(log) << "Failed to select icon hash:"
@@ -137,10 +151,9 @@ int CDatabaseIcon::GetIcon(const QIcon &icon)
             }
         }
 
-        query.prepare(
-            "INSERT INTO icon (hash, data) "
-            "VALUES (:hash, :data)"
-            );
+        szSql = "INSERT INTO " + m_szTableName + " (hash, data) "
+                "VALUES (:hash, :data)";
+        query.prepare(szSql);
         query.bindValue(":hash", szHash);
         query.bindValue(":data", data);
         bRet = query.exec();
@@ -153,7 +166,8 @@ int CDatabaseIcon::GetIcon(const QIcon &icon)
     }
 
     // Check name
-    query.prepare("SELECT id FROM icon WHERE name=:name");
+    szSql = "SELECT id FROM " + m_szTableName + " WHERE name=:name";
+    query.prepare(szSql);
     query.bindValue(":name", szName);
     bRet = query.exec();
     if(!bRet) {
@@ -166,7 +180,8 @@ int CDatabaseIcon::GetIcon(const QIcon &icon)
     }
 
     // Insert icon
-    query.prepare("INSERT INTO icon (name) VALUES (:name)");
+    szSql = "INSERT INTO " + m_szTableName + " (name) VALUES (:name)";
+    query.prepare(szSql);
     query.bindValue(":name", szName);
     bRet = query.exec();
     if(!bRet) {
@@ -182,8 +197,8 @@ QIcon CDatabaseIcon::GetIcon(int id)
     QIcon icon;
     QSqlQuery query(GetDatabase());
     query.prepare(
-        "SELECT name, data FROM icon "
-        "WHERE id=:id "
+        "SELECT name, data FROM " + m_szTableName +
+        " WHERE id=:id "
         );
     query.bindValue(":id", id);
     bool bRet = query.exec();
@@ -203,187 +218,3 @@ QIcon CDatabaseIcon::GetIcon(int id)
     }
     return icon;
 }
-
-CDatabaseFolder::CDatabaseFolder(QObject *parent) : CDatabase(parent)
-{
-    m_szConnectName = "folder_connect";
-}
-
-bool CDatabaseFolder::OnInitializeDatabase()
-{
-    QSqlQuery query(GetDatabase());
-
-    // 启用外键约束
-    query.exec("PRAGMA foreign_keys = ON");
-
-    // 创建文件夹表
-    bool success = query.exec(
-        "CREATE TABLE IF NOT EXISTS folders ("
-        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-        "    name TEXT NOT NULL,"
-        "    parent_id INTEGER DEFAULT 0,"
-        "    sort_order INTEGER DEFAULT 0,"
-        "    created_time DATETIME DEFAULT CURRENT_TIMESTAMP"
-        ")"
-        );
-
-    if (!success) {
-        qCritical(log) << "Failed to create folders table:" << query.lastError().text();
-        return false;
-    }
-
-    // 创建索引
-    query.exec("CREATE INDEX IF NOT EXISTS idx_folders_parent ON folders(parent_id)");
-
-    return true;
-}
-
-
-bool CDatabaseFolder::AddFolder(const QString &name, int parentId)
-{
-    QSqlQuery query(GetDatabase());
-
-    // 获取最大排序值
-    query.prepare("SELECT MAX(sort_order) FROM folders WHERE parent_id = :parent_id");
-    query.bindValue(":parent_id", parentId);
-    query.exec();
-
-    int maxOrder = 0;
-    if (query.next()) {
-        maxOrder = query.value(0).toInt() + 1;
-    }
-
-    query.prepare(
-        "INSERT INTO folders (name, parent_id, sort_order) "
-        "VALUES (:name, :parent_id, :sort_order)"
-        );
-    query.bindValue(":name", name);
-    query.bindValue(":parent_id", parentId);
-    query.bindValue(":sort_order", maxOrder);
-
-    bool success = query.exec();
-
-    if (success)
-        emit sigChanged();
-    else
-        qCritical(log) << "Failed to add folders:" << query.lastError().text();
-
-    return success;
-}
-
-bool CDatabaseFolder::RenameFolder(int folderId, const QString &newName)
-{
-    QSqlQuery query(GetDatabase());
-    query.prepare("UPDATE folders SET name = :name WHERE id = :id");
-    query.bindValue(":id", folderId);
-    query.bindValue(":name", newName);
-
-    bool success = query.exec();
-
-    if (success)
-        emit sigChanged();
-    else
-        qCritical(log) << "Failed to rename folders:" << query.lastError().text();
-
-    return success;
-}
-
-bool CDatabaseFolder::DeleteFolder(int folderId)
-{
-    // 删除子目录
-    auto folders = GetSubFolders(folderId);
-    foreach(auto f, folders) {
-        DeleteFolder(f.id);
-    }
-
-    // 删除其下面的所有条目
-    OnDeleteItems();
-
-    // 删除文件夹
-    QSqlQuery query(GetDatabase());
-    query.prepare("DELETE FROM folders WHERE id = :id");
-    query.bindValue(":id", folderId);
-
-    bool success = query.exec();
-
-    if (success)
-        emit sigChanged();
-    else
-        qCritical(log) << "Failed to delete folders:" << query.lastError().text();
-
-    return success;
-}
-
-bool CDatabaseFolder::MoveFolder(int folderId, int newParentId)
-{
-    QSqlQuery query(GetDatabase());
-    query.prepare("UPDATE folders SET parent_id = :parent_id WHERE id = :id");
-    query.bindValue(":id", folderId);
-    query.bindValue(":parent_id", newParentId);
-
-    bool success = query.exec();
-
-    if (success)
-        emit sigChanged();
-    else
-        qCritical(log) << "Failed to move folders:" << query.lastError().text();
-
-    return success;
-}
-
-
-QList<CDatabaseFolder::FolderItem> CDatabaseFolder::GetAllFolders()
-{
-    QList<CDatabaseFolder::FolderItem> folders;
-
-    QSqlQuery query(GetDatabase());
-    query.prepare(
-        "SELECT id, name, parent_id, sort_order, created_time "
-        "FROM folders "
-        "ORDER BY parent_id, sort_order, name"
-        );
-
-    if (query.exec()) {
-        while (query.next()) {
-            CDatabaseFolder::FolderItem folder;
-            folder.id = query.value(0).toInt();
-            folder.szName = query.value(1).toString();
-            folder.parentId = query.value(2).toInt();
-            folder.sortOrder = query.value(3).toInt();
-            folder.createTime = query.value(4).toDateTime();
-
-            folders.append(folder);
-        }
-    }
-
-    return folders;
-}
-
-QList<CDatabaseFolder::FolderItem> CDatabaseFolder::GetSubFolders(int parentId)
-{
-    QList<CDatabaseFolder::FolderItem> folders;
-
-    QSqlQuery query(GetDatabase());
-    query.prepare(
-        "SELECT id, name, parent_id, sort_order, created_time "
-        "FROM folders "
-        "WHERE parent_id = :parent_id "
-        "ORDER BY sort_order, name"
-        );
-    query.bindValue(":parent_id", parentId);
-
-    if (query.exec()) {
-        while (query.next()) {
-            CDatabaseFolder::FolderItem folder;
-            folder.id = query.value(0).toInt();
-            folder.szName = query.value(1).toString();
-            folder.parentId = query.value(2).toInt();
-            folder.sortOrder = query.value(3).toInt();
-            folder.createTime = query.value(4).toDateTime();
-
-            folders.append(folder);
-        }
-    }
-
-    return folders;
-}

Src/Database.h

@@ -39,6 +39,7 @@ class PLUGIN_EXPORT CDatabaseIcon : public CDatabase
 
 public:
     explicit CDatabaseIcon(QObject *parent = nullptr);
+    explicit CDatabaseIcon(const QString& szPrefix, QObject *parent = nullptr);
 
     /*!
      * \brief Get icon id
@@ -50,33 +51,7 @@ class PLUGIN_EXPORT CDatabaseIcon : public CDatabase
     QIcon GetIcon(int id);
 
     virtual bool OnInitializeDatabase() override;
+private:
+    QString m_szTableName;
 };
 
-class PLUGIN_EXPORT CDatabaseFolder : public CDatabase
-{
-    Q_OBJECT
-public:
-    explicit CDatabaseFolder(QObject *parent = nullptr);
-
-    struct FolderItem {
-        int id;
-        QString szName;
-        int parentId;
-        int sortOrder;
-        QDateTime createTime;
-    };
-
-    // 文件夹操作
-    bool AddFolder(const QString &name, int parentId = 0);
-    bool RenameFolder(int folderId, const QString &newName);
-    bool DeleteFolder(int folderId);
-    bool MoveFolder(int folderId, int newParentId);
-    // 文件夹查询
-    QList<FolderItem> GetAllFolders();
-    QList<FolderItem> GetSubFolders(int parentId);
-
-    virtual bool OnInitializeDatabase() override;
-
-protected:
-    virtual bool OnDeleteItems() = 0;
-};