FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-11 17:24:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove file coordinator usage from account files. Issue #1821

Browse Source
This commit is contained in:
Maurice Parker 2020-03-03 11:39:04 -08:00
parent 3a0f57e4da
commit 7d8feba24b
3 changed files with 26 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Frameworks/Account/AccountMetadataFile.swift
View File

@ -34,20 +34,11 @@ final class AccountMetadataFile {
} }
func load() { func load() {
let errorPointer: NSErrorPointer = nil if let fileData = try? Data(contentsOf: fileURL) {
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(readingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { readURL in
if let fileData = try? Data(contentsOf: readURL) {
let decoder = PropertyListDecoder() let decoder = PropertyListDecoder()
account.metadata = (try? decoder.decode(AccountMetadata.self, from: fileData)) ?? AccountMetadata() account.metadata = (try? decoder.decode(AccountMetadata.self, from: fileData)) ?? AccountMetadata()
} }
account.metadata.delegate = account account.metadata.delegate = account
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "Read from disk coordination failed: %@.", error.localizedDescription)
}
} }
func save() { func save() {
@ -56,21 +47,12 @@ final class AccountMetadataFile {
let encoder = PropertyListEncoder() let encoder = PropertyListEncoder()
encoder.outputFormat = .binary encoder.outputFormat = .binary
let errorPointer: NSErrorPointer = nil
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(writingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { writeURL in
do { do {
let data = try encoder.encode(account.metadata) let data = try encoder.encode(account.metadata)
try data.write(to: writeURL) try data.write(to: fileURL)
} catch let error as NSError { } catch let error as NSError {
os_log(.error, log: log, "Save to disk failed: %@.", error.localizedDescription) os_log(.error, log: log, "Save to disk failed: %@.", error.localizedDescription)
} }
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "Save to disk coordination failed: %@.", error.localizedDescription)
}
} }
} }

26
Frameworks/Account/OPMLFile.swift
View File

@ -46,24 +46,13 @@ final class OPMLFile {
func save() { func save() {
guard !account.isDeleted else { return } guard !account.isDeleted else { return }
let opmlDocumentString = opmlDocument() let opmlDocumentString = opmlDocument()
let errorPointer: NSErrorPointer = nil
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(writingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { writeURL in
do { do {
try opmlDocumentString.write(to: writeURL, atomically: true, encoding: .utf8) try opmlDocumentString.write(to: fileURL, atomically: true, encoding: .utf8)
} catch let error as NSError { } catch let error as NSError {
os_log(.error, log: log, "OPML save to disk failed: %@.", error.localizedDescription) os_log(.error, log: log, "OPML save to disk failed: %@.", error.localizedDescription)
} }
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "OPML save to disk coordination failed: %@.", error.localizedDescription)
}
} }
} }
@ -83,23 +72,12 @@ private extension OPMLFile {
func opmlFileData() -> Data? { func opmlFileData() -> Data? {
var fileData: Data? = nil var fileData: Data? = nil
let errorPointer: NSErrorPointer = nil
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(readingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { readURL in
do { do {
fileData = try Data(contentsOf: readURL) fileData = try Data(contentsOf: fileURL)
} catch { } catch {
// Commented out because it’s not an error on first run.
// TODO: make it so we know if it’s first run or not.
//NSApplication.shared.presentError(error)
os_log(.error, log: log, "OPML read from disk failed: %@.", error.localizedDescription) os_log(.error, log: log, "OPML read from disk failed: %@.", error.localizedDescription)
} }
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "OPML read from disk coordination failed: %@.", error.localizedDescription)
}
return fileData return fileData
} }

22
Frameworks/Account/WebFeedMetadataFile.swift
View File

@ -34,20 +34,11 @@ final class WebFeedMetadataFile {
} }
func load() { func load() {
let errorPointer: NSErrorPointer = nil if let fileData = try? Data(contentsOf: fileURL) {
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(readingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { readURL in
if let fileData = try? Data(contentsOf: readURL) {
let decoder = PropertyListDecoder() let decoder = PropertyListDecoder()
account.webFeedMetadata = (try? decoder.decode(Account.WebFeedMetadataDictionary.self, from: fileData)) ?? Account.WebFeedMetadataDictionary() account.webFeedMetadata = (try? decoder.decode(Account.WebFeedMetadataDictionary.self, from: fileData)) ?? Account.WebFeedMetadataDictionary()
} }
account.webFeedMetadata.values.forEach { $0.delegate = account } account.webFeedMetadata.values.forEach { $0.delegate = account }
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "Read from disk coordination failed: %@.", error.localizedDescription)
}
} }
func save() { func save() {
@ -58,21 +49,12 @@ final class WebFeedMetadataFile {
let encoder = PropertyListEncoder() let encoder = PropertyListEncoder()
encoder.outputFormat = .binary encoder.outputFormat = .binary
let errorPointer: NSErrorPointer = nil
let fileCoordinator = NSFileCoordinator()
fileCoordinator.coordinate(writingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { writeURL in
do { do {
let data = try encoder.encode(feedMetadata) let data = try encoder.encode(feedMetadata)
try data.write(to: writeURL) try data.write(to: fileURL)
} catch let error as NSError { } catch let error as NSError {
os_log(.error, log: log, "Save to disk failed: %@.", error.localizedDescription) os_log(.error, log: log, "Save to disk failed: %@.", error.localizedDescription)
} }
})
if let error = errorPointer?.pointee {
os_log(.error, log: log, "Save to disk coordination failed: %@.", error.localizedDescription)
}
} }
} }