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

Update last article fetch time

This commit is contained in:
Anh Do 2020-03-21 23:28:29 -04:00
parent a784b11d1c
commit f0fe308c7b
No known key found for this signature in database
GPG Key ID: 451E3092F917B62D
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Frameworks/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
View File

@ -222,7 +222,7 @@ extension NewsBlurAccountDelegate {
caller.retrieveStories(hashes: hashesToFetch) { result in
switch result {
case .success(let stories):
case .success((let stories, let date)):
self.processStories(account: account, stories: stories) { result in
self.refreshProgress.completeTask()
@ -231,7 +231,7 @@ extension NewsBlurAccountDelegate {
return
}
self.refreshUnreadStories(for: account, hashes: Array(hashes[numberOfStories...]), updateFetchDate: updateFetchDate) { result in
self.refreshUnreadStories(for: account, hashes: Array(hashes[numberOfStories...]), updateFetchDate: date) { result in
os_log(.debug, log: self.log, "Done refreshing stories.")
switch result {
case .success:
@ -401,7 +401,7 @@ extension NewsBlurAccountDelegate {
caller.retrieveStories(feedID: feed.webFeedID, page: page) { result in
switch result {
case .success(let stories):
case .success((let stories, _)):
// No more stories
guard let stories = stories, stories.count > 0 else {
self.refreshProgress.completeTask()
@ -410,7 +410,14 @@ extension NewsBlurAccountDelegate {
return
}
let since = Calendar.current.date(byAdding: .month, value: -3, to: Date())
let since: Date? = {
if let lastArticleFetch = self.accountMetadata?.lastArticleFetchStartTime {
return lastArticleFetch
} else {
return Calendar.current.date(byAdding: .month, value: -3, to: Date())
}
}()
self.processStories(account: account, stories: stories, since: since) { result in
self.refreshProgress.completeTask()

12
Frameworks/Account/NewsBlur/NewsBlurAPICaller.swift
View File

@ -125,7 +125,7 @@ final class NewsBlurAPICaller: NSObject {
)
}
func retrieveStories(feedID: String, page: Int, completion: @escaping (Result<[NewsBlurStory]?, Error>) -> Void) {
func retrieveStories(feedID: String, page: Int, completion: @escaping (Result<([NewsBlurStory]?, Date?), Error>) -> Void) {
let url = baseURL
.appendingPathComponent("reader/feed/\(feedID)")
.appendingQueryItems([
@ -138,15 +138,15 @@ final class NewsBlurAPICaller: NSObject {
requestData(callURL: url, resultType: NewsBlurStoriesResponse.self) { result in
switch result {
case .success((_, let payload)):
completion(.success(payload?.stories))
case .success(let (response, payload)):
completion(.success((payload?.stories, HTTPDateInfo(urlResponse: response)?.date)))
case .failure(let error):
completion(.failure(error))
}
}
}
func retrieveStories(hashes: [NewsBlurStoryHash], completion: @escaping (Result<[NewsBlurStory]?, Error>) -> Void) {
func retrieveStories(hashes: [NewsBlurStoryHash], completion: @escaping (Result<([NewsBlurStory]?, Date?), Error>) -> Void) {
let url = baseURL
.appendingPathComponent("reader/river_stories")
.appendingQueryItem(.init(name: "include_hidden", value: "true"))?
@ -156,8 +156,8 @@ final class NewsBlurAPICaller: NSObject {
requestData(callURL: url, resultType: NewsBlurStoriesResponse.self) { result in
switch result {
case .success((_, let payload)):
completion(.success(payload?.stories))
case .success(let (response, payload)):
completion(.success((payload?.stories, HTTPDateInfo(urlResponse: response)?.date)))
case .failure(let error):
completion(.failure(error))
}

2
Frameworks/Account/NewsBlur/NewsBlurAccountDelegate.swift
View File

@ -273,7 +273,7 @@ final class NewsBlurAccountDelegate: AccountDelegate {
self.caller.retrieveStories(hashes: chunk) { result in
switch result {
case .success(let stories):
case .success((let stories, _)):
self.processStories(account: account, stories: stories) { result in
group.leave()
if case .failure = result {