Fix lint issues.

This commit is contained in:
Brent Simmons
2025-01-22 22:13:20 -08:00
parent d210692d7d
commit 72a5e46dcc
115 changed files with 584 additions and 711 deletions

View File

@@ -9,13 +9,13 @@
import Foundation
struct DatabaseTableName {
static let syncStatus = "syncStatus"
}
struct DatabaseKey {
// Sync Status
static let articleID = "articleID"
static let key = "key"

View File

@@ -11,13 +11,13 @@ import Articles
import RSDatabase
public struct SyncStatus: Hashable, Equatable {
public enum Key: String {
case read = "read"
case starred = "starred"
case deleted = "deleted"
case new = "new"
public init(_ articleStatusKey: ArticleStatus.Key) {
switch articleStatusKey {
case .read:
@@ -26,23 +26,23 @@ public struct SyncStatus: Hashable, Equatable {
self = Self.starred
}
}
}
public let articleID: String
public let key: SyncStatus.Key
public let flag: Bool
public let selected: Bool
public init(articleID: String, key: SyncStatus.Key, flag: Bool, selected: Bool = false) {
self.articleID = articleID
self.key = key
self.flag = flag
self.selected = selected
}
public func databaseDictionary() -> DatabaseDictionary {
return [DatabaseKey.articleID: articleID, DatabaseKey.key: key.rawValue, DatabaseKey.flag: flag, DatabaseKey.selected: selected]
}
}

View File

@@ -49,14 +49,13 @@ struct SyncStatusTable: DatabaseTable {
DispatchQueue.main.async {
if let error = error {
completion(.failure(error))
}
else {
} else {
completion(.success(Array(statuses)))
}
}
}
}
func selectPendingCount(_ completion: @escaping DatabaseIntCompletionBlock) {
queue.runInDatabase { databaseResult in
var count: Int = 0
@@ -79,8 +78,7 @@ struct SyncStatusTable: DatabaseTable {
DispatchQueue.main.async {
if let error = error {
completion(.failure(error))
}
else {
} else {
completion(.success(count))
}
}
@@ -90,11 +88,11 @@ struct SyncStatusTable: DatabaseTable {
func selectPendingReadStatusArticleIDs(completion: @escaping SyncStatusArticleIDsCompletionBlock) {
selectPendingArticleIDsAsync(.read, completion)
}
func selectPendingStarredStatusArticleIDs(completion: @escaping SyncStatusArticleIDsCompletionBlock) {
selectPendingArticleIDsAsync(.starred, completion)
}
func resetAllSelectedForProcessing(completion: DatabaseCompletionBlock? = nil) {
queue.runInTransaction { databaseResult in
@@ -118,7 +116,7 @@ struct SyncStatusTable: DatabaseTable {
callCompletion(completion, nil)
return
}
queue.runInTransaction { databaseResult in
func makeDatabaseCall(_ database: FMDatabase) {
@@ -137,13 +135,13 @@ struct SyncStatusTable: DatabaseTable {
}
}
}
func deleteSelectedForProcessing(_ articleIDs: [String], completion: DatabaseCompletionBlock? = nil) {
guard !articleIDs.isEmpty else {
callCompletion(completion, nil)
return
}
queue.runInTransaction { databaseResult in
func makeDatabaseCall(_ database: FMDatabase) {
@@ -162,7 +160,7 @@ struct SyncStatusTable: DatabaseTable {
}
}
}
func insertStatuses(_ statuses: [SyncStatus], completion: @escaping DatabaseCompletionBlock) {
queue.runInTransaction { databaseResult in
@@ -180,7 +178,7 @@ struct SyncStatusTable: DatabaseTable {
}
}
}
}
private extension SyncStatusTable {
@@ -191,13 +189,13 @@ private extension SyncStatusTable {
let key = SyncStatus.Key(rawValue: rawKey) else {
return nil
}
let flag = row.bool(forColumn: DatabaseKey.flag)
let selected = row.bool(forColumn: DatabaseKey.selected)
return SyncStatus(articleID: articleID, key: key, flag: flag, selected: selected)
}
func selectPendingArticleIDsAsync(_ statusKey: ArticleStatus.Key, _ completion: @escaping SyncStatusArticleIDsCompletionBlock) {
queue.runInDatabase { databaseResult in
@@ -212,7 +210,7 @@ private extension SyncStatusTable {
return
}
let articleIDs = resultSet.mapToSet{ $0.string(forColumnIndex: 0) }
let articleIDs = resultSet.mapToSet { $0.string(forColumnIndex: 0) }
DispatchQueue.main.async {
completion(.success(articleIDs))
}
@@ -228,7 +226,7 @@ private extension SyncStatusTable {
}
}
}
}
private func callCompletion(_ completion: DatabaseCompletionBlock?, _ databaseError: DatabaseError?) {