FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-24 08:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use a KeyPath to generalize code for checking for tags, attachments, and authors changes.

Browse Source
This commit is contained in:
Brent Simmons 2017-09-09 11:02:02 -07:00
parent f40b400dd5
commit f3406088f3
3 changed files with 62 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
Frameworks/Database/ArticlesTable.swift
View File

@ -339,57 +339,57 @@ private extension ArticlesTable {
}
func updateRelatedObjects(_ parsedItems: [String: ParsedItem], _ articles: [String: Article]) {
// Update the in-memory Articles when needed.
// Save only when there are changes, which should be pretty infrequent.
assert(Thread.isMainThread)
var articlesWithTagChanges = Set<Article>()
var articlesWithAttachmentChanges = Set<Article>()
var articlesWithAuthorChanges = Set<Article>()
for (articleID, parsedItem) in parsedItems {
guard let article = articles[articleID] else {
continue
}
if article.updateTagsWithParsedTags(parsedItem.tags) {
articlesWithTagChanges.insert(article)
}
if article.updateAttachmentsWithParsedAttachments(parsedItem.attachments) {
articlesWithAttachmentChanges.insert(article)
}
if article.updateAuthorsWithParsedAuthors(parsedItem.authors) {
articlesWithAuthorChanges.insert(article)
}
}
if articlesWithTagChanges.isEmpty && articlesWithAttachmentChanges.isEmpty && articlesWithAuthorChanges.isEmpty {
// Should be pretty common.
return
}
// We used detachedCopy because the Article objects being updated are main-thread objects.
articlesWithTagChanges = Set(articlesWithTagChanges.map{ $0.detachedCopy() })
articlesWithAttachmentChanges = Set(articlesWithAttachmentChanges.map{ $0.detachedCopy() })
articlesWithAuthorChanges = Set(articlesWithAuthorChanges.map{ $0.detachedCopy() })
queue.update { (database) in
if !articlesWithTagChanges.isEmpty {
tagsLookupTable.saveRelatedObjects(for: articlesWithTagChanges.databaseObjects(), in: database)
}
if !articlesWithAttachmentChanges.isEmpty {
attachmentsLookupTable.saveRelatedObjects(for: articlesWithAttachmentChanges.databaseObjects(), in: database)
}
if !articlesWithAuthorChanges.isEmpty {
authorsLookupTable.saveRelatedObjects(for: articlesWithAuthorChanges.databaseObjects(), in: database)
}
}
}
// func updateRelatedObjects(_ parsedItems: [String: ParsedItem], _ articles: [String: Article]) {
//
// // Update the in-memory Articles when needed.
// // Save only when there are changes, which should be pretty infrequent.
//
// assert(Thread.isMainThread)
//
// var articlesWithTagChanges = Set<Article>()
// var articlesWithAttachmentChanges = Set<Article>()
// var articlesWithAuthorChanges = Set<Article>()
//
// for (articleID, parsedItem) in parsedItems {
//
// guard let article = articles[articleID] else {
// continue
// }
//
// if article.updateTagsWithParsedTags(parsedItem.tags) {
// articlesWithTagChanges.insert(article)
// }
// if article.updateAttachmentsWithParsedAttachments(parsedItem.attachments) {
// articlesWithAttachmentChanges.insert(article)
// }
// if article.updateAuthorsWithParsedAuthors(parsedItem.authors) {
// articlesWithAuthorChanges.insert(article)
// }
// }
//
// if articlesWithTagChanges.isEmpty && articlesWithAttachmentChanges.isEmpty && articlesWithAuthorChanges.isEmpty {
// // Should be pretty common.
// return
// }
//
// // We used detachedCopy because the Article objects being updated are main-thread objects.
//
// articlesWithTagChanges = Set(articlesWithTagChanges.map{ $0.detachedCopy() })
// articlesWithAttachmentChanges = Set(articlesWithAttachmentChanges.map{ $0.detachedCopy() })
// articlesWithAuthorChanges = Set(articlesWithAuthorChanges.map{ $0.detachedCopy() })
//
// queue.update { (database) in
// if !articlesWithTagChanges.isEmpty {
// tagsLookupTable.saveRelatedObjects(for: articlesWithTagChanges.databaseObjects(), in: database)
// }
// if !articlesWithAttachmentChanges.isEmpty {
// attachmentsLookupTable.saveRelatedObjects(for: articlesWithAttachmentChanges.databaseObjects(), in: database)
// }
// if !articlesWithAuthorChanges.isEmpty {
// authorsLookupTable.saveRelatedObjects(for: articlesWithAuthorChanges.databaseObjects(), in: database)
// }
// }
// }
// MARK: Save New Articles
@ -412,63 +412,30 @@ private extension ArticlesTable {
// MARK: Update Existing Articles
// TODO: use a keypath instead of separate functions. Fix code duplication.
func articlesWithTagChanges(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article]) -> Set<Article> {
func articlesWithRelatedObjectChanges(_ comparisonKeyPath: Keypath<Article, Set<AnyHashable>>, _ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article]) -> Set<Article> {
return updatedArticles.filter{ (updatedArticle) -> Bool in
if let fetchedArticle = fetchedArticles[updatedArticle.articleID] {
return updatedArticle.tags != fetchedArticles.tags
return updatedArticle[keyPath: comparisonKeyPath] != fetchedArticle[keyPath: comparisonKeyPath]
}
assertionFailure("Expected to find matching fetched article.");
return true
}
}
func articlesWithAttachmentChanges(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article]) -> Set<Article> {
func updateRelatedObjects(_ comparisonKeyPath: Keypath<Article, Set<AnyHashable>>, _ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article], _ lookupTable: DatabaseLookupTable, _ database: FMDatabase) {
return updatedArticles.filter{ (updatedArticle) -> Bool in
if let fetchedArticle = fetchedArticles[updatedArticle.articleID] {
return updatedArticle.attachments != fetchedArticles.attachments
}
assertionFailure("Expected to find matching fetched article.");
return true
}
}
func articlesWithAuthorChanges(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article]) -> Set<Article> {
return updatedArticles.filter{ (updatedArticle) -> Bool in
if let fetchedArticle = fetchedArticles[updatedArticle.articleID] {
return updatedArticle.authors != fetchedArticles.authors
}
assertionFailure("Expected to find matching fetched article.");
return true
}
}
func updateRelatedTags(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article], _ database: FMDatabase) {
let articlesWithChanges = articlesWithTagChanges(updatedArticles, fetchedArticles)
let articlesWithChanges = articlesWithRelatedObjectChanges(comparisonKeyPath, updatedArticles, fetchedArticles)
if !articlesWithChanges.isEmpty {
tagsLookupTable.saveRelatedObjects(for: articlesWithChanges.databaseObjects(), in: database)
lookupTable.saveRelatedObjects(for: articlesWithChanges.databaseObjects(), in: database)
}
}
func updateRelatedAttachments(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article], _ database: FMDatabase) {
func saveUpdatedRelatedObjects(_ updatedArticles: Set<Article>, _fetchedArticles: [String: Article], _ database: FMDatabase) {
let articlesWithChanges = articlesWithAttachmentChanges(updatedArticles, fetchedArticles)
if !articlesWithChanges.isEmpty {
attachmentsLookupTable.saveRelatedObjects(for: articlesWithChanges.databaseObjects(), in: database)
}
}
func updateRelatedAuthors(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article], _ database: FMDatabase) {
let articlesWithChanges = articlesWithAuthorChanges(updatedArticles, fetchedArticles)
if !articlesWithChanges.isEmpty {
authorsLookupTable.saveRelatedObjects(for: articlesWithChanges.databaseObjects(), in: database)
}
updateRelatedObjects(\Article.tags, updatedArticles, fetchedArticles, tagsLookupTable, database)
updateRelatedObjects(\Article.authors, updatedArticles, fetchedArticles, authorsLookupTable, database)
updateRelatedObjects(\Article.attachments, updatedArticles, fetchedArticles, attachmentsLookupTable, database)
}
func saveUpdatedArticles(_ updatedArticles: Set<Article>, _ fetchedArticles: [String: Article], _ database: FMDatabase) {
@ -480,7 +447,7 @@ private extension ArticlesTable {
func articlesWithParsedItems(_ parsedItems: Set<ParsedItem>, _ feed: Feed) -> Set<Article> {
// These Articles don’t get cached. Background-queue only.
assert(!Thread.isMainThread)
let feedID = feed.feedID
return Set(parsedItems.flatMap{ articleWithParsedItem($0, feedID) })
}
@ -507,8 +474,6 @@ private extension ArticlesTable {
// Drop parsedItems that we can ignore.
assert(Thread.isMainThread)
var d = [String: ParsedItem]()
for (articleID, parsedItem) in parsedItems {

2
Frameworks/Database/Extensions/ArticleStatus+Database.swift
View File

@ -12,7 +12,7 @@ import Data
extension ArticleStatus {
convenience init(articleID: String, dateArrived: Date, row: FMResultSet) {
init(articleID: String, dateArrived: Date, row: FMResultSet) {
let read = row.bool(forColumn: DatabaseKey.read)
let starred = row.bool(forColumn: DatabaseKey.starred)

BIN
ToDo.ooutline
View File

Binary file not shown.