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

Process the article downloads in smaller transaction groups to make possible to interrupt. Issue #1437.

Browse Source
This commit is contained in:
Maurice Parker 2019-12-17 14:28:04 -07:00
parent 7192a6893e
commit b637a6f01b
4 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Frameworks/Account/Account.swift
View File

@ -724,36 +724,56 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
completion(nil) completion(nil)
return return
} }
database.update(webFeedIDsAndItems: webFeedIDsAndItems, defaultRead: defaultRead) { updateArticlesResult in
func process(_ newAndUpdatedArticles: NewAndUpdatedArticles) { let group = DispatchGroup()
var possibleError: DatabaseError? = nil
var newArticles = Set<Article>()
var updatedArticles = Set<Article>()
for (webFeedID, items) in webFeedIDsAndItems {
group.enter()
database.update(webFeedID: webFeedID, items: items, defaultRead: defaultRead) { updateArticlesResult in
switch updateArticlesResult {
case .success(let newAndUpdatedArticles):
if let articles = newAndUpdatedArticles.newArticles {
newArticles.formUnion(articles)
}
if let articles = newAndUpdatedArticles.updatedArticles {
updatedArticles.formUnion(articles)
}
case .failure(let databaseError):
possibleError = databaseError
}
group.leave()
}
}
group.notify(queue: DispatchQueue.main) {
var userInfo = [String: Any]() var userInfo = [String: Any]()
let webFeeds = Set(webFeedIDsAndItems.compactMap { (key, _) -> WebFeed? in var webFeeds = Set(newArticles.compactMap { $0.webFeed })
self.existingWebFeed(withWebFeedID: key) webFeeds.formUnion(Set(updatedArticles.compactMap { $0.webFeed }))
})
if let newArticles = newAndUpdatedArticles.newArticles, !newArticles.isEmpty { if !newArticles.isEmpty {
self.updateUnreadCounts(for: webFeeds) { self.updateUnreadCounts(for: webFeeds) {
NotificationCenter.default.post(name: .DownloadArticlesDidUpdateUnreadCounts, object: self, userInfo: nil) NotificationCenter.default.post(name: .DownloadArticlesDidUpdateUnreadCounts, object: self, userInfo: nil)
} }
userInfo[UserInfoKey.newArticles] = newArticles userInfo[UserInfoKey.newArticles] = newArticles
} }
if let updatedArticles = newAndUpdatedArticles.updatedArticles, !updatedArticles.isEmpty {
if !updatedArticles.isEmpty {
userInfo[UserInfoKey.updatedArticles] = updatedArticles userInfo[UserInfoKey.updatedArticles] = updatedArticles
} }
userInfo[UserInfoKey.webFeeds] = webFeeds userInfo[UserInfoKey.webFeeds] = webFeeds
completion(nil)
NotificationCenter.default.post(name: .AccountDidDownloadArticles, object: self, userInfo: userInfo) NotificationCenter.default.post(name: .AccountDidDownloadArticles, object: self, userInfo: userInfo)
completion(possibleError)
} }
switch updateArticlesResult {
case .success(let newAndUpdatedArticles):
process(newAndUpdatedArticles)
case .failure(let databaseError):
completion(databaseError)
}
}
} }
@discardableResult @discardableResult

6
Frameworks/ArticlesDatabase/ArticlesDatabase.swift
View File

@ -159,9 +159,9 @@ public final class ArticlesDatabase {
// MARK: - Saving and Updating Articles // MARK: - Saving and Updating Articles
/// Update articles and save new ones. The key for ewbFeedIDsAndItems is webFeedID. /// Update articles and save new ones.
public func update(webFeedIDsAndItems: [String: Set<ParsedItem>], defaultRead: Bool, completion: @escaping UpdateArticlesCompletionBlock) { public func update(webFeedID: String, items: Set<ParsedItem>, defaultRead: Bool, completion: @escaping UpdateArticlesCompletionBlock) {
articlesTable.update(webFeedIDsAndItems, defaultRead, completion) articlesTable.update(webFeedID, items, defaultRead, completion)
} }
// MARK: - Status // MARK: - Status

12
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@ -169,8 +169,8 @@ final class ArticlesTable: DatabaseTable {
// MARK: - Updating // MARK: - Updating
func update(_ webFeedIDsAndItems: [String: Set<ParsedItem>], _ read: Bool, _ completion: @escaping UpdateArticlesCompletionBlock) { func update(_ webFeedID: String, _ items: Set<ParsedItem>, _ read: Bool, _ completion: @escaping UpdateArticlesCompletionBlock) {
if webFeedIDsAndItems.isEmpty { if items.isEmpty {
callUpdateArticlesCompletionBlock(nil, nil, completion) callUpdateArticlesCompletionBlock(nil, nil, completion)
return return
} }
@ -184,18 +184,14 @@ final class ArticlesTable: DatabaseTable {
// 7. Call back with new and updated Articles. // 7. Call back with new and updated Articles.
// 8. Update search index. // 8. Update search index.
var articleIDs = Set<String>()
for (_, parsedItems) in webFeedIDsAndItems {
articleIDs.formUnion(parsedItems.articleIDs())
}
self.queue.runInTransaction { (databaseResult) in self.queue.runInTransaction { (databaseResult) in
func makeDatabaseCalls(_ database: FMDatabase) { func makeDatabaseCalls(_ database: FMDatabase) {
let articleIDs = items.articleIDs()
let statusesDictionary = self.statusesTable.ensureStatusesForArticleIDs(articleIDs, read, database) //1 let statusesDictionary = self.statusesTable.ensureStatusesForArticleIDs(articleIDs, read, database) //1
assert(statusesDictionary.count == articleIDs.count) assert(statusesDictionary.count == articleIDs.count)
let allIncomingArticles = Article.articlesWithWebFeedIDsAndItems(webFeedIDsAndItems, self.accountID, statusesDictionary) //2 let allIncomingArticles = Article.articlesWithWebFeedIDsAndItems(webFeedID, items, self.accountID, statusesDictionary) //2
if allIncomingArticles.isEmpty { if allIncomingArticles.isEmpty {
self.callUpdateArticlesCompletionBlock(nil, nil, completion) self.callUpdateArticlesCompletionBlock(nil, nil, completion)
return return

10
Frameworks/ArticlesDatabase/Extensions/Article+Database.swift
View File

@ -83,14 +83,10 @@ extension Article {
// return Set(parsedItems.map{ Article(parsedItem: $0, maximumDateAllowed: maximumDateAllowed, accountID: accountID, feedID: feedID, status: statusesDictionary[$0.articleID]!) }) // return Set(parsedItems.map{ Article(parsedItem: $0, maximumDateAllowed: maximumDateAllowed, accountID: accountID, feedID: feedID, status: statusesDictionary[$0.articleID]!) })
// } // }
static func articlesWithWebFeedIDsAndItems(_ webFeedIDsAndItems: [String: Set<ParsedItem>], _ accountID: String, _ statusesDictionary: [String: ArticleStatus]) -> Set<Article> { static func articlesWithWebFeedIDsAndItems(_ webFeedID: String, _ items: Set<ParsedItem>, _ accountID: String, _ statusesDictionary: [String: ArticleStatus]) -> Set<Article> {
let maximumDateAllowed = Date().addingTimeInterval(60 * 60 * 24) // Allow dates up to about 24 hours ahead of now let maximumDateAllowed = Date().addingTimeInterval(60 * 60 * 24) // Allow dates up to about 24 hours ahead of now
var articles = Set<Article>() let feedArticles = Set(items.map{ Article(parsedItem: $0, maximumDateAllowed: maximumDateAllowed, accountID: accountID, webFeedID: webFeedID, status: statusesDictionary[$0.articleID]!) })
for (webFeedID, parsedItems) in webFeedIDsAndItems { return feedArticles
let feedArticles = Set(parsedItems.map{ Article(parsedItem: $0, maximumDateAllowed: maximumDateAllowed, accountID: accountID, webFeedID: webFeedID, status: statusesDictionary[$0.articleID]!) })
articles.formUnion(feedArticles)
}
return articles
} }
} }