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

Fix crashing bug caused by nesting update statements.

This commit is contained in:
Maurice Parker 2019-05-21 17:59:33 -05:00
parent be81fdae0a
commit d289bbea94
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@ -187,10 +187,10 @@ final class ArticlesTable: DatabaseTable {
func ensureStatuses(_ articleIDs: Set<String>, _ statusKey: ArticleStatus.Key, _ flag: Bool) { func ensureStatuses(_ articleIDs: Set<String>, _ statusKey: ArticleStatus.Key, _ flag: Bool) {
self.queue.update { (database) in self.queue.updateSync { (database) in
let statusesDictionary = self.statusesTable.ensureStatusesForArticleIDs(articleIDs, false, database) let statusesDictionary = self.statusesTable.ensureStatusesForArticleIDs(articleIDs, false, database)
let statuses = Set(statusesDictionary.values) let statuses = Set(statusesDictionary.values)
_ = self.statusesTable.mark(statuses, statusKey, flag) _ = self.statusesTable.mark(statuses, statusKey, flag, database)
} }
} }
@ -312,8 +312,11 @@ final class ArticlesTable: DatabaseTable {
} }
func mark(_ articles: Set<Article>, _ statusKey: ArticleStatus.Key, _ flag: Bool) -> Set<ArticleStatus>? { func mark(_ articles: Set<Article>, _ statusKey: ArticleStatus.Key, _ flag: Bool) -> Set<ArticleStatus>? {
var statuses: Set<ArticleStatus>?
return statusesTable.mark(articles.statuses(), statusKey, flag) self.queue.updateSync { (database) in
statuses = self.statusesTable.mark(articles.statuses(), statusKey, flag, database)
}
return statuses
} }
// MARK: Indexing // MARK: Indexing

7
Frameworks/ArticlesDatabase/StatusesTable.swift
View File

@ -50,7 +50,7 @@ final class StatusesTable: DatabaseTable {
// MARK: Marking // MARK: Marking
func mark(_ statuses: Set<ArticleStatus>, _ statusKey: ArticleStatus.Key, _ flag: Bool) -> Set<ArticleStatus>? { func mark(_ statuses: Set<ArticleStatus>, _ statusKey: ArticleStatus.Key, _ flag: Bool, _ database: FMDatabase) -> Set<ArticleStatus>? {
// Sets flag in both memory and in database. // Sets flag in both memory and in database.
@ -70,9 +70,8 @@ final class StatusesTable: DatabaseTable {
} }
let articleIDs = updatedStatuses.articleIDs() let articleIDs = updatedStatuses.articleIDs()
queue.updateSync { (database) in self.markArticleIDs(articleIDs, statusKey, flag, database)
self.markArticleIDs(articleIDs, statusKey, flag, database)
}
return updatedStatuses return updatedStatuses
} }