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

Store feed.contentHash in Settings.odb.

This commit is contained in:
Brent Simmons 2018-09-13 22:52:34 -07:00
parent 679e6f6c0b
commit 13fbad12a5
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Frameworks/Account/Feed.swift
View File

@ -14,6 +14,19 @@ import RSDatabase
public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable { public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
private struct Key {
static let url = "url"
static let feedID = "feedID"
static let homePageURL = "homePageURL"
static let iconURL = "iconURL"
static let faviconURL = "faviconURL"
static let name = "name"
static let editedName = "editedName"
static let authors = "authors"
static let conditionalGetInfo = "conditionalGetInfo"
static let contentHash = "contentHash"
}
public weak var account: Account? public weak var account: Account?
public let url: String public let url: String
public let feedID: String public let feedID: String
@ -45,7 +58,14 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
} }
public var conditionalGetInfo: HTTPConditionalGetInfo? public var conditionalGetInfo: HTTPConditionalGetInfo?
public var contentHash: String? public var contentHash: String? {
get {
return settingsTable.string(for: Key.contentHash)
}
set {
settingsTable.setString(newValue, for: Key.contentHash)
}
}
// MARK: - DisplayNameProvider // MARK: - DisplayNameProvider
@ -83,19 +103,6 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
// MARK: - Disk Dictionary // MARK: - Disk Dictionary
private struct Key {
static let url = "url"
static let feedID = "feedID"
static let homePageURL = "homePageURL"
static let iconURL = "iconURL"
static let faviconURL = "faviconURL"
static let name = "name"
static let editedName = "editedName"
static let authors = "authors"
static let conditionalGetInfo = "conditionalGetInfo"
static let contentHash = "contentHash"
}
convenience public init?(account: Account, dictionary: [String: Any]) { convenience public init?(account: Account, dictionary: [String: Any]) {
guard let url = dictionary[Key.url] as? String else { guard let url = dictionary[Key.url] as? String else {
@ -109,7 +116,7 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
self.faviconURL = dictionary[Key.faviconURL] as? String self.faviconURL = dictionary[Key.faviconURL] as? String
self.name = dictionary[Key.name] as? String self.name = dictionary[Key.name] as? String
self.editedName = dictionary[Key.editedName] as? String self.editedName = dictionary[Key.editedName] as? String
self.contentHash = dictionary[Key.contentHash] as? String // self.contentHash = dictionary[Key.contentHash] as? String
if let conditionalGetInfoDictionary = dictionary[Key.conditionalGetInfo] as? [String: String] { if let conditionalGetInfoDictionary = dictionary[Key.conditionalGetInfo] as? [String: String] {
self.conditionalGetInfo = HTTPConditionalGetInfo(dictionary: conditionalGetInfoDictionary) self.conditionalGetInfo = HTTPConditionalGetInfo(dictionary: conditionalGetInfoDictionary)
@ -153,9 +160,9 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
if let authorsArray = authors?.diskArray() { if let authorsArray = authors?.diskArray() {
d[Key.authors] = authorsArray d[Key.authors] = authorsArray
} }
if let contentHash = contentHash { // if let contentHash = contentHash {
d[Key.contentHash] = contentHash // d[Key.contentHash] = contentHash
} // }
if let conditionalGetInfo = conditionalGetInfo { if let conditionalGetInfo = conditionalGetInfo {
d[Key.conditionalGetInfo] = conditionalGetInfo.dictionary d[Key.conditionalGetInfo] = conditionalGetInfo.dictionary
} }

2
submodules/RSDatabase

@ -1 +1 @@
Subproject commit 1681337a15a60ca11dcc2bd95f0a5970368219b6 Subproject commit 6d22551675068414d952509538ac7b7c771202db