Fix bug loading feeds from disk.
This commit is contained in:
parent
0f19fda54d
commit
199dd0e247
|
@ -57,7 +57,7 @@ public struct Article: Hashable {
|
|||
self.articleID = Article.calculatedArticleID(feedID: feedID, uniqueID: uniqueID)
|
||||
}
|
||||
|
||||
self.hashValue = accountID.hashValue ^ self.articleID.hashValue
|
||||
self.hashValue = (accountID + self.articleID).hashValue
|
||||
}
|
||||
|
||||
public static func calculatedArticleID(feedID: String, uniqueID: String) -> String {
|
||||
|
|
|
@ -47,7 +47,7 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
|
|||
self.accountID = accountID
|
||||
self.url = url
|
||||
self.feedID = feedID
|
||||
self.hashValue = accountID.hashValue ^ url.hashValue ^ feedID.hashValue
|
||||
self.hashValue = feedID.hashValue
|
||||
}
|
||||
|
||||
// MARK: - Disk Dictionary
|
||||
|
@ -65,10 +65,11 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
|
|||
|
||||
convenience public init?(accountID: String, dictionary: [String: Any]) {
|
||||
|
||||
guard let url = dictionary[Key.url] as? String, let feedID = dictionary[Key.feedID] as? String else {
|
||||
guard let url = dictionary[Key.url] as? String else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let feedID = dictionary[Key.feedID] as? String ?? url
|
||||
|
||||
self.init(accountID: accountID, url: url, feedID: feedID)
|
||||
self.homePageURL = dictionary[Key.homePageURL] as? String
|
||||
self.name = dictionary[Key.name] as? String
|
||||
|
@ -94,7 +95,12 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
|
|||
var d = [String: Any]()
|
||||
|
||||
d[Key.url] = url
|
||||
d[Key.feedID] = feedID
|
||||
|
||||
// feedID is not repeated when it’s the same as url
|
||||
if (feedID != url) {
|
||||
d[Key.feedID] = feedID
|
||||
}
|
||||
|
||||
if let homePageURL = homePageURL {
|
||||
d[Key.homePageURL] = homePageURL
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ public struct ParsedHub: Hashable {
|
|||
|
||||
self.type = type
|
||||
self.url = url
|
||||
self.hashValue = type.hashValue ^ url.hashValue
|
||||
self.hashValue = url.hashValue
|
||||
}
|
||||
|
||||
public static func ==(lhs: ParsedHub, rhs: ParsedHub) -> Bool {
|
||||
|
|
|
@ -46,7 +46,7 @@ public struct ParsedItem: Hashable {
|
|||
self.authors = authors
|
||||
self.tags = tags
|
||||
self.attachments = attachments
|
||||
self.hashValue = feedURL.hashValue ^ uniqueID.hashValue
|
||||
self.hashValue = (feedURL + uniqueID).hashValue
|
||||
}
|
||||
|
||||
public static func ==(lhs: ParsedItem, rhs: ParsedItem) -> Bool {
|
||||
|
|
Loading…
Reference in New Issue