Skip to content

Commit e090104

Browse files
committed
Added feed import to QtWebEngine HTML bookmark import
1 parent b47af8f commit e090104

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/modules/backends/web/qtwebengine/QtWebEngineWebBackend.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ void QtWebEngineBookmarksImportJob::addBookmark(QVariant itemVariant)
507507
BookmarksModel::BookmarkType type(BookmarksModel::UnknownBookmark);
508508
QMap<int, QVariant> metaData({{BookmarksModel::TitleRole, title}});
509509

510-
if (typeString == "anchor")
510+
if (typeString == "anchor" || typeString == "feed")
511511
{
512512
const QDateTime dateAdded(getDateTime(itemMap["dateAdded"]));
513513
const QDateTime dateModified(getDateTime(itemMap["dateModified"]));
@@ -522,7 +522,8 @@ void QtWebEngineBookmarksImportJob::addBookmark(QVariant itemVariant)
522522
metaData[BookmarksModel::TimeAddedRole] = dateModified;
523523
}
524524

525-
type = BookmarksModel::UrlBookmark;
525+
type = (typeString == "anchor" ? BookmarksModel::UrlBookmark : BookmarksModel::FeedBookmark);
526+
526527
const QString url = itemMap["url"].toString();
527528

528529
if (!areDuplicatesAllowed() && BookmarksManager::hasBookmark(url))

src/modules/backends/web/qtwebengine/resources/importBookmarks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function processBookmarkItems(items) {
1717
else
1818
{
1919
importBookmarksObj.addBookmark({
20-
'type': 'anchor',
20+
'type': (node.hasAttribute('FEEDURL') ? 'feed' : 'anchor'),
2121
'title': node.innerHTML,
2222
'url': node.getAttribute('href'),
2323
'dateAdded': node.getAttribute('add_date'),

0 commit comments

Comments
 (0)