renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move Cache-Control responsibility to LocalAccountRefresher.

Browse Source
This commit is contained in:
Brent Simmons
2024-12-02 21:20:20 -08:00
parent 6558135191
commit e5ac628619
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Account/Sources/Account/LocalAccount/LocalAccountRefresher.swift
View File

@@ -36,7 +36,7 @@ final class LocalAccountRefresher {
public func refreshFeeds(_ feeds: Set<WebFeed>, completion: (() -> Void)? = nil) {
let filteredFeeds = feeds.filter { !Self.feedIsDisallowed($0) }
let filteredFeeds = feeds.filter { !feedShouldBeSkipped($0) }
guard !filteredFeeds.isEmpty else {
Task { @MainActor in
@@ -177,6 +177,16 @@ private extension LocalAccountRefresher {
return false
}
func feedShouldBeSkipped(_ feed: WebFeed) -> Bool {
if let cacheControlInfo = feed.cacheControlInfo, !cacheControlInfo.isExpired {
os_log(.debug, "Dropping request for Cache-Control reasons: \(feed.url)")
return true
}
return Self.feedIsDisallowed(feed)
}
}
// MARK: - Utility

25
RSWeb/Sources/RSWeb/DownloadSession.swift
View File

@@ -32,7 +32,6 @@ public protocol DownloadSessionDelegate {
private let delegate: DownloadSessionDelegate
private var redirectCache = [URL: URL]()
private var queue = [URL]()
private var cacheControlResponses = [URL: CacheControlInfo]()
// 429 Too Many Requests responses
private var retryAfterMessages = [String: HTTPResponse429]()
@@ -152,15 +151,6 @@ extension DownloadSession: URLSessionDataDelegate {
return
}
if let httpURLResponse = response as? HTTPURLResponse, let cacheControlInfo = CacheControlInfo(urlResponse: httpURLResponse) {
if let url = taskInfo?.url {
cacheControlResponses[url] = cacheControlInfo
if let actualURL = response.url, actualURL != url {
cacheControlResponses[actualURL] = cacheControlInfo
}
}
}
addDataTaskFromQueueIfNecessary()
completionHandler(.allow)
}
@@ -201,10 +191,6 @@ private extension DownloadSession {
os_log(.debug, "Dropping request for previous 400-499: \(urlToUse)")
return
}
if requestShouldBeDroppedDueToCacheControl(urlToUse) {
os_log(.debug, "Dropping request for Cache-Control reasons: \(urlToUse)")
return
}
let urlRequest: URLRequest = {
var request = URLRequest(url: urlToUse)
@@ -398,17 +384,6 @@ private extension DownloadSession {
return false
}
// MARK: - Cache-Control responses
func requestShouldBeDroppedDueToCacheControl(_ url: URL) -> Bool {
guard let cacheControlInfo = cacheControlResponses[url] else {
return false
}
return cacheControlInfo.dateExpired > Date()
}
}
extension URLSessionTask {