FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-01 11:36:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix recursion bug in opml normalizer.

Browse Source
This commit is contained in:
Maurice Parker 2020-04-13 07:11:03 -05:00
parent 2ddc064696
commit 2ae511b818
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Frameworks/Account/OPMLNormalizer.swift
View File

@ -23,6 +23,7 @@ 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)
@ -39,6 +40,13 @@ final class OPMLNormalizer {
} }
feedsToAdd.append(item) feedsToAdd.append(item)
if let itemChildren = item.children {
if let parentFolder = parentFolder {
normalize(itemChildren, parentFolder: parentFolder)
} else {
normalize(itemChildren, parentFolder: item)
}
}
} }
if let parentFolder = parentFolder { if let parentFolder = parentFolder {