Plugins::WebBrowser: add import bookmark

KangLin · KangLin · commit bdd9a6e6ee15 · 2026-01-16T12:03:48.000+08:00
diff --git a/Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp b/Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp
diff --git a/Plugins/WebBrowser/Bookmark/BookmarkDatabase.h b/Plugins/WebBrowser/Bookmark/BookmarkDatabase.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <QDomElement>
 #include <QString>
 #include <QByteArray>
 #include <QDateTime>
@@ -138,6 +139,28 @@ class CBookmarkDatabase : public QObject
     bool initializeDatabase();
     BookmarkItem bookmarkFromQuery(const QSqlQuery &query);
 
+    void buildBookmarkDocument(QDomDocument &doc);
+    void buildBookmarkTree(
+        QDomDocument &doc, QDomElement &parentElement, int folderId);
+    QDomElement createBookmarkDomElement(
+        QDomDocument &doc, const BookmarkItem &bookmark);
+    int parseHtmlBookmarks(const QString &htmlContent);
+    int parseBookmarkList(const QDomElement &dlElement,
+                          const QString &currentPath,
+                          QMap<QString, int> &folderMap);
+    int parseDtElement(const QDomElement &dtElement,
+                       const QString &currentPath,
+                       QMap<QString, int> &folderMap);
+    int importBookmark(const QDomElement &aElement,
+                       const QString &folderPath, QMap<QString, int> &folderMap);
+    QString importFolder(const QDomElement &h3Element,
+                                        const QString &parentPath,
+                                        QMap<QString, int> &folderMap);
+    int getOrCreateFolder(const QString &folderPath, int parentFolderId);
+    int getOrCreateFolder(const QString &folderPath, QMap<QString, int> &folderMap);
+    QDateTime parseTimestamp(const QString &timestampStr);
+    QDomElement findFirstElement(const QDomElement &parent, const QString &tagName);
+
 private:
     QSqlDatabase m_database;
 };
diff --git a/Plugins/WebBrowser/Bookmark/FrmAddBookmark.cpp b/Plugins/WebBrowser/Bookmark/FrmAddBookmark.cpp
@@ -82,6 +82,9 @@ void CFrmAddBookmark::on_pbAdd_clicked()
             item.title = ui->leTitle->text();
             item.url = m_Url.toString();
             item.folderId = id;
+            item.createdTime = QDateTime::currentDateTime();
+            item.lastVisitTime = item.createdTime;
+            item.modifiedTime = item.createdTime;
             m_pDatabase->addBookmark(item);
         }
     }
diff --git a/Plugins/WebBrowser/Bookmark/FrmBookmark.cpp b/Plugins/WebBrowser/Bookmark/FrmBookmark.cpp
@@ -277,6 +277,8 @@ void CFrmBookmark::onAddBookmark()
     item.url = url;
     item.title = title.isEmpty() ? url : title;
     item.createdTime = QDateTime::currentDateTime();
+    item.lastVisitTime = item.createdTime;
+    item.modifiedTime = item.createdTime;
 
     // 获取选中的文件夹
     QModelIndex currentIndex = m_pTreeView->currentIndex();
@@ -483,10 +485,15 @@ void CFrmBookmark::onSearchTextChanged(const QString &text)
 
 void CFrmBookmark::onTreeViewDoubleClicked(const QModelIndex &index)
 {
+    if(!m_pDatabase) return;
     int type = index.data(Type).toInt();
     if (BookmarkType_Bookmark == type) {
         QString url = index.data(Url).toString();
+        int id = index.data(ID).toInt();
         if (!url.isEmpty()) {
+            BookmarkItem item = m_pDatabase->getBookmark(id);
+            item.lastVisitTime = QDateTime::currentDateTime();
+            m_pDatabase->updateBookmark(item);
             emit openUrlRequested(url);
             close();  // 关闭对话框
         }
@@ -506,10 +513,7 @@ void CFrmBookmark::onCustomContextMenu(const QPoint &pos)
 
     if (BookmarkType_Bookmark == type) {
         menu.addAction(QIcon::fromTheme("document-open"), tr("Open"), this, [this, index]() {
-            QString url = index.data(Url).toString();
-            if (!url.isEmpty()) {
-                emit openUrlRequested(url);
-            }
+            onTreeViewDoubleClicked(index);
         });
 
         menu.addAction(QIcon::fromTheme("edit"), tr("Edit"), this, &CFrmBookmark::onEditBookmark);
diff --git a/Plugins/WebBrowser/CMakeLists.txt b/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 Sql)
+set(WebBrowser_QT_COMPONENTS Core Gui Widgets WebEngineWidgets WebEngineCore Sql Xml)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${WebBrowser_QT_COMPONENTS})
 if(Qt${QT_VERSION_MAJOR}_FOUND)
     FOREACH(_COMPONENT ${WebBrowser_QT_COMPONENTS})
diff --git a/Plugins/WebBrowser/ParameterWebBrowser.cpp b/Plugins/WebBrowser/ParameterWebBrowser.cpp
@@ -28,7 +28,10 @@ CParameterWebBrowser::CParameterWebBrowser(QObject *parent, const QString &szPre
     //m_szDownloadFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     SetDownloadFolder(QWebEngineProfile::defaultProfile()->downloadPath());
     qDebug(log) << "Download folder:" << GetDownloadFolder();
-    SetSearchEngine("https://cn.bing.com/search?q=%s");
+    if(QLocale::system().language() == QLocale::Language::Chinese)
+        SetSearchEngine("https://www.bing.com/search?q=%s");
+    else
+        SetSearchEngine("https://www.google.com/search?q=%s");
     SetSearchRelaceString("%s");
     QStringList searchEngines;
     searchEngines << "https://www.bing.com/search?q=%s"
diff --git a/Plugins/WebBrowser/PluginWebBrowser.cpp b/Plugins/WebBrowser/PluginWebBrowser.cpp
@@ -1,9 +1,9 @@
 // Author: Kang Lin <kl222@126.com>
+#include <QWebEngineProfile>
+#include <QLoggingCategory>
 
 #include "PluginWebBrowser.h"
 #include "OperateWebBrowser.h"
-#include <QWebEngineProfile>
-#include <QLoggingCategory>
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.Plugin")
 CPluginWebBrowser::CPluginWebBrowser(QObject *parent)
diff --git a/Plugins/WebBrowser/Resource/Translations/WebBrowser_zh_CN.ts b/Plugins/WebBrowser/Resource/Translations/WebBrowser_zh_CN.ts
@@ -58,7 +58,7 @@
     <name>CBookmarkDatabase</name>
     <message>
         <location filename="../../Bookmark/BookmarkDatabase.cpp" line="126"/>
-        <source>Bookmark</source>
+        <source>Bookmarks</source>
         <translation>书签</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
     </message>
     <message>
         <location filename="../../Bookmark/BookmarkDatabase.cpp" line="128"/>
-        <source>Favorite</source>
+        <source>Favorites</source>
         <translation>收藏夹</translation>
     </message>
     <message>
diff --git a/Plugins/WebBrowser/Resource/Translations/WebBrowser_zh_TW.ts b/Plugins/WebBrowser/Resource/Translations/WebBrowser_zh_TW.ts
@@ -58,7 +58,7 @@
     <name>CBookmarkDatabase</name>
     <message>
         <location filename="../../Bookmark/BookmarkDatabase.cpp" line="126"/>
-        <source>Bookmark</source>
+        <source>Bookmarks</source>
         <translation>書簽</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
     </message>
     <message>
         <location filename="../../Bookmark/BookmarkDatabase.cpp" line="128"/>
-        <source>Favorite</source>
+        <source>Favorites</source>
         <translation>收藏夾</translation>
     </message>
     <message>

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ void CFrmAddBookmark::on_pbAdd_clicked()`
`82`	`82`	`item.title = ui->leTitle->text();`
`83`	`83`	`item.url = m_Url.toString();`
`84`	`84`	`item.folderId = id;`
	`85`	`+ item.createdTime = QDateTime::currentDateTime();`
	`86`	`+ item.lastVisitTime = item.createdTime;`
	`87`	`+ item.modifiedTime = item.createdTime;`
`85`	`88`	`m_pDatabase->addBookmark(item);`
`86`	`89`	`}`
`87`	`90`	`}`