FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fetch zone changes immediately after making them to keep us better in sync

This commit is contained in:
Maurice Parker 2020-04-26 06:03:07 -05:00
parent 4f54a21084
commit e4f0a87a64
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,8 +632,10 @@ private extension CloudKitAccountDelegate {
self.articlesZone.deleteArticles(deletedArticles) { _ in self.articlesZone.deleteArticles(deletedArticles) { _ in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in
self.refreshProgress.completeTask() self.articlesZone.fetchChangesInZone() { _ in
completion() self.refreshProgress.completeTask()
completion()
}
} }
} }
@ -684,8 +686,10 @@ private extension CloudKitAccountDelegate {
self.articlesZone.deleteArticles(deletedArticles) { _ in self.articlesZone.deleteArticles(deletedArticles) { _ in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in
self.refreshProgress.clear() self.articlesZone.fetchChangesInZone() { _ in
completion(.success(feed)) self.refreshProgress.clear()
completion(.success(feed))
}
} }
} }
@ -765,8 +769,10 @@ private extension CloudKitAccountDelegate {
self.articlesZone.deleteArticles(deletedArticles) { _ in self.articlesZone.deleteArticles(deletedArticles) { _ in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in self.articlesZone.saveNewArticles(newAndUpdatedArticles) { _ in
self.refreshProgress.clear() self.articlesZone.fetchChangesInZone() { _ in
completion(.success(feed)) self.refreshProgress.clear()
completion(.success(feed))
}
} }
} }

12
Frameworks/Account/CloudKit/CloudKitAccountZoneDelegate.swift
View File

@ -222,8 +222,10 @@ private extension CloudKitAcountZoneDelegate {
self.articlesZone?.deleteArticles(deletedArticles) { _ in self.articlesZone?.deleteArticles(deletedArticles) { _ in
self.refreshProgress?.completeTask() self.refreshProgress?.completeTask()
self.articlesZone?.saveNewArticles(newAndUpdatedArticles) { _ in self.articlesZone?.saveNewArticles(newAndUpdatedArticles) { _ in
self.refreshProgress?.completeTask() self.articlesZone?.fetchChangesInZone() { _ in
completion(webFeed) self.refreshProgress?.completeTask()
completion(webFeed)
}
} }
} }
@ -265,8 +267,10 @@ private extension CloudKitAcountZoneDelegate {
self.articlesZone?.deleteArticles(deletedArticles) { _ in self.articlesZone?.deleteArticles(deletedArticles) { _ in
self.refreshProgress?.completeTask() self.refreshProgress?.completeTask()
self.articlesZone?.saveNewArticles(newAndUpdatedArticles) { _ in self.articlesZone?.saveNewArticles(newAndUpdatedArticles) { _ in
self.refreshProgress?.completeTask() self.articlesZone?.fetchChangesInZone() { _ in
completion(webFeed) self.refreshProgress?.completeTask()
completion(webFeed)
}
} }
} }
case .failure: case .failure: