Plugin::WebBrowser: modify database

Author: KangLin

Plugins/WebBrowser/AddressCompleter.cpp

@@ -52,14 +52,15 @@ CAddressCompleterItem::CAddressCompleterItem(const QString &title,
     setAttribute(Qt::WA_Hover);
 }
 
-CAddressCompleter::CAddressCompleter(QWidget *parent)
+CAddressCompleter::CAddressCompleter(CHistoryDatabase *db, QWidget *parent)
     : QWidget(parent)
     , m_pLineEdit(nullptr)
     , m_pShowAnimation(nullptr)
     , m_pHideAnimation(nullptr)
     , m_currentSelectedIndex(-1)
     , m_maxVisibleItems(8)
     , m_isCompleterVisible(false)
+    , m_pDatabase(db)
 {
     m_szEnter = tr("Enter '@' show commands") + "; "
                 + tr("Enter a website URL or search content ......");
@@ -304,8 +305,8 @@ void CAddressCompleter::performSearch()
 
     // 搜索历史记录
     QList<HistoryItem> lstHistory;
-    if(CHistoryDatabase::Instance())
-        lstHistory = CHistoryDatabase::Instance()->searchHistory(keyword);
+    if(m_pDatabase)
+        lstHistory = m_pDatabase->searchHistory(keyword);
 
     // 添加搜索结果
     int count = 0;

Plugins/WebBrowser/AddressCompleter.h

@@ -11,6 +11,8 @@
 #include <QIcon>
 #include <QPropertyAnimation>
 
+class CHistoryDatabase;
+
 /*!
  * \~chinese 浏览器的地址栏自动完成功能
  * \~english Browser address bar autocomplete feature
@@ -39,7 +41,7 @@ class CAddressCompleter : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CAddressCompleter(QWidget *parent = nullptr);
+    explicit CAddressCompleter(CHistoryDatabase* db, QWidget *parent = nullptr);
     ~CAddressCompleter();
 
     void attachToLineEdit(QLineEdit *lineEdit);
@@ -92,4 +94,6 @@ private Q_SLOTS:
     int m_currentSelectedIndex;
     int m_maxVisibleItems;
     bool m_isCompleterVisible;
+
+    CHistoryDatabase* m_pDatabase;
 };

Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp

@@ -14,36 +14,6 @@
 #include "BookmarkDatabase.h"
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.Bookmark.DB")
-static CBookmarkDatabase* g_pDatabase = nullptr;
-CBookmarkDatabase* CBookmarkDatabase::Instance(CParameterDatabase *para)
-{
-    if(!g_pDatabase) {
-        g_pDatabase = new CBookmarkDatabase();
-        if(g_pDatabase) {
-            bool bRet = g_pDatabase->OpenDatabase(para, "bookmark_connection");
-            if(!bRet) {
-                delete g_pDatabase;
-                g_pDatabase = nullptr;
-            }
-        }
-    }
-    return g_pDatabase;
-}
-
-CBookmarkDatabase* CBookmarkDatabase::Instance()
-{
-    if(!g_pDatabase) {
-        g_pDatabase = new CBookmarkDatabase();
-        if(g_pDatabase) {
-            bool bRet = g_pDatabase->OpenDatabase(nullptr, "bookmarks_connect");
-            if(!bRet) {
-                delete g_pDatabase;
-                g_pDatabase = nullptr;
-            }
-        }
-    }
-    return g_pDatabase;
-}
 
 CBookmarkDatabase::CBookmarkDatabase(QObject *parent)
     : CDatabase(parent)

Plugins/WebBrowser/Bookmark/BookmarkDatabase.h

@@ -66,9 +66,10 @@ struct BookmarkItem {
 class CBookmarkDatabase : public CDatabase
 {
     Q_OBJECT
+
 public:
-    static CBookmarkDatabase* Instance(CParameterDatabase *para);
-    static CBookmarkDatabase* Instance();
+    explicit CBookmarkDatabase(QObject *parent = nullptr);
+    ~CBookmarkDatabase();
 
     // 书签操作
     int addBookmark(const BookmarkItem &item);
@@ -112,8 +113,6 @@ class CBookmarkDatabase : public CDatabase
     void folderDeleted(int folderId);
 
 private:
-    explicit CBookmarkDatabase(QObject *parent = nullptr);
-    ~CBookmarkDatabase();
     [[nodiscard]] bool OnInitializeDatabase() override;
 
     void buildBookmarkDocument(QDomDocument &doc);

Plugins/WebBrowser/Bookmark/FrmAddBookmark.cpp

@@ -16,7 +16,7 @@ CFrmAddBookmark::CFrmAddBookmark(const QString &szTitle, const QUrl &url,
     , m_Url(url)
     , m_Icon(icon)
     , m_pPara(pPara)
-    , m_pDatabase(CBookmarkDatabase::Instance())
+    , m_pDatabase(nullptr)
     , m_pModelTree(nullptr)
 {
     ui->setupUi(this);
@@ -30,6 +30,7 @@ CFrmAddBookmark::CFrmAddBookmark(const QString &szTitle, const QUrl &url,
     ui->leTitle->setText(m_szTitle);
 
     if(m_pPara) {
+        m_pDatabase = &pPara->m_BookmarkDatabase;
         resize(m_pPara->GetWindowSize());
         ui->cbSave->setChecked(m_pPara->GetBookmarkShowEditor());
     }

Plugins/WebBrowser/Bookmark/FrmBookmark.cpp

@@ -19,7 +19,7 @@ static Q_LOGGING_CATEGORY(log, "WebBrowser.Bookmark")
 CFrmBookmark::CFrmBookmark(CParameterWebBrowser *pPara, QWidget *parent)
     : QWidget(parent)
     , ui(new Ui::CFrmBookmark)
-    , m_pDatabase(CBookmarkDatabase::Instance())
+    , m_pDatabase(nullptr)
     , m_pPara(pPara)
     , m_pTreeView(nullptr)
     , m_pSearchEdit(nullptr)
@@ -33,8 +33,10 @@ CFrmBookmark::CFrmBookmark(CParameterWebBrowser *pPara, QWidget *parent)
     setupUI();
     loadBookmarks();
 
-    if(m_pPara)
+    if(m_pPara) {
+        m_pDatabase = &pPara->m_BookmarkDatabase;
         resize(m_pPara->GetWindowSize());
+    }
 }
 
 CFrmBookmark::~CFrmBookmark()

Plugins/WebBrowser/DatabaseUrl.cpp

@@ -72,7 +72,8 @@ int CDatabaseUrl::AddUrl(const QString &url, const QString &title, const QIcon &
     bool success = query.exec();
     if (!success) {
         nId = 0;
-        qCritical(log) << "Failed to add url:" << url << query.lastError().text();
+        qCritical(log) << "Failed to add url:" << url << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
     } else {
         if(0 == nId)
             nId = query.lastInsertId().toInt();
@@ -306,15 +307,16 @@ bool CDatabaseUrl::OnInitializeSqliteDatabase()
     QSqlQuery query(GetDatabase());
 
     // 创建历史记录表
-    bool success = query.exec(
+    query.prepare(
         "CREATE TABLE IF NOT EXISTS url ("
-        "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
+        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
         "    url TEXT UNIQUE NOT NULL,"
         "    title TEXT,"
         "    icon INTEGER DEFAULT 0,"
         "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
         ")"
         );
+    bool success = query.exec();
 
     if (!success) {
         qCritical(log) << "Failed to create url table:"
@@ -324,7 +326,8 @@ bool CDatabaseUrl::OnInitializeSqliteDatabase()
     }
 
     // 创建索引
-    success = query.exec("CREATE INDEX IF NOT EXISTS idx_url_url ON url(url)");
+    query.prepare("CREATE INDEX IF NOT EXISTS idx_url_url ON url(url)");
+    success = query.exec();
     if (!success) {
         qWarning(log) << "Failed to create index idx_url_url:"
                        << query.lastError().text()
@@ -339,7 +342,7 @@ bool CDatabaseUrl::OnInitializeMySqlDatabase()
     QSqlQuery query(GetDatabase());
 
     // 创建历史记录表
-    bool success = query.exec(
+    query.prepare(
         "CREATE TABLE IF NOT EXISTS url ("
         "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
         "    url TEXT NOT NULL,"
@@ -349,6 +352,7 @@ bool CDatabaseUrl::OnInitializeMySqlDatabase()
         "    UNIQUE KEY idx_url_url (url(32767))"
         ")"
         );
+    bool success = query.exec();
 
     if (!success) {
         qCritical(log) << "Failed to create url table:"

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -36,6 +36,7 @@
 #include "FrmAddBookmark.h"
 #include "DlgSettings.h"
 #include "FrmWebBrowser.h"
+#include "ParameterGlobal.h"
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.Browser")
 CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidget *parent)
@@ -73,8 +74,6 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     , m_pCaptureFulPage(nullptr)
     , m_pRecord(nullptr)
     , m_pMultimediaRecord(nullptr)
-    , m_pHistoryDatabase(nullptr)
-    , m_pBookmarkDatabase(nullptr)
 {
     qDebug(log) << Q_FUNC_INFO;
     bool check = false;
@@ -150,7 +149,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     });
     Q_ASSERT(check);
     // 创建地址栏自动完成器
-    auto pAddressCompleter = new CAddressCompleter(this);
+    auto pAddressCompleter = new CAddressCompleter(&m_pPara->m_HistoryDatabase, this);
     pAddressCompleter->attachToLineEdit(m_pUrlLineEdit);
     if(m_pPara)
         pAddressCompleter->setMaxVisibleItems(m_pPara->GetAddCompleterLines());
@@ -389,8 +388,8 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
                         CFrmWebView* pWeb = qobject_cast<CFrmWebView*>(sender());
                         if(IsCurrentView(pWeb))
                             m_pUrlLineEdit->setText(url.toString());
-                        if(m_pHistoryDatabase) {
-                            m_pHistoryDatabase->addHistoryEntry(url.toString());
+                        if(m_pPara) {
+                            m_pPara->m_HistoryDatabase.addHistoryEntry(url.toString());
                         }
                     });
     Q_ASSERT(check);
@@ -404,8 +403,8 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
                             setWindowTitle(title);
                             emit sigUpdateTitle();
                         }
-                        if(m_pHistoryDatabase) {
-                            m_pHistoryDatabase->updateHistoryEntry(pWeb->url().toString(), title);
+                        if(m_pPara) {
+                            m_pPara->m_HistoryDatabase.updateHistoryEntry(pWeb->url().toString(), title);
                         }
                     });
     Q_ASSERT(check);
@@ -420,8 +419,8 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
                             setWindowIcon(icon);
                             emit sigUpdateTitle();
                         }
-                        if(m_pHistoryDatabase) {
-                            m_pHistoryDatabase->updateHistoryEntry(pWeb->url().toString(), QString(), icon);
+                        if(m_pPara) {
+                            m_pPara->m_HistoryDatabase.updateHistoryEntry(pWeb->url().toString(), QString(), icon);
                         }
                     });
     Q_ASSERT(check);
@@ -805,9 +804,6 @@ int CFrmWebBrowser::Start()
 {
     int nRet = 0;
 
-    m_pHistoryDatabase = CHistoryDatabase::Instance(&m_pPara->m_Database);
-    m_pBookmarkDatabase = CBookmarkDatabase::Instance(&m_pPara->m_Database);
-
     if(m_pTab && m_pTab->count() == 0) {
         // Add new web view
         m_pAddPage->trigger();

Plugins/WebBrowser/FrmWebBrowser.h

@@ -16,8 +16,6 @@
 #include "FrmDownloadManager.h"
 #include "ParameterWebBrowser.h"
 #include "MultimediaRecord.h"
-#include "History/HistoryDatabase.h"
-#include "Bookmark/BookmarkDatabase.h"
 
 class CFrmWebBrowser : public QWidget
 {
@@ -133,7 +131,4 @@ public Q_SLOTS:
 
     CMultimediaRecordThread* m_pMultimediaRecord;
     QTimer m_tmRecord;
-
-    CHistoryDatabase* m_pHistoryDatabase;
-    CBookmarkDatabase* m_pBookmarkDatabase;
 };

Plugins/WebBrowser/History/HistoryDatabase.cpp

@@ -41,22 +41,6 @@ void enableSqlTrace(const QString& connectionName)
 }
 #endif // HAVE_SQLITE
 
-CHistoryDatabase* CHistoryDatabase::Instance(CParameterDatabase *para)
-{
-    static CHistoryDatabase* p = nullptr;
-    if(!p) {
-        p = new CHistoryDatabase();
-        if(p) {
-            bool bRet = p->OpenDatabase(para, "history_connection");
-            if(!bRet) {
-                delete p;
-                p = nullptr;
-            }
-        }
-    }
-    return p;
-}
-
 CHistoryDatabase::CHistoryDatabase(QObject *parent)
     : CDatabase(parent)
 {
@@ -749,27 +733,30 @@ bool CHistoryDatabase::OnInitializeSqliteDatabase()
     QSqlQuery query(GetDatabase());
 
     // 创建历史记录表
-    bool success = query.exec(
+    query.prepare(
         "CREATE TABLE IF NOT EXISTS history ("
         "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
         "    url INTEGER NOT NULL,"
         "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP"
         ")"
         );
+    bool success = query.exec();
 
     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)");
+    query.prepare("CREATE INDEX IF NOT EXISTS idx_history_url ON history(url)");
+    success = query.exec();
     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)");
+    query.prepare("CREATE INDEX IF NOT EXISTS idx_history_time ON history(visit_time)");
+    success = query.exec();
     if (!success) {
         qWarning(log) << "Failed to create index idx_history_time:"
                       << query.lastError().text()
@@ -784,7 +771,7 @@ bool CHistoryDatabase::OnInitializeMySqlDatabase()
     QSqlQuery query(GetDatabase());
 
     // 创建历史记录表
-    bool success = query.exec(
+    query.prepare(
         "CREATE TABLE IF NOT EXISTS history ("
         "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
         "    url INTEGER NOT NULL,"
@@ -793,6 +780,7 @@ bool CHistoryDatabase::OnInitializeMySqlDatabase()
         "    INDEX idx_history_time (visit_time)"
         ")"
         );
+    bool success = query.exec();
 
     if (!success) {
         qCritical(log) << "Failed to create history table:"