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

Make AttachmentsTable use default implementation of save.

This commit is contained in:
Brent Simmons 2017-09-16 13:10:03 -07:00
parent ea6d8b0bb8
commit 1f35892791
3 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Frameworks/Database/AttachmentsTable.swift
View File

@ -24,38 +24,11 @@ final class AttachmentsTable: DatabaseRelatedObjectsTable {
// MARK: DatabaseRelatedObjectsTable
func objectWithRow(_ row: FMResultSet) -> DatabaseObject? {
if let attachment = attachmentWithRow(row) {
if let attachment = Attachment(row: row) {
return attachment as DatabaseObject
}
return nil
}
func save(_ objects: [DatabaseObject], in database: FMDatabase) {
let attachments = objects.map { $0 as! Attachment }
// Attachments in cache must already exist in database. Filter them out.
let attachmentsToSave = Set(attachments.filter { (attachment) -> Bool in
if let _ = cache[attachment.attachmentID] {
return false
}
return true
})
cache.add(attachmentsToSave.databaseObjects())
insertRows(attachmentsToSave.databaseDictionaries(), insertType: .orIgnore, in: database)
}
}
private extension AttachmentsTable {
func attachmentWithRow(_ row: FMResultSet) -> Attachment? {
// attachmentID is non-null in database schema.
let attachmentID = row.string(forColumn: DatabaseKey.attachmentID)!
return Attachment(attachmentID: attachmentID, row: row)
}
}

3
Frameworks/Database/Extensions/Attachment+Database.swift
View File

@ -13,12 +13,13 @@ import RSParser
extension Attachment {
init?(attachmentID: String, row: FMResultSet) {
init?(row: FMResultSet) {
guard let url = row.string(forColumn: DatabaseKey.url) else {
return nil
}
let attachmentID = row.string(forColumn: DatabaseKey.attachmentID)
let mimeType = row.string(forColumn: DatabaseKey.mimeType)
let title = row.string(forColumn: DatabaseKey.title)
let sizeInBytes = optionalIntForColumn(row, DatabaseKey.sizeInBytes)

5
Frameworks/Database/StatusesTable.swift
View File

@ -94,8 +94,9 @@ final class StatusesTable: DatabaseTable {
if status.boolStatus(forKey: statusKey) == flag {
continue
}
status.setBoolStatus(flag, forKey: statusKey)
updatedStatuses.insert(status)
var statusCopy = status
statusCopy.setBoolStatus(flag, forKey: statusKey)
updatedStatuses.insert(statusCopy)
}
if updatedStatuses.isEmpty {