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

Merge branch 'mac-candidate'

This commit is contained in:
Brent Simmons 2019-07-08 21:13:00 -07:00
parent 6d9bf46afb 33ff7c94c3
commit 3c4379dfeb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@ -271,13 +271,11 @@ 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, database) self.statusesTable.mark(statuses, statusKey, flag, database)
} }
} }
// MARK: Unread Counts // MARK: Unread Counts

1
Frameworks/ArticlesDatabase/StatusesTable.swift
View File

@ -50,6 +50,7 @@ final class StatusesTable: DatabaseTable {
// MARK: Marking // MARK: Marking
@discardableResult
func mark(_ statuses: Set<ArticleStatus>, _ statusKey: ArticleStatus.Key, _ flag: Bool, _ database: FMDatabase) -> 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.