Implement HTML bookmark import for QtWebEngine

Author: fnkkio

src/modules/importers/html/HtmlBookmarksImporter.cpp

@@ -29,6 +29,8 @@
 #include <QtWebKitWidgets/QWebPage>
 #include <QtWebKitWidgets/QWebFrame>
 #include <QtWebKit/QWebElementCollection>
+#elif defined(OTTER_ENABLE_QTWEBENGINE)
+#include <QtWebEngineWidgets/QWebEnginePage>
 #endif
 
 namespace Otter
@@ -226,6 +228,33 @@ QDateTime HtmlBookmarksImporter::getDateTime(const QWebElement &element, const Q
 	return ((seconds != 0) ? QDateTime::fromSecsSinceEpoch(seconds) : QDateTime());
 #endif
 }
+#elif defined(OTTER_ENABLE_QTWEBENGINE)
+QDateTime HtmlBookmarksImporter::getDateTime(const QVariant &attribute)
+{
+#if QT_VERSION < 0x050800
+	const uint seconds(attribute.toUInt());
+
+	return ((seconds > 0) ? QDateTime::fromTime_t(seconds) : QDateTime());
+#else
+	const qint64 seconds(attribute.toLongLong());
+
+	return ((seconds != 0) ? QDateTime::fromSecsSinceEpoch(seconds) : QDateTime());
+#endif
+}
+
+QVariant HtmlBookmarksImporter::execJavascript(QWebEnginePage &page, const QString &script)
+{
+	QVariant jsResult;
+	QEventLoop loop;
+
+	page.runJavaScript(script, [&loop, &jsResult](const QVariant &result) {
+		jsResult = result;
+		loop.exit(0);
+	});
+	loop.exec();
+
+	return jsResult;
+}
 #endif
 
 QStringList HtmlBookmarksImporter::getFileFilters() const
@@ -235,7 +264,7 @@ QStringList HtmlBookmarksImporter::getFileFilters() const
 
 bool HtmlBookmarksImporter::import(const QString &path)
 {
-#ifdef OTTER_ENABLE_QTWEBKIT
+#if defined(OTTER_ENABLE_QTWEBKIT) || defined(OTTER_ENABLE_QTWEBENGINE)
 	QFile file(getSuggestedPath(path));
 
 	if (!file.open(QIODevice::ReadOnly))
@@ -262,7 +291,10 @@ bool HtmlBookmarksImporter::import(const QString &path)
 			setImportFolder(m_optionsWidget->getTargetFolder());
 		}
 	}
+#endif
+
 
+#ifdef OTTER_ENABLE_QTWEBKIT
 	QWebPage page;
 	page.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
 	page.mainFrame()->setHtml(QString::fromLatin1(file.readAll()));
@@ -282,11 +314,133 @@ bool HtmlBookmarksImporter::import(const QString &path)
 	file.close();
 
 	return true;
+#elif defined(OTTER_ENABLE_QTWEBENGINE)
+
+	QEventLoop loop;
+	QWebEnginePage page;
+
+	connect(&page, &QWebEnginePage::loadFinished,
+			[this, &page, &loop](bool ok) {
+
+		if (!ok)
+		{
+			m_totalAmount = 0;
+			loop.exit();
+			return;
+		}
+
+		QVariant jsResult;
+
+		jsResult = execJavascript(page, "document.getElementsByTagName('DT').length");
+		m_totalAmount = jsResult.toInt(&ok);
+		if (!ok)
+		{
+			m_totalAmount = 0;
+			loop.exit();
+			return;
+		}
+
+		emit importStarted(BookmarksImport, m_totalAmount);
+
+		jsResult = execJavascript(page, "document.getElementsByTagName('a').length");
+		const int numLinks = jsResult.toInt(&ok);
+
+		BookmarksManager::getModel()->beginImport(getImportFolder(),
+												  numLinks,
+												  numLinks);
+
+		jsResult = execJavascript(page, "var nodes=[];document.querySelectorAll('h3,a,hr').forEach(function(node){if(node.tagName.toUpperCase()=='A'){nodes.push({'type':'anchor','title':node.innerHTML,'url':node.getAttribute('href'),'add_date':node.getAttribute('add_date'),'last_modified':node.getAttribute('last_modified')})}else if(node.tagName.toUpperCase()=='HR'){nodes.push({'type':'separator'})}else if(node.tagName.toUpperCase()=='H3'){sibling=node.parentNode.querySelector('dl');numChildren=sibling.querySelectorAll(':scope > dt').length;nodes.push({'type':'folder','title':node.innerHTML,'numChildren':numChildren,'add_date':node.getAttribute('add_date'),'last_modified':node.getAttribute('last_modified')})}});nodes");
+		QList<QVariant> items = jsResult.toList();
+
+		processBookmarkItems(items, getImportFolder(), -1);
+		BookmarksManager::getModel()->endImport();
+
+		loop.exit();
+	});
+
+	page.setHtml(QString::fromLatin1(file.readAll()));
+	loop.exec();
+
+	emit importFinished(BookmarksImport, SuccessfullImport, m_totalAmount);
+
+	file.close();
+
+	return true;
+
 #else
 	Q_UNUSED(path)
 
+	emit importFinished(BookmarksImport, FailedImport, 0);
+
 	return false;
 #endif
 }
 
+#ifdef OTTER_ENABLE_QTWEBENGINE
+void HtmlBookmarksImporter::processBookmarkItems(QList<QVariant> &items, BookmarksModel::Bookmark *importFolder, int numChildren)
+{
+	while (numChildren != 0 && m_currentAmount < m_totalAmount)
+	{
+		const QVariant &item = items.at(m_currentAmount++);
+		-- numChildren;
+
+		const QMap<QString, QVariant> itemMap = item.toMap();
+		const QString typeString = itemMap["type"].toString();
+		const QString title = itemMap["title"].toString();
+
+		BookmarksModel::BookmarkType type(BookmarksModel::UnknownBookmark);
+		QMap<int, QVariant> metaData({{BookmarksModel::TitleRole, title}});
+
+		if (typeString == "folder" || typeString == "anchor")
+		{
+			const QDateTime addDate(getDateTime(itemMap["add_date"]));
+			const QDateTime lastModified(getDateTime(itemMap["last_modified"]));
+
+			if (addDate.isValid())
+			{
+				metaData[BookmarksModel::TimeAddedRole] = addDate;
+			}
+
+			if (lastModified.isValid())
+			{
+				metaData[BookmarksModel::TimeAddedRole] = lastModified;
+			}
+		}
+
+		if (typeString == "folder")
+		{
+			processBookmarkItems(items,
+								 BookmarksManager::addBookmark(BookmarksModel::FolderBookmark, metaData, importFolder),
+								 itemMap["numChildren"].toInt());
+		}
+		else
+		{
+			if (typeString == "anchor")
+			{
+				type = BookmarksModel::UrlBookmark;
+				const QString url = itemMap["url"].toString();
+
+				if (!areDuplicatesAllowed() && BookmarksManager::hasBookmark(url))
+				{
+					continue;
+				}
+
+				metaData[BookmarksModel::UrlRole] = url;
+			}
+			else if (typeString == "separator")
+			{
+				type = BookmarksModel::SeparatorBookmark;
+			}
+
+			if (type != BookmarksModel::UnknownBookmark)
+			{
+				BookmarksManager::addBookmark(type, metaData, importFolder);
+			}
+		}
+
+		emit importProgress(BookmarksImport, m_totalAmount, m_currentAmount);
+	}
+}
+#endif
+
 }

src/modules/importers/html/HtmlBookmarksImporter.h

@@ -25,6 +25,8 @@
 
 #ifdef OTTER_ENABLE_QTWEBKIT
 #include <QtWebKit/QWebElement>
+#elif defined(OTTER_ENABLE_QTWEBENGINE)
+#include <QtWebEngineWidgets/QWebEnginePage>
 #endif
 
 namespace Otter
@@ -52,10 +54,15 @@ class HtmlBookmarksImporter final : public BookmarksImporter
 public slots:
 	bool import(const QString &path) override;
 
+protected:
 #ifdef OTTER_ENABLE_QTWEBKIT
 protected:
 	void processElement(const QWebElement &element);
 	static QDateTime getDateTime(const QWebElement &element, const QString &attribute);
+#elif defined(OTTER_ENABLE_QTWEBENGINE)
+	void processBookmarkItems(QList<QVariant> &items, BookmarksModel::Bookmark *importFolder, int numChildren);
+	static QDateTime getDateTime(const QVariant &attribute);
+	QVariant execJavascript(QWebEnginePage &page, const QString &script);
 #endif
 
 private: