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

Move account to feed sync outside of folder to feed sync since it was stripping feeds before they had a chance to get used.

Browse Source
This commit is contained in:
Maurice Parker 2020-12-09 16:27:52 -06:00
parent f06d4f7ef9
commit 08e772cbd1
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
View File

@ -146,16 +146,11 @@ extension NewsBlurAccountDelegate {
// Sync the folders // Sync the folders
for (folderName, folderRelationships) in newsBlurFolderDict { for (folderName, folderRelationships) in newsBlurFolderDict {
let newsBlurFolderFeedIDs = folderRelationships.map { String($0.feedID) } guard folderName != " " else {
continue
}
// Handle account-level folder let newsBlurFolderFeedIDs = folderRelationships.map { String($0.feedID) }
if folderName == " " {
for feed in account.topLevelWebFeeds {
if !newsBlurFolderFeedIDs.contains(feed.webFeedID) {
account.removeWebFeed(feed)
}
}
}
guard let folder = folderDict[folderName] else { return } guard let folder = folderDict[folderName] else { return }
@ -182,6 +177,17 @@ extension NewsBlurAccountDelegate {
} }
} }
} }
// Handle the account level feeds
if let folderRelationships = newsBlurFolderDict[" "] {
let newsBlurFolderFeedIDs = folderRelationships.map { String($0.feedID) }
for feed in account.topLevelWebFeeds {
if !newsBlurFolderFeedIDs.contains(feed.webFeedID) {
account.removeWebFeed(feed)
}
}
}
} }
func clearFolderRelationship(for feed: WebFeed, withFolderName folderName: String) { func clearFolderRelationship(for feed: WebFeed, withFolderName folderName: String) {