FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate folder relationships caused by OPMLNormalizer

Browse Source
This commit is contained in:
Maurice Parker 2020-04-12 18:29:34 -05:00
parent b38f720a62
commit 6bd2c0dc06
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -202,22 +202,7 @@ final class CloudKitAccountDelegate: AccountDelegate {
let normalizedItems = OPMLNormalizer.normalize(opmlItems) let normalizedItems = OPMLNormalizer.normalize(opmlItems)
// Combine all existing web feed URLs with all the new ones // TODO: remove duplicates created by import
var webFeedURLs = account.flattenedWebFeedURLs
for opmlItem in normalizedItems {
if let webFeedURL = opmlItem.feedSpecifier?.feedURL {
webFeedURLs.insert(webFeedURL)
} else {
if let childItems = opmlItem.children {
for childItem in childItems {
if let webFeedURL = childItem.feedSpecifier?.feedURL {
webFeedURLs.insert(webFeedURL)
}
}
}
}
}
self.accountZone.importOPML(rootExternalID: rootExternalID, items: normalizedItems) { _ in self.accountZone.importOPML(rootExternalID: rootExternalID, items: normalizedItems) { _ in
self.refreshAll(for: account, downloadFeeds: false, completion: completion) self.refreshAll(for: account, downloadFeeds: false, completion: completion)

12
Frameworks/Account/OPMLNormalizer.swift
View File

@ -23,9 +23,8 @@ final class OPMLNormalizer {
var feedsToAdd = [RSOPMLItem]() var feedsToAdd = [RSOPMLItem]()
items.forEach { (item) in items.forEach { (item) in
if let _ = item.feedSpecifier { if let _ = item.feedSpecifier {
if !feedsToAdd.contains(where: { $0.feedSpecifier?.feedURL == item.feedSpecifier?.feedURL } ) { if !feedsToAdd.contains(where: { $0.feedSpecifier?.feedURL == item.feedSpecifier?.feedURL }) {
feedsToAdd.append(item) feedsToAdd.append(item)
} }
return return
@ -39,15 +38,14 @@ final class OPMLNormalizer {
return return
} }
normalizedOPMLItems.append(item) feedsToAdd.append(item)
if let itemChildren = item.children {
normalize(itemChildren, parentFolder: item)
}
} }
if let parentFolder = parentFolder { if let parentFolder = parentFolder {
for feed in feedsToAdd { for feed in feedsToAdd {
parentFolder.addChild(feed) if !(parentFolder.children?.contains(where: { $0.feedSpecifier?.feedURL == feed.feedSpecifier?.feedURL}) ?? false) {
parentFolder.addChild(feed)
}
} }
} else { } else {
for feed in feedsToAdd { for feed in feedsToAdd {