renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent calls to database while it is suspended. Issue #1424

Browse Source
This commit is contained in:
Maurice Parker
2019-12-09 14:06:03 -07:00
parent 6ef7f296ef
commit 5872893293
3 changed files with 73 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Frameworks/SyncDatabase/SyncStatusTable.swift
View File

@@ -23,6 +23,10 @@ struct SyncStatusTable: DatabaseTable {
func selectForProcessing() -> [SyncStatus] {
var statuses: Set<SyncStatus>? = nil
guard !queue.isSuspended else {
return [SyncStatus]()
}
queue.runInDatabaseSync { database in
let updateSQL = "update syncStatus set selected = true"
database.executeUpdate(updateSQL, withArgumentsIn: nil)
@@ -39,6 +43,10 @@ struct SyncStatusTable: DatabaseTable {
func selectPendingCount() -> Int {
var count: Int = 0
guard !queue.isSuspended else {
return count
}
queue.runInDatabaseSync { database in
let sql = "select count(*) from syncStatus"
if let resultSet = database.executeQuery(sql, withArgumentsIn: nil) {
@@ -50,6 +58,12 @@ struct SyncStatusTable: DatabaseTable {
}
func resetSelectedForProcessing(_ articleIDs: [String], completionHandler: VoidCompletionBlock? = nil) {
guard !queue.isSuspended else {
if let handler = completionHandler {
callVoidCompletionBlock(handler)
}
return
}
queue.runInTransaction { database in
let parameters = articleIDs.map { $0 as AnyObject }
let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(articleIDs.count))!
@@ -62,6 +76,12 @@ struct SyncStatusTable: DatabaseTable {
}
func deleteSelectedForProcessing(_ articleIDs: [String], completionHandler: VoidCompletionBlock? = nil) {
guard !queue.isSuspended else {
if let handler = completionHandler {
callVoidCompletionBlock(handler)
}
return
}
queue.runInTransaction { database in
let parameters = articleIDs.map { $0 as AnyObject }
let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(articleIDs.count))!
@@ -74,6 +94,12 @@ struct SyncStatusTable: DatabaseTable {
}
func insertStatuses(_ statuses: [SyncStatus], completionHandler: VoidCompletionBlock? = nil) {
guard !queue.isSuspended else {
if let handler = completionHandler {
callVoidCompletionBlock(handler)
}
return
}
queue.runInTransaction { database in
let statusArray = statuses.map { $0.databaseDictionary() }
self.insertRows(statusArray, insertType: .orReplace, in: database)