FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-20 21:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix parts of ReaderAPI implementation that I broke with an API change in Account.

Browse Source
This commit is contained in:
Brent Simmons 2019-09-08 21:52:02 -07:00
parent 2eccfbb90e
commit 03bf97df90
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
View File

@ -549,7 +549,7 @@ private extension ReaderAPIAccountDelegate {
subscriptions.forEach { subscription in subscriptions.forEach { subscription in
let subFeedId = String(subscription.feedID) let subFeedId = String(subscription.feedID)
if let feed = account.idToFeedDictionary[subFeedId] { if let feed = account.existingFeed(withFeedID: subFeedId) {
feed.name = subscription.name feed.name = subscription.name
feed.homePageURL = subscription.homePageURL feed.homePageURL = subscription.homePageURL
} else { } else {
@ -619,8 +619,7 @@ private extension ReaderAPIAccountDelegate {
for subscription in groupedTaggings { for subscription in groupedTaggings {
let taggingFeedID = String(subscription.feedID) let taggingFeedID = String(subscription.feedID)
if !folderFeedIds.contains(taggingFeedID) { if !folderFeedIds.contains(taggingFeedID) {
let idDictionary = account.idToFeedDictionary guard let feed = account.existingFeed(withFeedID: taggingFeedID) else {
guard let feed = idDictionary[taggingFeedID] else {
continue continue
} }
saveFolderRelationship(for: feed, withFolderName: folderName, id: String(subscription.feedID)) saveFolderRelationship(for: feed, withFolderName: folderName, id: String(subscription.feedID))
@ -880,7 +879,7 @@ private extension ReaderAPIAccountDelegate {
group.enter() group.enter()
if let feed = account.idToFeedDictionary[feedID] { if let feed = account.existingFeed(withFeedID: feedID) {
DispatchQueue.main.async { DispatchQueue.main.async {
account.update(feed, parsedItems: Set(mapItems), defaultRead: true) { account.update(feed, parsedItems: Set(mapItems), defaultRead: true) {
group.leave() group.leave()