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

Remove some unused code.

Browse Source
This commit is contained in:
Brent Simmons
2024-06-04 20:20:27 -07:00
parent ef43773b07
commit ea661fbccd
2 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@@ -452,7 +452,7 @@ enum CloudKitAccountDelegateError: LocalizedError {
func accountDidInitialize(_ account: Account) {
self.account = account
accountZone.delegate = CloudKitAcountZoneDelegate(account: account, refreshProgress: refreshProgress, articlesZone: articlesZone)
accountZone.delegate = CloudKitAcountZoneDelegate(account: account)
articlesZone.delegate = CloudKitArticlesZoneDelegate(articleSupport: articleSupport(), database: database, articlesZone: articlesZone)
articlesZone.feedInfoDelegate = self

79
Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift
View File

@@ -8,9 +8,7 @@
import Foundation
import os.log
import Web
import CloudKit
import Articles
import CloudKitSync
@MainActor final class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
@@ -22,15 +20,11 @@ import CloudKitSync
private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")
weak var account: Account?
weak var refreshProgress: DownloadProgress?
weak var articlesZone: CloudKitArticlesZone?
init(account: Account, refreshProgress: DownloadProgress, articlesZone: CloudKitArticlesZone) {
init(account: Account) {
self.account = account
self.refreshProgress = refreshProgress
self.articlesZone = articlesZone
}
func cloudKitDidModify(changed: [CKRecord], deleted: [CloudKitRecordKey], completion: @escaping (Result<Void, Error>) -> Void) {
for deletedRecordKey in deleted {
@@ -57,15 +51,18 @@ import CloudKitSync
completion(.success(()))
}
}
private extension CloudKitAcountZoneDelegate {
func addOrUpdateFeed(_ record: CKRecord) {
guard let account = account,
let urlString = record[CloudKitAccountZone.CloudKitFeed.Fields.url] as? String,
let containerExternalIDs = record[CloudKitAccountZone.CloudKitFeed.Fields.containerExternalIDs] as? [String],
let url = URL(string: urlString) else {
return
let urlString = record[CloudKitAccountZone.CloudKitFeed.Fields.url] as? String,
let containerExternalIDs = record[CloudKitAccountZone.CloudKitFeed.Fields.containerExternalIDs] as? [String],
let url = URL(string: urlString) else {
return
}
let name = record[CloudKitAccountZone.CloudKitFeed.Fields.name] as? String
let editedName = record[CloudKitAccountZone.CloudKitFeed.Fields.editedName] as? String
let homePageURL = record[CloudKitAccountZone.CloudKitFeed.Fields.homePageURL] as? String
@@ -82,7 +79,7 @@ import CloudKitSync
}
}
}
func removeFeed(_ externalID: String) {
if let feed = account?.existingFeed(withExternalID: externalID), let containers = account?.existingContainers(withFeed: feed) {
for container in containers {
@@ -91,38 +88,38 @@ import CloudKitSync
}
}
}
func addOrUpdateContainer(_ record: CKRecord) {
guard let account = account,
let name = record[CloudKitAccountZone.CloudKitContainer.Fields.name] as? String,
let isAccount = record[CloudKitAccountZone.CloudKitContainer.Fields.isAccount] as? String,
isAccount != "1" else {
return
let name = record[CloudKitAccountZone.CloudKitContainer.Fields.name] as? String,
let isAccount = record[CloudKitAccountZone.CloudKitContainer.Fields.isAccount] as? String,
isAccount != "1" else {
return
}
var folder = account.existingFolder(withExternalID: record.externalID)
folder?.name = name
if folder == nil {
folder = account.ensureFolder(with: name)
folder?.externalID = record.externalID
}
guard let container = folder, let containerExternalID = container.externalID else { return }
if let newUnclaimedFeeds = newUnclaimedFeeds[containerExternalID] {
for newUnclaimedFeed in newUnclaimedFeeds {
createFeedIfNecessary(url: newUnclaimedFeed.url,
name: newUnclaimedFeed.name,
editedName: newUnclaimedFeed.editedName,
homePageURL: newUnclaimedFeed.homePageURL,
feedExternalID: newUnclaimedFeed.feedExternalID,
container: container)
name: newUnclaimedFeed.name,
editedName: newUnclaimedFeed.editedName,
homePageURL: newUnclaimedFeed.homePageURL,
feedExternalID: newUnclaimedFeed.feedExternalID,
container: container)
}
self.newUnclaimedFeeds.removeValue(forKey: containerExternalID)
}
if let existingUnclaimedFeeds = existingUnclaimedFeeds[containerExternalID] {
for existingUnclaimedFeed in existingUnclaimedFeeds {
container.addFeed(existingUnclaimedFeed)
@@ -130,28 +127,25 @@ import CloudKitSync
self.existingUnclaimedFeeds.removeValue(forKey: containerExternalID)
}
}
func removeContainer(_ externalID: String) {
if let folder = account?.existingFolder(withExternalID: externalID) {
account?.removeFolder(folder: folder)
}
}
}
private extension CloudKitAcountZoneDelegate {
func updateFeed(_ feed: Feed, name: String?, editedName: String?, homePageURL: String?, containerExternalIDs: [String]) {
guard let account = account else { return }
feed.name = name
feed.editedName = editedName
feed.homePageURL = homePageURL
let existingContainers = account.existingContainers(withFeed: feed)
let existingContainerExternalIDs = existingContainers.compactMap { $0.externalID }
let diff = containerExternalIDs.difference(from: existingContainerExternalIDs)
for change in diff {
switch change {
case .remove(_, let externalID, _):
@@ -167,20 +161,20 @@ private extension CloudKitAcountZoneDelegate {
}
}
}
func createFeedIfNecessary(url: URL, name: String?, editedName: String?, homePageURL: String?, feedExternalID: String, container: Container) {
guard let account = account else { return }
if account.existingFeed(withExternalID: feedExternalID) != nil {
return
}
let feed = account.createFeed(with: name, url: url.absoluteString, feedID: url.absoluteString, homePageURL: homePageURL)
feed.editedName = editedName
feed.externalID = feedExternalID
container.addFeed(feed)
}
func addNewUnclaimedFeed(url: URL, name: String?, editedName: String?, homePageURL: String?, feedExternalID: String, containerExternalID: String) {
if var unclaimedFeeds = self.newUnclaimedFeeds[containerExternalID] {
unclaimedFeeds.append(UnclaimedFeed(url: url, name: name, editedName: editedName, homePageURL: homePageURL, feedExternalID: feedExternalID))
@@ -191,7 +185,7 @@ private extension CloudKitAcountZoneDelegate {
self.newUnclaimedFeeds[containerExternalID] = unclaimedFeeds
}
}
func addExistingUnclaimedFeed(_ feed: Feed, containerExternalID: String) {
if var unclaimedFeeds = self.existingUnclaimedFeeds[containerExternalID] {
unclaimedFeeds.append(feed)
@@ -202,5 +196,4 @@ private extension CloudKitAcountZoneDelegate {
self.existingUnclaimedFeeds[containerExternalID] = unclaimedFeeds
}
}
}