Plugins::WebBrowser: modify WebBrowser.ini directory

KangLin · KangLin · commit 66abe3eb629c · 2026-02-24T16:06:00.000+08:00
diff --git a/Plugins/WebBrowser/DatabaseUrl.cpp b/Plugins/WebBrowser/DatabaseUrl.cpp
@@ -14,27 +14,9 @@ CDatabaseUrl::CDatabaseUrl(QObject *parent)
 
 bool CDatabaseUrl::OnInitializeDatabase()
 {
-    QSqlQuery query(GetDatabase());
-
-    // 创建历史记录表
-    bool success = query.exec(
-        "CREATE TABLE IF NOT EXISTS url ("
-        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-        "    url TEXT UNIQUE NOT NULL,"
-        "    title TEXT,"
-        "    icon INTEGER DEFAULT 0,"
-        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
-        ")"
-        );
-
-    if (!success) {
-        qCritical(log) << "Failed to create url table:" << query.lastError().text();
-        return false;
-    }
-
-    // 创建索引
-    query.exec("CREATE INDEX IF NOT EXISTS idx_url_url ON url(url)");
-
+    bool success = false;
+    success = CDatabase::OnInitializeDatabase();
+    if(!success) return success;
     m_iconDB.SetDatabase(GetDatabase());
     success = m_iconDB.OnInitializeDatabase();
     return success;
@@ -269,7 +251,9 @@ QList<int> CDatabaseUrl::GetDomain(const QString &szDomain)
             ret << query.value(0).toInt();
         }
     } else {
-        qCritical(log) << "Failed to get domain:" << query.lastError().text();
+        qCritical(log) << "Failed to get domain:"
+                       << query.lastError().text()
+                       << query.executedQuery();
     }
 
     return ret;
@@ -299,6 +283,10 @@ QList<CDatabaseUrl::UrlItem> CDatabaseUrl::Search(const QString &keyword)
             item.icon = m_iconDB.GetIcon(query.value(4).toInt());
             items.append(item);
         }
+    } else {
+        qCritical(log) << "Failed to search:"
+                       << query.lastError().text()
+                       << query.executedQuery();
     }
 
     return items;
@@ -313,3 +301,62 @@ bool CDatabaseUrl::ImportFromJson(const QJsonObject &obj)
 {
     return true;
 }
+
+bool CDatabaseUrl::OnInitializeSqliteDatabase()
+{
+    QSqlQuery query(GetDatabase());
+    
+    // 创建历史记录表
+    bool success = query.exec(
+        "CREATE TABLE IF NOT EXISTS url ("
+        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+        "    url TEXT UNIQUE NOT NULL,"
+        "    title TEXT,"
+        "    icon INTEGER DEFAULT 0,"
+        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
+        ")"
+        );
+    
+    if (!success) {
+        qCritical(log) << "Failed to create url table:"
+                       << query.lastError().text()
+                       << query.executedQuery();
+        return false;
+    }
+    
+    // 创建索引
+    success = query.exec("CREATE INDEX IF NOT EXISTS idx_url_url ON url(url)");
+    if (!success) {
+        qWarning(log) << "Failed to create index idx_url_url:"
+                       << query.lastError().text()
+                       << query.executedQuery();
+    }
+
+    return true;
+}
+
+bool CDatabaseUrl::OnInitializeMySqlDatabase()
+{
+    QSqlQuery query(GetDatabase());
+    
+    // 创建历史记录表
+    bool success = query.exec(
+        "CREATE TABLE IF NOT EXISTS url ("
+        "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
+        "    url TEXT NOT NULL,"
+        "    title TEXT,"
+        "    icon INTEGER DEFAULT 0,"
+        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP,"
+        "    INDEX idx_url_url (url)"
+        ")"
+        );
+    
+    if (!success) {
+        qCritical(log) << "Failed to create url table:"
+                       << query.lastError().text()
+                       << query.executedQuery();
+        return false;
+    }
+
+    return success;
+}
diff --git a/Plugins/WebBrowser/DatabaseUrl.h b/Plugins/WebBrowser/DatabaseUrl.h
@@ -41,5 +41,10 @@ class CDatabaseUrl : public CDatabase
 
 private:
     CDatabaseIcon m_iconDB;
+    
+    // CDatabase interface
+protected:
+    virtual bool OnInitializeSqliteDatabase() override;
+    virtual bool OnInitializeMySqlDatabase() override;
 };
 
diff --git a/Plugins/WebBrowser/FrmWebBrowser.cpp b/Plugins/WebBrowser/FrmWebBrowser.cpp
@@ -468,12 +468,12 @@ QWebEngineProfile* CFrmWebBrowser::GetProfile(bool offTheRecord)
     if(m_profile)
         return m_profile.get();
 
-    QSettings set(RabbitCommon::CDir::Instance()->GetDirUserData()
+    QSettings set(RabbitCommon::CDir::Instance()->GetDirUserConfig()
                       + QDir::separator() + "WebBrowser.ini",
                   QSettings::IniFormat);
     QString name = "io.github.KangLin.RabbitRemoteControl";
 #if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-    name += QLatin1StringView(qWebEngineChromiumVersion());
+    name += "_" + QLatin1StringView(qWebEngineChromiumVersion());
     name = set.value("Profile/Name", name).toString();
     QWebEngineProfileBuilder profileBuilder;
     m_profile.reset(profileBuilder.createProfile(name));
diff --git a/Plugins/WebBrowser/FrmWebView.cpp b/Plugins/WebBrowser/FrmWebView.cpp
@@ -321,7 +321,7 @@ void CFrmWebView::slotCertificateError(QWebEngineCertificateError error)
     }
 
     error.defer();
-    QSettings set(RabbitCommon::CDir::Instance()->GetDirUserData()
+    QSettings set(RabbitCommon::CDir::Instance()->GetDirUserConfig()
                       + QDir::separator() + "WebBrowser.ini",
                   QSettings::IniFormat);
     if(set.value("Certificate/Error/Accept" + error.url().toString(), false).toBool()) {
diff --git a/Plugins/WebBrowser/History/HistoryDatabase.cpp b/Plugins/WebBrowser/History/HistoryDatabase.cpp
@@ -70,26 +70,9 @@ CHistoryDatabase::~CHistoryDatabase()
 
 bool CHistoryDatabase::OnInitializeDatabase()
 {
-    QSqlQuery query(GetDatabase());
-
-    // 创建历史记录表
-    bool success = query.exec(
-        "CREATE TABLE IF NOT EXISTS history ("
-        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-        "    url INTEGER NOT NULL,"
-        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
-        ")"
-        );
-
-    if (!success) {
-        qCritical(log) << "Failed to create table:" << query.lastError().text();
-        return false;
-    }
-
-    // 创建索引
-    query.exec("CREATE INDEX IF NOT EXISTS idx_history_url ON history(url)");
-    query.exec("CREATE INDEX IF NOT EXISTS idx_history_time ON history(visit_time)");
-
+    bool success = false;
+    success = CDatabase::OnInitializeDatabase();
+    if(!success) return false;
     m_UrlDB.SetDatabase(GetDatabase());
     m_UrlDB.OnInitializeDatabase();
     return success;
@@ -761,3 +744,61 @@ bool CHistoryDatabase::ImportFromJson(const QJsonObject &obj)
 {
     return true;
 }
+
+bool CHistoryDatabase::OnInitializeSqliteDatabase()
+{
+    QSqlQuery query(GetDatabase());
+    
+    // 创建历史记录表
+    bool success = query.exec(
+        "CREATE TABLE IF NOT EXISTS history ("
+        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+        "    url INTEGER NOT NULL,"
+        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
+        ")"
+        );
+    
+    if (!success) {
+        qCritical(log) << "Failed to create table:" << query.lastError().text();
+        return false;
+    }
+    
+    // 创建索引
+    success = query.exec("CREATE INDEX IF NOT EXISTS idx_history_url ON history(url)");
+    if (!success) {
+        qWarning(log) << "Failed to create index idx_history_url:"
+                       << query.lastError().text()
+                       << query.executedQuery();
+    }
+    success = query.exec("CREATE INDEX IF NOT EXISTS idx_history_time ON history(visit_time)");
+    if (!success) {
+        qWarning(log) << "Failed to create index idx_history_time:"
+                      << query.lastError().text()
+                      << query.executedQuery();
+    }
+    
+    return true;
+}
+
+bool CHistoryDatabase::OnInitializeMySqlDatabase()
+{
+    QSqlQuery query(GetDatabase());
+    
+    // 创建历史记录表
+    bool success = query.exec(
+        "CREATE TABLE IF NOT EXISTS history ("
+        "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
+        "    url INTEGER NOT NULL,"
+        "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP,"
+        "    INDEX idx_history_url (url),"
+        "    INDEX idx_history_time (visit_time)"
+        ")"
+        );
+    
+    if (!success) {
+        qCritical(log) << "Failed to create table:" << query.lastError().text();
+        return false;
+    }
+
+    return true;
+}
diff --git a/Plugins/WebBrowser/History/HistoryDatabase.h b/Plugins/WebBrowser/History/HistoryDatabase.h
@@ -65,6 +65,11 @@ class CHistoryDatabase : public CDatabase
 
     virtual bool ExportToJson(QJsonObject &obj) override;
     virtual bool ImportFromJson(const QJsonObject &obj) override;
+    
+    // CDatabase interface
+protected:
+    virtual bool OnInitializeSqliteDatabase() override;
+    virtual bool OnInitializeMySqlDatabase() override;
 };
 
 void enableSqlTrace(const QString& connectionName = QSqlDatabase::defaultConnection);
diff --git a/Src/Database.cpp b/Src/Database.cpp
@@ -47,8 +47,7 @@ bool CDatabase::OpenDatabase(CParameterDatabase *pPara)
     bool bRet = false;
     if(!pPara) {
         bRet = OpenSQLiteDatabase();
-        if(!bRet) return false;
-        return OnInitializeDatabase();
+        return bRet;
     }
 
     m_pPara = pPara;
@@ -79,10 +78,8 @@ bool CDatabase::OpenDatabase(CParameterDatabase *pPara)
         qDebug(log) << "Multiple result sets:" << driver->hasFeature(QSqlDriver::MultipleResultSets);
         qDebug(log) << "Cancel query:" << driver->hasFeature(QSqlDriver::CancelQuery);
     }
-
-    if(!bRet) return false;
-
-    return OnInitializeDatabase();
+    
+    return bRet;
 }
 
 bool CDatabase::OpenSQLiteDatabase(
@@ -119,7 +116,8 @@ bool CDatabase::OpenSQLiteDatabase(
     qInfo(log) << "Open sqlite database connect:"
                << m_database.connectionName()
                << "database name:" << m_database.databaseName();
-    return true;
+    
+    return OnInitializeDatabase();
 }
 
 bool CDatabase::OpenMySqlDatabase(CParameterDatabase *pPara)
@@ -166,7 +164,8 @@ bool CDatabase::OpenMySqlDatabase(CParameterDatabase *pPara)
     qInfo(log) << "Open mysql database connect:"
                << m_database.connectionName()
                << "database name:" << m_database.databaseName();
-    return true;
+
+    return OnInitializeDatabase();
 }
 
 bool CDatabase::OpenODBCDatabase(CParameterDatabase* pPara)
@@ -207,7 +206,8 @@ bool CDatabase::OpenODBCDatabase(CParameterDatabase* pPara)
     qInfo(log) << "Open odbc database connect:"
                << m_database.connectionName()
                << "database name:" << m_database.databaseName();
-    return true;
+
+    return OnInitializeDatabase();
 }
 
 bool CDatabase::OnInitializeDatabase()

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ void CFrmWebView::slotCertificateError(QWebEngineCertificateError error)`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`error.defer();`
`324`		`- QSettings set(RabbitCommon::CDir::Instance()->GetDirUserData()`
	`324`	`+ QSettings set(RabbitCommon::CDir::Instance()->GetDirUserConfig()`
`325`	`325`	`+ QDir::separator() + "WebBrowser.ini",`
`326`	`326`	`QSettings::IniFormat);`
`327`	`327`	`if(set.value("Certificate/Error/Accept" + error.url().toString(), false).toBool()) {`