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

Fix Lint issues.

Browse Source
This commit is contained in:
Brent Simmons 2025-01-22 22:06:36 -08:00
parent cbea8acd9a
commit aea89148ff
8 changed files with 91 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/RSDatabase/Package.swift
View File

@ -13,7 +13,7 @@ let package = Package(
.library( .library(
name: "RSDatabaseObjC", name: "RSDatabaseObjC",
type: .dynamic, type: .dynamic,
targets: ["RSDatabaseObjC"]), targets: ["RSDatabaseObjC"])
], ],
dependencies: [ dependencies: [
], ],
@ -29,6 +29,6 @@ let package = Package(
), ),
.testTarget( .testTarget(
name: "RSDatabaseTests", name: "RSDatabaseTests",
dependencies: ["RSDatabase"]), dependencies: ["RSDatabase"])
] ]
) )

6
Modules/RSDatabase/Sources/RSDatabase/DatabaseQueue.swift
View File

@ -152,7 +152,7 @@ public final class DatabaseQueue {
/// Use this to create tables, indexes, etc. /// Use this to create tables, indexes, etc.
public func runCreateStatements(_ statements: String) throws { public func runCreateStatements(_ statements: String) throws {
precondition(Thread.isMainThread) precondition(Thread.isMainThread)
var error: DatabaseError? = nil var error: DatabaseError?
runInDatabaseSync { result in runInDatabaseSync { result in
switch result { switch result {
case .success(let database): case .success(let database):
@ -236,8 +236,7 @@ private extension DatabaseQueue {
autoreleasepool { autoreleasepool {
if _isSuspended { if _isSuspended {
databaseBlock(.failure(.isSuspended)) databaseBlock(.failure(.isSuspended))
} } else {
else {
if useTransaction { if useTransaction {
database.beginTransaction() database.beginTransaction()
} }
@ -256,4 +255,3 @@ private extension DatabaseQueue {
database.setShouldCacheStatements(true) database.setShouldCacheStatements(true)
} }
} }

7
Modules/RSDatabase/Sources/RSDatabase/DatabaseTable.swift
View File

@ -50,12 +50,12 @@ public extension DatabaseTable {
func updateRowsWithValue(_ value: Any, valueKey: String, whereKey: String, matches: [Any], database: FMDatabase) { func updateRowsWithValue(_ value: Any, valueKey: String, whereKey: String, matches: [Any], database: FMDatabase) {
let _ = database.rs_updateRows(withValue: value, valueKey: valueKey, whereKey: whereKey, inValues: matches, tableName: self.name) _ = database.rs_updateRows(withValue: value, valueKey: valueKey, whereKey: whereKey, inValues: matches, tableName: self.name)
} }
func updateRowsWithDictionary(_ dictionary: DatabaseDictionary, whereKey: String, matches: Any, database: FMDatabase) { func updateRowsWithDictionary(_ dictionary: DatabaseDictionary, whereKey: String, matches: Any, database: FMDatabase) {
let _ = database.rs_updateRows(with: dictionary, whereKey: whereKey, equalsValue: matches, tableName: self.name) _ = database.rs_updateRows(with: dictionary, whereKey: whereKey, equalsValue: matches, tableName: self.name)
} }
// MARK: Saving // MARK: Saving
@ -63,7 +63,7 @@ public extension DatabaseTable {
func insertRows(_ dictionaries: [DatabaseDictionary], insertType: RSDatabaseInsertType, in database: FMDatabase) { func insertRows(_ dictionaries: [DatabaseDictionary], insertType: RSDatabaseInsertType, in database: FMDatabase) {
for oneDictionary in dictionaries { for oneDictionary in dictionaries {
let _ = database.rs_insertRow(with: oneDictionary, insertType: insertType, tableName: self.name) _ = database.rs_insertRow(with: oneDictionary, insertType: insertType, tableName: self.name)
} }
} }
@ -136,4 +136,3 @@ public extension FMResultSet {
return Set(compactMap(completion)) return Set(compactMap(completion))
} }
} }

8
Modules/RSDatabase/Sources/RSDatabase/Related Objects/DatabaseLookupTable.swift
View File

@ -64,8 +64,7 @@ public final class DatabaseLookupTable {
for object in objects { for object in objects {
if let relatedObjects = object.relatedObjectsWithName(relationshipName), !relatedObjects.isEmpty { if let relatedObjects = object.relatedObjectsWithName(relationshipName), !relatedObjects.isEmpty {
objectsWithRelationships += [object] objectsWithRelationships += [object]
} } else {
else {
objectsWithNoRelationships += [object] objectsWithNoRelationships += [object]
} }
} }
@ -107,7 +106,7 @@ private extension DatabaseLookupTable {
let sql = "delete from \(name) where \(objectIDKey)=? and \(relatedObjectIDKey) in \(placeholders)" let sql = "delete from \(name) where \(objectIDKey)=? and \(relatedObjectIDKey) in \(placeholders)"
let parameters: [Any] = [objectID] + Array(relatedObjectIDs) let parameters: [Any] = [objectID] + Array(relatedObjectIDs)
let _ = database.executeUpdate(sql, withArgumentsIn: parameters) _ = database.executeUpdate(sql, withArgumentsIn: parameters)
} }
// MARK: Saving/Updating // MARK: Saving/Updating
@ -180,7 +179,7 @@ private extension DatabaseLookupTable {
for relatedObjectID in relatedObjectIDs { for relatedObjectID in relatedObjectIDs {
let d: [NSObject: Any] = [(objectIDKey as NSString): objectID, (relatedObjectIDKey as NSString): relatedObjectID] let d: [NSObject: Any] = [(objectIDKey as NSString): objectID, (relatedObjectIDKey as NSString): relatedObjectID]
let _ = database.rs_insertRow(with: d, insertType: .orIgnore, tableName: name) _ = database.rs_insertRow(with: d, insertType: .orIgnore, tableName: name)
} }
} }
@ -226,4 +225,3 @@ private extension DatabaseLookupTable {
return LookupValue(objectID: objectID, relatedObjectID: relatedObjectID) return LookupValue(objectID: objectID, relatedObjectID: relatedObjectID)
} }
} }

3
Modules/RSDatabase/Sources/RSDatabase/Related Objects/DatabaseRelatedObjectsTable.swift
View File

@ -39,8 +39,7 @@ public extension DatabaseRelatedObjectsTable {
for databaseID in databaseIDs { for databaseID in databaseIDs {
if let cachedObject = cache[databaseID] { if let cachedObject = cache[databaseID] {
cachedObjects += [cachedObject] cachedObjects += [cachedObject]
} } else {
else {
databaseIDsToFetch.insert(databaseID) databaseIDsToFetch.insert(databaseID)
} }
} }

3
Modules/RSDatabase/Sources/RSDatabase/Related Objects/RelatedObjectIDsMap.swift
View File

@ -28,8 +28,7 @@ struct RelatedObjectIDsMap {
let relatedObjectID: String = lookupValue.relatedObjectID let relatedObjectID: String = lookupValue.relatedObjectID
if d[objectID] == nil { if d[objectID] == nil {
d[objectID] = Set([relatedObjectID]) d[objectID] = Set([relatedObjectID])
} } else {
else {
d[objectID]!.insert(relatedObjectID) d[objectID]!.insert(relatedObjectID)
} }
} }