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

Unbreak the build. Don’t know if anything works, but at least it builds.

Browse Source
This commit is contained in:
Brent Simmons 2017-05-26 13:07:55 -07:00
parent f49c552bf9
commit 3d5358af09
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/LocalAccount/LocalAccount.swift
View File

@ -95,7 +95,7 @@ public final class LocalAccount: Account, PlistProvider {
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(refreshProgressDidChange(_:)), name: .RSProgressDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(refreshProgressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil)
DispatchQueue.main.async() { () -> Void in DispatchQueue.main.async() { () -> Void in
self.updateUnreadCounts(feedIDs: self.flattenedFeedIDs) self.updateUnreadCounts(feedIDs: self.flattenedFeedIDs)
@ -332,7 +332,7 @@ public final class LocalAccount: Account, PlistProvider {
dynamic func refreshProgressDidChange(_ notification: Notification) { dynamic func refreshProgressDidChange(_ notification: Notification) {
guard let progress = notification.object as? RSProgress, progress === refresher.progress else { guard let progress = notification.object as? DownloadProgress, progress === refresher.progress else {
return return
} }

13
Frameworks/LocalAccount/LocalAccountRefresher.swift
View File

@ -96,7 +96,7 @@ final class LocalAccountRefresher: DownloadSessionDelegate {
if data.isEmpty { if data.isEmpty {
return true return true
} }
if let mimeType = RSMimeTypeForData(data), RSMimeTypeIsMedia(mimeType) { if data.isDefinitelyNotFeed() {
return false return false
} }
@ -125,6 +125,13 @@ final class LocalAccountRefresher: DownloadSessionDelegate {
// //
// print("Not modified response for \(feed.url).") // print("Not modified response for \(feed.url).")
} }
}
private extension Data {
func isDefinitelyNotFeed() -> Bool {
// We only detect a few image types for now. This should get fleshed-out at some later date.
return (self as NSData).rs_dataIsImage()
}
} }