Plugins::WebBrowser: add history

Author: KangLin

Plugins/FtpServer/ParameterFtpServer.cpp

@@ -8,7 +8,7 @@ CParameterFtpServer::CParameterFtpServer(QObject *parent, const QString &szPrefi
     , m_nPort(21)
     , m_bAnonymousLogin(true)
     , m_bReadOnly(true)
-    , m_ConnectCount(-1)
+    , m_ConnectCount(2)
     , m_bListenAll(true)
 {}
 

Plugins/WebBrowser/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(WebBrowser_QT_COMPONENTS Core Gui Widgets WebEngineWidgets WebEngineCore)
+set(WebBrowser_QT_COMPONENTS Core Gui Widgets WebEngineWidgets WebEngineCore Sql)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${WebBrowser_QT_COMPONENTS})
 if(Qt${QT_VERSION_MAJOR}_FOUND)
     FOREACH(_COMPONENT ${WebBrowser_QT_COMPONENTS})
@@ -35,6 +35,10 @@ set(WebBrowser_SOURCE_FILES
     PasswordStore.cpp
     CaptureFullPage.cpp
     MultimediaRecord.cpp
+    History/FrmHistory.cpp
+    History/HistoryDatabase.cpp
+    History/HistoryModel.cpp
+    History/ParameterHistory.cpp
     )
 set(WebBrowser_HEADER_FILES
     PluginWebBrowser.h
@@ -49,11 +53,16 @@ set(WebBrowser_HEADER_FILES
     PasswordStore.h
     CaptureFullPage.h
     MultimediaRecord.h
+    History/FrmHistory.h
+    History/HistoryDatabase.h
+    History/HistoryModel.h
+    History/ParameterHistory.h
     )
 set(WebBrowser_UI_FILES
     FrmDownload.ui
     DlgSettings.ui
     DlgWebAuth.ui
+    History/FrmHistory.ui
     Resource/Resource.qrc
     )
 if(QT_VERSION GREATER_EQUAL "6.7.0")

Plugins/WebBrowser/FrmDownloadManager.h

@@ -1,6 +1,6 @@
-#ifndef FRMDOWNLOADMANAGER_H
-#define FRMDOWNLOADMANAGER_H
+// Author: Kang Lin <kl222@126.com>
 
+#pragma once
 #include <QWidget>
 #include <QVBoxLayout>
 #include "FrmDownload.h"
@@ -30,5 +30,3 @@ private Q_SLOTS:
     QVBoxLayout* m_pItems;
     CParameterWebBrowser* m_pPara;
 };
-
-#endif // FRMDOWNLOADMANAGER_H

Plugins/WebBrowser/FrmPopup.cpp

@@ -1,3 +1,4 @@
+// Author: Kang Lin <kl222@126.com>
 
 #include <QIcon>
 #include <QVBoxLayout>

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -29,6 +29,7 @@
 #include "FrmWebBrowser.h"
 #include "FrmPopup.h"
 #include "CaptureFullPage.h"
+#include "History/FrmHistory.h"
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.Browser")
 CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidget *parent)
@@ -65,6 +66,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     , m_pCaptureFulPage(nullptr)
     , m_pRecord(nullptr)
     , m_pMultimediaRecord(nullptr)
+    , m_pHistoryDatabase(nullptr)
 {
     qDebug(log) << Q_FUNC_INFO;
     bool check = false;
@@ -227,6 +229,17 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
 
     check = connect(&m_tmRecord, &QTimer::timeout, this, &CFrmWebBrowser::slotRecordTimeout);
     Q_ASSERT(check);
+
+    m_pHistoryDatabase = new CHistoryDatabase(this);
+    if(m_pHistoryDatabase) {
+        QString szDb = GetProfile()->persistentStoragePath()
+                       + QDir::separator() + "History.db";
+        bool bRet = m_pHistoryDatabase->openDatabase(szDb);
+        if(!bRet) {
+            delete m_pHistoryDatabase;
+            m_pHistoryDatabase = nullptr;
+        }
+    }
 }
 
 CFrmWebBrowser::~CFrmWebBrowser()
@@ -343,10 +356,13 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
         }
     });
     check = connect(pWeb, &QWebEngineView::urlChanged,
-                    this, [&](const QUrl &url){
+                    this, [&](const QUrl &url) {
                         CFrmWebView* pWeb = qobject_cast<CFrmWebView*>(sender());
                         if(IsCurrentView(pWeb))
                             m_pUrlLineEdit->setText(url.toString());
+                        if(m_pHistoryDatabase) {
+                            m_pHistoryDatabase->addHistoryEntry(url.toString(), "");
+                        }
                     });
     Q_ASSERT(check);
     check = connect(pWeb, &CFrmWebView::titleChanged,
@@ -359,6 +375,9 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
                             setWindowTitle(title);
                             emit sigUpdateTitle();
                         }
+                        if(m_pHistoryDatabase) {
+                            m_pHistoryDatabase->updateHistoryEntry(pWeb->url().toString(), title);
+                        }
                     });
     Q_ASSERT(check);
     check = connect(pWeb, &CFrmWebView::favIconChanged,
@@ -371,6 +390,9 @@ void CFrmWebBrowser::SetConnect(CFrmWebView* pWeb)
                             setWindowIcon(icon);
                             emit sigUpdateTitle();
                         }
+                        if(m_pHistoryDatabase) {
+                            m_pHistoryDatabase->updateHistoryEntry(pWeb->url().toString(), QString(), icon);
+                        }
                     });
     Q_ASSERT(check);
     check = connect(pWeb, &CFrmWebView::sigLinkHovered,
@@ -442,7 +464,16 @@ QWebEngineProfile* CFrmWebBrowser::GetProfile(bool offTheRecord)
     bool check = connect(m_profile.get(), &QWebEngineProfile::downloadRequested,
                          &m_DownloadManager, &CFrmDownloadManager::slotDownloadRequested);
     Q_ASSERT(check);
+    //m_profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies);
+    //m_profile->setPersistentStoragePath(m_profile->cachePath() + QDir::separator() + "Persistent");
+    //m_profile->setHttpCacheMaximumSize(50);
     qDebug(log) << "User agent:" << m_profile->httpUserAgent()
+#if QT_VERSION > QT_VERSION_CHECK(6, 8, 0)
+                //<< "AllPermissions:" << m_profile->listAllPermissions()
+                << "persistentPermissionsPolicy:" << m_profile->persistentPermissionsPolicy()
+#endif
+                << "persistentCookiesPolicy:" << m_profile->persistentCookiesPolicy()
+                << "httpCacheMaximumSize:" << m_profile->httpCacheMaximumSize()
                 << "Persistent path:" << m_profile->persistentStoragePath()
                 << "Cache path:" << m_profile->cachePath()
                 << "Storage name:" << m_profile->storageName()
@@ -544,7 +575,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     pMenu->addAction(m_pForward);
     pMenu->addAction(m_pRefresh);
     m_pStop = pMenu->addAction(
-        QIcon::fromTheme("media-playback-stop"), tr("Stop"), this, [&](){
+        QIcon::fromTheme("media-playback-stop"), tr("Stop"), this, [&]() {
             CFrmWebView* pWeb = CurrentView();
             if(pWeb && pWeb->page())
                 pWeb->page()->action(QWebEnginePage::Stop)->trigger();
@@ -553,11 +584,34 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     m_pStop->setShortcuts(QKeySequence::Cancel);
     m_pStop->setStatusTip(m_pStop->text());
 
+    pMenu->addSeparator();
+    pMenu->addAction(tr("History"), this, [&]() {
+        CFrmHistory* pHistory = new CFrmHistory(m_pHistoryDatabase, &m_pPara->m_History);
+        if(!pHistory) return;
+        pHistory->setAttribute(Qt::WA_DeleteOnClose);
+        connect(this, &CFrmWebBrowser::destroyed, pHistory, &CFrmHistory::close);
+        connect(pHistory, &CFrmHistory::sigOpenUrl, this, [&](const QString& url) {
+            CFrmWebView* pWeb = CurrentView();
+            if(!pWeb) {
+                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+            }
+            if(pWeb)
+                pWeb->load(url);
+        });
+        connect(pHistory, &CFrmHistory::sigOpenUrlInNewTab,
+                this, [&](const QString& url) {
+            auto pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+            if(pWeb)
+                pWeb->load(url);
+        });
+        pHistory->show();
+    });
+
     pMenu->addSeparator();
     pMenu->addAction(m_pAddPage);
     m_pAddPageIncognito = pMenu->addAction(
         QIcon::fromTheme("add"), tr("Add incognito tab"),
-        this, [&](){
+        this, [&]() {
             CreateWindow(QWebEnginePage::WebBrowserTab, true);
             if(!m_pPara->GetTabUrl().isEmpty()) {
                 m_pUrlLineEdit->setText(m_pPara->GetTabUrl());
@@ -567,14 +621,14 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     m_pAddPageIncognito->setStatusTip(m_pAddPageIncognito->text());
     m_pAddWindow = pMenu->addAction(
         QIcon::fromTheme("add"), tr("Add window"),
-        this, [&](){
+        this, [&]() {
             CreateWindow(QWebEnginePage::WebBrowserWindow);
         });
     m_pAddWindow->setVisible(false);
     m_pAddWindow->setStatusTip(m_pAddWindow->text());
     m_pAddWindowIncognito = pMenu->addAction(
         QIcon::fromTheme("add"), tr("Add Incognito Window"),
-        this, [&](){
+        this, [&]() {
             CreateWindow(QWebEnginePage::WebBrowserWindow, true);
         });
     m_pAddWindowIncognito->setVisible(false);
@@ -583,7 +637,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     pMenu->addSeparator();
     m_pFind = pMenu->addAction(
         QIcon::fromTheme("edit-find"), tr("&Find"), this,
-        [&](){
+        [&]() {
             CFrmWebView* pWeb = CurrentView();
             if(pWeb) {
                 bool ok = false;

Plugins/WebBrowser/FrmWebBrowser.h

@@ -16,6 +16,7 @@
 #include "FrmDownloadManager.h"
 #include "ParameterWebBrowser.h"
 #include "MultimediaRecord.h"
+#include "History/HistoryDatabase.h"
 
 class CFrmWebBrowser : public QWidget
 {
@@ -125,4 +126,6 @@ public Q_SLOTS:
 
     CMultimediaRecordThread* m_pMultimediaRecord;
     QTimer m_tmRecord;
+
+    CHistoryDatabase* m_pHistoryDatabase;
 };