Database: modify CDatabase

KangLin · KangLin · commit 6a7a2fec73ab · 2026-03-06T17:01:35.000+08:00
diff --git a/App/Client/Favorite/FavoriteDatabase.cpp b/App/Client/Favorite/FavoriteDatabase.cpp
@@ -144,12 +144,9 @@ bool CFavoriteDatabase::OnInitializeDatabase()
     bool bRet = false;
     bRet = CDatabaseTree::OnInitializeDatabase();
     if(!bRet) return false;
-
-    m_IconDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_IconDB.OnInitializeDatabase();
+    bRet = m_IconDB.SetDatabase(GetDatabase(), m_pPara);
     if(!bRet) return false;
-    m_FileDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_FileDB.OnInitializeDatabase();
+    bRet = m_FileDB.SetDatabase(GetDatabase(), m_pPara);
     return bRet;
 }
 
diff --git a/App/Client/Favorite/FavoriteView.cpp b/App/Client/Favorite/FavoriteView.cpp
@@ -21,6 +21,8 @@
 #include "FavoriteMimeData.h"
 #include "TitleBar.h"
 #include "FavoriteView.h"
+#include "ParameterGlobal.h"
+#include "Database.h"
 
 static Q_LOGGING_CATEGORY(log, "Favorite")
 
@@ -212,9 +214,11 @@ int CFavoriteView::Initial()
     int nRet = 0;
     m_pDatabase = new CFavoriteDatabase(this);
     if(m_pDatabase) {
-        bool bRet = m_pDatabase->OpenDatabase(&m_pParaApp->m_Database, "favorite_connect");
-        if(!bRet)
-            return -1;
+        bool bRet = false;
+        //bRet = m_pDatabase->OpenDatabase(&m_pParaApp->GetGlobalParameters()->m_Database, "favorite_connect");
+        auto pg = m_pParaApp->GetGlobalParameters();
+        bRet = m_pDatabase->SetDatabase(&pg->m_DatabaseRemote);
+        if(!bRet) return -1;
     }
     if(m_pDatabase) {
         m_pModel = new CFavoriteModel(m_pDatabase, this);
diff --git a/App/Client/Favorite/FavoriteView.h b/App/Client/Favorite/FavoriteView.h
@@ -22,7 +22,7 @@ class CFavoriteView : public QWidget
 public:
     explicit CFavoriteView(CParameterApp* pPara, QWidget *parent = nullptr);
     virtual ~CFavoriteView();
-
+    
     [[nodiscard]] int Initial();
     RabbitCommon::CTitleBar* m_pDockTitleBar;
 
diff --git a/App/Client/ParameterApp.h b/App/Client/ParameterApp.h
@@ -14,7 +14,6 @@ class CParameterApp : public CParameter
     explicit CParameterApp(QObject *parent = nullptr);
     virtual ~CParameterApp();
 
-    CParameterDatabase m_Database;
     CParameterGlobal* GetGlobalParameters() const;
 
 private:
diff --git a/App/Client/Recent/FrmRecent.cpp b/App/Client/Recent/FrmRecent.cpp
@@ -180,10 +180,12 @@ CFrmRecent::~CFrmRecent()
 {
 }
 
-int CFrmRecent::Init()
+int CFrmRecent::Initial()
 {
     if(!m_Database.IsOpen()) {
-        bool bRet = m_Database.OpenDatabase(&m_ParameterApp.m_Database, "recent_connection");
+        bool bRet = false;
+        //bRet = m_Database.OpenDatabase(&m_ParameterApp.GetGlobalParameters()->m_Database, "recent_connection");
+        bRet = m_Database.SetDatabase(&m_ParameterApp.GetGlobalParameters()->m_DatabaseRemote);
         if(!bRet) return -1;
     }
     m_pModel = new CRecentModel(&m_ParameterApp, &m_Database, m_pTableView);
diff --git a/App/Client/Recent/FrmRecent.h b/App/Client/Recent/FrmRecent.h
@@ -33,8 +33,8 @@ class CFrmRecent : public QWidget, CManager::Handle
     virtual int onProcess(const QString &id, CPlugin *pPlugin) override;
 
     RabbitCommon::CTitleBar* m_pDockTitleBar;
-
-    [[nodiscard]] int Init();
+    
+    [[nodiscard]] int Initial();
     int AddRecent(const CRecentDatabase::RecentItem &item);
     bool UpdateRecent(const CRecentDatabase::RecentItem &item);
     QList<CRecentDatabase::RecentItem> GetRecents(int limit = -1, int offset = 0);
diff --git a/App/Client/Recent/RecentDatabase.cpp b/App/Client/Recent/RecentDatabase.cpp
@@ -59,11 +59,9 @@ bool CRecentDatabase::OnInitializeDatabase()
     if(!bRet) return false;
 
     // Create icon table
-    m_IconDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_IconDB.OnInitializeDatabase();
+    bRet = m_IconDB.SetDatabase(GetDatabase(), m_pPara);
     if(!bRet) return bRet;
-    m_FileDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_FileDB.OnInitializeDatabase();
+    bRet = m_FileDB.SetDatabase(GetDatabase(), m_pPara);
     return bRet;
 }
 
diff --git a/App/Client/mainwindow.cpp b/App/Client/mainwindow.cpp
@@ -423,29 +423,29 @@ int MainWindow::Initial()
             break;
         }
         m_Manager.EnumPlugins(this);
-
-        if(m_Manager.GetGlobalParameters()) {
-            //m_Parameter.SetGlobalParameters(m_Manager.GetGlobalParameters());
+        
+        auto pg = m_Manager.GetGlobalParameters();
+        if(pg) {
+            //m_Parameter.SetGlobalParameters(pg);
             bool bRet = QMetaObject::invokeMethod(
                 &m_Parameter,
                 "SetGlobalParameters",
                 Qt::DirectConnection,
-                Q_ARG(CParameterGlobal*, m_Manager.GetGlobalParameters()));
+                Q_ARG(CParameterGlobal*, pg));
             if(!bRet) {
                 szErr = tr("Failed to set global parameters");
                 qCritical(log) << szErr;
                 nRet = -1;
                 break;
             }
-            m_Parameter.m_Database = m_Manager.GetGlobalParameters()->m_Database;
         }
 
         if(m_pRecent) {
             szMsg = tr("Load list recent dock ......");
             initMsgBox.setText(szMsg);
             slotInformation(szMsg);
             qApp->processEvents();
-            nRet = m_pRecent->Init();
+            nRet = m_pRecent->Initial();
             if(nRet) {
                 szErr = tr("Initial recent dock error");
                 break;
@@ -1598,7 +1598,7 @@ void MainWindow::on_actionOpenListRecent_triggered()
                     m_pFavoriteView, SLOT(slotAddToFavorite(QString,QString,QString,QIcon)));
     Q_ASSERT(check);
     
-    int nRet = p->Init();
+    int nRet = p->Initial();
     if(nRet) return;
 
     QDialog d;
diff --git a/Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp b/Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp
@@ -60,11 +60,9 @@ CBookmarkDatabase::~CBookmarkDatabase()
 bool CBookmarkDatabase::OnInitializeDatabase()
 {
     bool bRet = false;
-    m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_UrlDB.OnInitializeDatabase();
+    bRet = m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
     if(!bRet) return false;
-    m_TreeDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_TreeDB.OnInitializeDatabase();
+    bRet = m_TreeDB.SetDatabase(GetDatabase(), m_pPara);
     if(!bRet) return false;
 
     if(m_TreeDB.GetNodeCount() == 0) {
diff --git a/Plugins/WebBrowser/DatabaseUrl.cpp b/Plugins/WebBrowser/DatabaseUrl.cpp
@@ -17,8 +17,7 @@ bool CDatabaseUrl::OnInitializeDatabase()
     bool success = false;
     success = CDatabase::OnInitializeDatabase();
     if(!success) return success;
-    m_iconDB.SetDatabase(GetDatabase(), m_pPara);
-    success = m_iconDB.OnInitializeDatabase();
+    success = m_iconDB.SetDatabase(GetDatabase(), m_pPara);
     return success;
 }
 
diff --git a/Plugins/WebBrowser/DatabaseUrl.h b/Plugins/WebBrowser/DatabaseUrl.h
@@ -35,7 +35,6 @@ class CDatabaseUrl : public CDatabase
     [[nodiscard]] QList<int> GetDomain(const QString& szDomain);
     [[nodiscard]] QList<UrlItem> Search(const QString& keyword);
 
-    [[nodiscard]] virtual bool OnInitializeDatabase() override;
     [[nodiscard]] virtual bool ExportToJson(QJsonObject& obj) override;
     [[nodiscard]] virtual bool ImportFromJson(const QJsonObject& obj) override;
 
@@ -44,6 +43,7 @@ class CDatabaseUrl : public CDatabase
     
     // CDatabase interface
 protected:
+    [[nodiscard]] virtual bool OnInitializeDatabase() override;
     [[nodiscard]] virtual bool OnInitializeSqliteDatabase() override;
     [[nodiscard]] virtual bool OnInitializeMySqlDatabase() override;
 };
diff --git a/Plugins/WebBrowser/History/HistoryDatabase.cpp b/Plugins/WebBrowser/History/HistoryDatabase.cpp
@@ -73,8 +73,7 @@ bool CHistoryDatabase::OnInitializeDatabase()
     bool success = false;
     success = CDatabase::OnInitializeDatabase();
     if(!success) return false;
-    m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
-    success = m_UrlDB.OnInitializeDatabase();
+    success = m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
     return success;
 }
 
diff --git a/Src/Database/Database.cpp b/Src/Database/Database.cpp
@@ -29,17 +29,18 @@ CDatabase::~CDatabase()
     CloseDatabase();
 }
 
-void CDatabase::SetDatabase(const CDatabase *db)
+bool CDatabase::SetDatabase(const CDatabase *db)
 {
-    SetDatabase(db->GetDatabase(), db->GetParameter());
+    return SetDatabase(db->GetDatabase(), db->GetParameter());
 }
 
-void CDatabase::SetDatabase(const QSqlDatabase db, const CParameterDatabase *pPara)
+bool CDatabase::SetDatabase(const QSqlDatabase db, const CParameterDatabase *pPara)
 {
     QString szErr = "Only one of OpenDatabase and SetDatabase can be called, and it can only be called once";
     Q_ASSERT_X(!IsOpen(), "Database", szErr.toStdString().c_str());
     m_database = db;
     m_pPara = pPara;
+    return OnInitializeDatabase();
 }
 
 QSqlDatabase CDatabase::GetDatabase() const
diff --git a/Src/Database/Database.h b/Src/Database/Database.h
@@ -29,15 +29,14 @@ class PLUGIN_EXPORT CDatabase : public QObject
     /*!
      * \brief Share an existing database
      * \param db
-     * \note After the call is completed, OnInitializeDatabase needs to be called
      */
-    void SetDatabase(const CDatabase* db);
+    [[nodiscard]] bool SetDatabase(const CDatabase* db);
     /*!
      * \brief Share an existing database
      * \param db
      * \param pPara
      */
-    void SetDatabase(const QSqlDatabase db, const CParameterDatabase* pPara);
+    [[nodiscard]] bool SetDatabase(const QSqlDatabase db, const CParameterDatabase* pPara);
     [[nodiscard]] QSqlDatabase GetDatabase() const;
 
     /*!
@@ -66,12 +65,6 @@ class PLUGIN_EXPORT CDatabase : public QObject
     [[nodiscard]] virtual bool IsOpen() const;
     virtual void CloseDatabase();
 
-    /*!
-     * \brief Initialize database
-     * \return
-     */
-    [[nodiscard]] virtual bool OnInitializeDatabase();
-
     [[nodiscard]] const CParameterDatabase* GetParameter() const;
     [[nodiscard]] const QString GetError() const;
     
@@ -84,6 +77,11 @@ class PLUGIN_EXPORT CDatabase : public QObject
     void sigChanged();
 
 protected:
+    /*!
+     * \brief Initialize database
+     * \return
+     */
+    [[nodiscard]] virtual bool OnInitializeDatabase();
     [[nodiscard]] virtual bool OnInitializeSqliteDatabase();
     [[nodiscard]] virtual bool OnInitializeMySqlDatabase();
     void SetError(const QString& szErr = QString());
diff --git a/Src/Database/DatabaseTree.cpp b/Src/Database/DatabaseTree.cpp
@@ -536,8 +536,7 @@ bool CDatabaseTree::OnInitializeDatabase()
     bRet = CDatabase::OnInitializeDatabase();
 
     if(!bRet) return false;
-    m_FolderDB.SetDatabase(GetDatabase(), m_pPara);
-    bRet = m_FolderDB.OnInitializeDatabase();
+    bRet = m_FolderDB.SetDatabase(GetDatabase(), m_pPara);
     if(!bRet) return false;
     bRet = connect(&m_FolderDB, &CDatabaseFolder::sigAddFolder,
                    this, &CDatabaseTree::sigAddFolder);
diff --git a/Src/Database/DatabaseTree.h b/Src/Database/DatabaseTree.h
@@ -158,7 +158,6 @@ class PLUGIN_EXPORT CDatabaseTree : public CDatabase
      */
     [[nodiscard]] int GetCount(int parentId = 0);
 
-    [[nodiscard]] virtual bool OnInitializeDatabase() override;
     [[nodiscard]] virtual bool ExportToJson(QJsonObject& obj) override;
     [[nodiscard]] virtual bool ImportFromJson(const QJsonObject& obj) override;
 
@@ -175,6 +174,7 @@ class PLUGIN_EXPORT CDatabaseTree : public CDatabase
      *         false: 失败。删除停止。
      */
     [[nodiscard]] virtual bool OnDeleteKey(int key);
+    [[nodiscard]] virtual bool OnInitializeDatabase() override;
     [[nodiscard]] virtual bool OnInitializeSqliteDatabase() override;
     [[nodiscard]] virtual bool OnInitializeMySqlDatabase() override;
 
diff --git a/Src/Manager.cpp b/Src/Manager.cpp
@@ -92,6 +92,20 @@ int CManager::Initial(QString szFile)
     if(m_pParameterPlugin) {
         LoadSettings(m_szSettingsFile);
         
+        // Initial database
+        auto pg = GetGlobalParameters();
+        Q_ASSERT(pg);
+        QString szFile;
+        szFile = pg->m_Database.GetDatabaseName();
+        bool bRet = pg->m_DatabaseLocal.OpenSQLiteDatabase(szFile, "Local_connect");
+        if(!bRet) return -1;
+        bRet = pg->m_DatabaseRemote.OpenDatabase(&pg->m_Database, "Remote_connect");
+        if(!bRet) return -1;
+        bRet = m_pParameterPlugin->m_WhiteList.InitDatabase(&pg->m_DatabaseLocal);
+        if(!bRet) return -1;
+        bRet = m_pParameterPlugin->m_BlackList.InitDatabase(&pg->m_DatabaseLocal);
+        if(!bRet) return -1;
+
         bool bReboot = true;
         QString szSnap;
         QString szFlatpak;
@@ -155,11 +169,8 @@ int CManager::Initial(QString szFile)
 
     m_pDatabaseFile = new CDatabaseFile(this);
     if(m_pDatabaseFile) {
-        CParameterDatabase* pDB = nullptr;
-        if(GetGlobalParameters()) {
-            pDB = &GetGlobalParameters()->m_Database;
-        }
-        bool bRet = m_pDatabaseFile->OpenDatabase(pDB);
+        auto pg = GetGlobalParameters();
+        bool bRet = m_pDatabaseFile->SetDatabase(&pg->m_DatabaseRemote);
         if(!bRet) return -1;
     }
 
diff --git a/Src/Manager.h b/Src/Manager.h
@@ -52,6 +52,12 @@ class PLUGIN_EXPORT CManager : public QObject
     explicit CManager(QObject *parent = nullptr);
     virtual ~CManager();
     
+    /*!
+     * \brief Initial
+     * \param szFile
+     * \return 0: success; other: failed
+     * \note It must be the first function called after instantiation
+     */
     [[nodiscard]] int Initial(QString szFile = QString());
 
     /*!
diff --git a/Src/ParameterCompone/ParameterFilter.cpp b/Src/ParameterCompone/ParameterFilter.cpp
@@ -21,6 +21,7 @@ CParameterFilter::~CParameterFilter()
 bool CParameterFilter::InitDatabase(CParameterDatabase *pDB)
 {
     if(!pDB) return false;
+    Q_ASSERT(!m_pDatabase);
     m_pDatabase = new CDatabaseFilter(m_szSuffix);
     if(m_pDatabase) {
         QString szConnectName = "connect_filter_"  + m_szSuffix;
@@ -33,6 +34,18 @@ bool CParameterFilter::InitDatabase(CParameterDatabase *pDB)
     return true;
 }
 
+bool CParameterFilter::InitDatabase(CDatabase *pDB)
+{
+    if(!pDB) return false;
+    Q_ASSERT(!m_pDatabase);
+    m_pDatabase = new CDatabaseFilter(m_szSuffix);
+    if(m_pDatabase) {
+        bool bRet = m_pDatabase->SetDatabase(pDB->GetDatabase(), pDB->GetParameter());
+        if(!bRet) return false;
+    }
+    return true;
+}
+
 bool CParameterFilter::contains(const QString &szKey)
 {
     if(m_pDatabase)
diff --git a/Src/ParameterCompone/ParameterFilter.h b/Src/ParameterCompone/ParameterFilter.h
@@ -5,6 +5,7 @@
 
 #include "Parameter.h"
 
+class CDatabase;
 class CDatabaseFilter;
 class CParameterDatabase;
 class CParameterFilter : public CParameter
@@ -17,6 +18,7 @@ class CParameterFilter : public CParameter
     ~CParameterFilter();
 
     bool InitDatabase(CParameterDatabase* pDB);
+    bool InitDatabase(CDatabase* pDB);
     virtual bool contains(const QString& szKey);
 
     int AddKey(const QString& szKey);
diff --git a/Src/ParameterCompone/ParameterGlobal.h b/Src/ParameterCompone/ParameterGlobal.h
@@ -5,6 +5,7 @@
 #include "Parameter.h"
 
 #include "ParameterDatabase.h"
+#include "Database.h"
 
 /*!
  * \~chinese
@@ -36,6 +37,8 @@ class PLUGIN_EXPORT CParameterGlobal : public CParameter
     ~CParameterGlobal();
 
     CParameterDatabase m_Database;
+    CDatabase m_DatabaseLocal;
+    CDatabase m_DatabaseRemote;
 
 public:
     enum SaveSettingsType{
diff --git a/Src/ParameterCompone/ParameterPlugin.cpp b/Src/ParameterCompone/ParameterPlugin.cpp

Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,12 @@ CFrmRecent::~CFrmRecent()`
`180`	`180`	`{`
`181`	`181`	`}`
`182`	`182`
`183`		`-int CFrmRecent::Init()`
	`183`	`+int CFrmRecent::Initial()`
`184`	`184`	`{`
`185`	`185`	`if(!m_Database.IsOpen()) {`
`186`		`- bool bRet = m_Database.OpenDatabase(&m_ParameterApp.m_Database, "recent_connection");`
	`186`	`+ bool bRet = false;`
	`187`	`+ //bRet = m_Database.OpenDatabase(&m_ParameterApp.GetGlobalParameters()->m_Database, "recent_connection");`
	`188`	`+ bRet = m_Database.SetDatabase(&m_ParameterApp.GetGlobalParameters()->m_DatabaseRemote);`
`187`	`189`	`if(!bRet) return -1;`
`188`	`190`	`}`
`189`	`191`	`m_pModel = new CRecentModel(&m_ParameterApp, &m_Database, m_pTableView);`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ bool CDatabaseUrl::OnInitializeDatabase()`
`17`	`17`	`bool success = false;`
`18`	`18`	`success = CDatabase::OnInitializeDatabase();`
`19`	`19`	`if(!success) return success;`
`20`		`- m_iconDB.SetDatabase(GetDatabase(), m_pPara);`
`21`		`- success = m_iconDB.OnInitializeDatabase();`
	`20`	`+ success = m_iconDB.SetDatabase(GetDatabase(), m_pPara);`
`22`	`21`	`return success;`
`23`	`22`	`}`
`24`	`23`