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

Fix issue where out of order records was dropping web feeds.

Browse Source
This commit is contained in:
Maurice Parker 2020-03-31 10:32:04 -05:00
parent 90376dac03
commit 218df326f4
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Frameworks/Account/CloudKit/CloudKitAccountZoneDelegate.swift
View File

@ -13,6 +13,9 @@ import CloudKit
class CloudKitAcountZoneDelegate: CloudKitZoneDelegate { class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
private typealias UnclaimedWebFeed = (url: URL, editedName: String?, webFeedExternalID: String)
private var unclaimedWebFeeds = [String: [UnclaimedWebFeed]]()
private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit") private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")
weak var account: Account? weak var account: Account?
@ -49,7 +52,6 @@ class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
guard let account = account, guard let account = account,
let urlString = record[CloudKitAccountZone.CloudKitWebFeed.Fields.url] as? String, let urlString = record[CloudKitAccountZone.CloudKitWebFeed.Fields.url] as? String,
let containerExternalIDs = record[CloudKitAccountZone.CloudKitWebFeed.Fields.containerExternalIDs] as? [String], let containerExternalIDs = record[CloudKitAccountZone.CloudKitWebFeed.Fields.containerExternalIDs] as? [String],
let defaultContainerExternalID = containerExternalIDs.first,
let url = URL(string: urlString) else { return } let url = URL(string: urlString) else { return }
let editedName = record[CloudKitAccountZone.CloudKitWebFeed.Fields.editedName] as? String let editedName = record[CloudKitAccountZone.CloudKitWebFeed.Fields.editedName] as? String
@ -57,7 +59,17 @@ class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
if let webFeed = account.existingWebFeed(withExternalID: record.externalID) { if let webFeed = account.existingWebFeed(withExternalID: record.externalID) {
updateWebFeed(webFeed, editedName: editedName, containerExternalIDs: containerExternalIDs) updateWebFeed(webFeed, editedName: editedName, containerExternalIDs: containerExternalIDs)
} else { } else {
addWebFeed(url: url, editedName: editedName, webFeedExternalID: record.externalID, containerExternalID: defaultContainerExternalID) var webFeed: WebFeed? = nil
for containerExternalID in containerExternalIDs {
if let container = account.existingContainer(withExternalID: containerExternalID) {
if webFeed == nil {
webFeed = createWebFeed(url: url, editedName: editedName, webFeedExternalID: record.externalID)
}
container.addWebFeed(webFeed!)
} else {
addUnclaimedWebFeed(url: url, editedName: editedName, webFeedExternalID: record.externalID, containerExternalID: containerExternalID)
}
}
} }
} }
@ -73,12 +85,26 @@ class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
let isAccount = record[CloudKitAccountZone.CloudKitContainer.Fields.isAccount] as? String, let isAccount = record[CloudKitAccountZone.CloudKitContainer.Fields.isAccount] as? String,
isAccount != "true" else { return } isAccount != "true" else { return }
if let folder = account.existingFolder(withExternalID: record.externalID) { var folder = account.existingFolder(withExternalID: record.externalID)
folder.name = name folder?.name = name
} else {
let folder = account.ensureFolder(with: name) if folder == nil {
folder = account.ensureFolder(with: name)
folder?.externalID = record.externalID folder?.externalID = record.externalID
} }
if let folder = folder, let containerExternalID = folder.externalID, let unclaimedWebFeeds = unclaimedWebFeeds[containerExternalID] {
for unclaimedWebFeed in unclaimedWebFeeds {
var webFeed = account.existingWebFeed(withExternalID: unclaimedWebFeed.webFeedExternalID)
if webFeed == nil {
webFeed = createWebFeed(url: unclaimedWebFeed.url, editedName: unclaimedWebFeed.editedName, webFeedExternalID: unclaimedWebFeed.webFeedExternalID)
}
if let webFeed = webFeed {
folder.addWebFeed(webFeed)
}
}
self.unclaimedWebFeeds.removeValue(forKey: containerExternalID)
}
} }
func removeContainer(_ externalID: String) { func removeContainer(_ externalID: String) {
@ -114,13 +140,12 @@ private extension CloudKitAcountZoneDelegate {
} }
} }
func addWebFeed(url: URL, editedName: String?, webFeedExternalID: String, containerExternalID: String) { func createWebFeed(url: URL, editedName: String?, webFeedExternalID: String) -> WebFeed? {
guard let account = account, let container = account.existingContainer(withExternalID: containerExternalID) else { return } guard let account = account else { return nil }
let webFeed = account.createWebFeed(with: editedName, url: url.absoluteString, webFeedID: url.absoluteString, homePageURL: nil) let webFeed = account.createWebFeed(with: editedName, url: url.absoluteString, webFeedID: url.absoluteString, homePageURL: nil)
webFeed.editedName = editedName webFeed.editedName = editedName
webFeed.externalID = webFeedExternalID webFeed.externalID = webFeedExternalID
container.addWebFeed(webFeed)
refreshProgress?.addToNumberOfTasksAndRemaining(1) refreshProgress?.addToNumberOfTasksAndRemaining(1)
InitialFeedDownloader.download(url) { parsedFeed in InitialFeedDownloader.download(url) { parsedFeed in
@ -130,6 +155,19 @@ private extension CloudKitAcountZoneDelegate {
} }
} }
return webFeed
}
func addUnclaimedWebFeed(url: URL, editedName: String?, webFeedExternalID: String, containerExternalID: String) {
if var unclaimedWebFeeds = self.unclaimedWebFeeds[containerExternalID] {
unclaimedWebFeeds.append(UnclaimedWebFeed(url: url, editedName: editedName, webFeedExternalID: webFeedExternalID))
self.unclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
} else {
var unclaimedWebFeeds = [UnclaimedWebFeed]()
unclaimedWebFeeds.append(UnclaimedWebFeed(url: url, editedName: editedName, webFeedExternalID: webFeedExternalID))
self.unclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
}
} }
} }