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

Made sync status sequential so that we stop losing statuses when we automatically send them on exceeding 100 statuses

Browse Source
This commit is contained in:
Maurice Parker 2020-04-29 16:14:18 -05:00
parent d30987ca0a
commit 0b49acfabc
8 changed files with 41 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,9 @@ final class CloudKitAccountDelegate: AccountDelegate {
let syncStatuses = articles.map { article in
return SyncStatus(articleID: article.articleID, key: SyncStatus.Key(statusKey), flag: flag)
}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
let articles = try? account.update(articles, statusKey: statusKey, flag: flag)
database.selectPendingCount { result in
if let count = try? result.get(), count > 100 {
@ -473,7 +475,7 @@ final class CloudKitAccountDelegate: AccountDelegate {
}
}
return try? account.update(articles, statusKey: statusKey, flag: flag)
return articles
}
func accountDidInitialize(_ account: Account) {
@ -636,10 +638,9 @@ private extension CloudKitAccountDelegate {
account.update(webFeed.webFeedID, with: parsedItems) { result in
switch result {
case .success(let articleChanges):
self.storeArticleChanges(new: articleChanges.newArticles, updated: articleChanges.updatedArticles, deleted: articleChanges.deletedArticles) {
self.refreshProgress.completeTask()
group.leave()
}
self.storeArticleChanges(new: articleChanges.newArticles, updated: articleChanges.updatedArticles, deleted: articleChanges.deletedArticles)
self.refreshProgress.completeTask()
group.leave()
case .failure(let error):
os_log(.error, log: self.log, "CloudKit Feed refresh update error: %@.", error.localizedDescription)
self.refreshProgress.completeTask()
@ -661,9 +662,8 @@ private extension CloudKitAccountDelegate {
group.enter()
refresher.refreshFeeds(refresherWebFeeds) { refresherNewArticles, refresherUpdatedArticles, refresherDeletedArticles in
self.storeArticleChanges(new: refresherNewArticles, updated: refresherUpdatedArticles, deleted: refresherDeletedArticles) {
group.leave()
}
self.storeArticleChanges(new: refresherNewArticles, updated: refresherUpdatedArticles, deleted: refresherDeletedArticles)
group.leave()
}
group.notify(queue: DispatchQueue.main) {
@ -811,18 +811,17 @@ private extension CloudKitAccountDelegate {
account.fetchArticlesAsync(.webFeed(feed)) { result in
switch result {
case .success(let articles):
self.storeArticleChanges(new: articles, updated: Set<Article>(), deleted: Set<Article>()) {
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
self.articlesZone.fetchChangesInZone() { _ in
self.refreshProgress.clear()
completion(.success(feed))
}
case .failure(let error):
self.storeArticleChanges(new: articles, updated: Set<Article>(), deleted: Set<Article>())
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
self.articlesZone.fetchChangesInZone() { _ in
self.refreshProgress.clear()
completion(.failure(error))
completion(.success(feed))
}
case .failure(let error):
self.refreshProgress.clear()
completion(.failure(error))
}
}
case .failure(let error):
@ -841,40 +840,20 @@ private extension CloudKitAccountDelegate {
}
}
func storeArticleChanges(new: Set<Article>?, updated: Set<Article>?, deleted: Set<Article>?, completion: @escaping () -> Void) {
let group = DispatchGroup()
group.enter()
insertSyncStatuses(articles: new, statusKey: .new, flag: true) {
group.leave()
}
group.enter()
insertSyncStatuses(articles: updated, statusKey: .new, flag: false) {
group.leave()
}
group.enter()
insertSyncStatuses(articles: deleted, statusKey: .deleted, flag: true) {
group.leave()
}
group.notify(queue: DispatchQueue.main) {
completion()
}
func storeArticleChanges(new: Set<Article>?, updated: Set<Article>?, deleted: Set<Article>?) {
insertSyncStatuses(articles: new, statusKey: .new, flag: true)
insertSyncStatuses(articles: updated, statusKey: .new, flag: false)
insertSyncStatuses(articles: deleted, statusKey: .deleted, flag: true)
}
func insertSyncStatuses(articles: Set<Article>?, statusKey: SyncStatus.Key, flag: Bool, completion: @escaping () -> Void) {
func insertSyncStatuses(articles: Set<Article>?, statusKey: SyncStatus.Key, flag: Bool) {
guard let articles = articles else {
completion()
return
}
let syncStatuses = articles.map { article in
return SyncStatus(articleID: article.articleID, key: statusKey, flag: flag)
}
database.insertStatuses(syncStatuses) { _ in
completion()
}
try? database.insertStatuses(syncStatuses)
}
}

2
Frameworks/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
View File

@ -437,7 +437,7 @@ final class FeedWranglerAccountDelegate: AccountDelegate {
func markArticles(for account: Account, articles: Set<Article>, statusKey: ArticleStatus.Key, flag: Bool) -> Set<Article>? {
let syncStatuses = articles.map { SyncStatus(articleID: $0.articleID, key: SyncStatus.Key(statusKey), flag: flag)}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
database.selectPendingCount { result in
if let count = try? result.get(), count > 0 {

2
Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -539,7 +539,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
let syncStatuses = articles.map { article in
return SyncStatus(articleID: article.articleID, key: SyncStatus.Key(statusKey), flag: flag)
}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
database.selectPendingCount { result in
if let count = try? result.get(), count > 100 {

2
Frameworks/Account/Feedly/FeedlyAccountDelegate.swift
View File

@ -492,7 +492,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
return SyncStatus(articleID: article.articleID, key: SyncStatus.Key(statusKey), flag: flag)
}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
os_log(.debug, log: log, "Marking %@ as %@.", articles.map { $0.title }, syncStatuses)
database.selectPendingCount { result in

2
Frameworks/Account/NewsBlur/NewsBlurAccountDelegate.swift
View File

@ -577,7 +577,7 @@ final class NewsBlurAccountDelegate: AccountDelegate {
let syncStatuses = articles.map { article in
return SyncStatus(articleID: article.articleID, key: SyncStatus.Key(statusKey), flag: flag)
}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
database.selectPendingCount { result in
if let count = try? result.get(), count > 100 {

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

@ -414,7 +414,7 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
let syncStatuses = articles.map { article in
return SyncStatus(articleID: article.articleID, key: SyncStatus.Key(statusKey), flag: flag)
}
database.insertStatuses(syncStatuses)
try? database.insertStatuses(syncStatuses)
database.selectPendingCount { result in
if let count = try? result.get(), count > 100 {

4
Frameworks/SyncDatabase/SyncDatabase.swift
View File

@ -32,8 +32,8 @@ public struct SyncDatabase {
// MARK: - API
public func insertStatuses(_ statuses: [SyncStatus], completion: DatabaseCompletionBlock? = nil) {
syncStatusTable.insertStatuses(statuses, completion: completion)
public func insertStatuses(_ statuses: [SyncStatus]) throws {
try syncStatusTable.insertStatuses(statuses)
}
public func selectForProcessing(completion: @escaping SyncStatusesCompletionBlock) {

21
Frameworks/SyncDatabase/SyncStatusTable.swift
View File

@ -149,22 +149,21 @@ struct SyncStatusTable: DatabaseTable {
}
}
func insertStatuses(_ statuses: [SyncStatus], completion: DatabaseCompletionBlock? = nil) {
queue.runInTransaction { databaseResult in
func makeDatabaseCall(_ database: FMDatabase) {
let statusArray = statuses.map { $0.databaseDictionary() }
self.insertRows(statusArray, insertType: .orReplace, in: database)
}
func insertStatuses(_ statuses: [SyncStatus]) throws {
var error: DatabaseError?
queue.runInTransactionSync { databaseResult in
switch databaseResult {
case .success(let database):
makeDatabaseCall(database)
callCompletion(completion, nil)
let statusArray = statuses.map { $0.databaseDictionary() }
self.insertRows(statusArray, insertType: .orReplace, in: database)
case .failure(let databaseError):
callCompletion(completion, databaseError)
error = databaseError
}
}
if let error = error {
throw error
}
}
}