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

Use Logger with OPMLFile.

Browse Source
This commit is contained in:
Brent Simmons 2024-06-09 22:39:23 -07:00
parent 5d066e5d5c
commit a8f952b710
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Account/Sources/Account/OPMLFile.swift
View File

@ -7,19 +7,19 @@
// //
import Foundation import Foundation
import os.log import os
import Parser import Parser
import ParserObjC import ParserObjC
import Core import Core
@MainActor final class OPMLFile { @MainActor final class OPMLFile {
private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "opmlFile")
private let fileURL: URL private let fileURL: URL
private let account: Account private let account: Account
private let dataFile: DataFile private let dataFile: DataFile
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "OPMLFile")
init(filename: String, account: Account) { init(filename: String, account: Account) {
self.account = account self.account = account
@ -30,6 +30,8 @@ import Core
} }
func markAsDirty() { func markAsDirty() {
logger.info("OPMLFile marked dirty: \(self.fileURL)")
dataFile.markAsDirty() dataFile.markAsDirty()
} }
@ -57,7 +59,7 @@ private extension OPMLFile {
do { do {
fileData = try Data(contentsOf: fileURL) fileData = try Data(contentsOf: fileURL)
} catch { } catch {
os_log(.error, log: log, "OPML read from disk failed: %@.", error.localizedDescription) logger.error("OPML read from disk failed for \(self.fileURL): \(error.localizedDescription)")
} }
return fileData return fileData
@ -70,7 +72,7 @@ private extension OPMLFile {
do { do {
opmlDocument = try RSOPMLParser.parseOPML(with: parserData) opmlDocument = try RSOPMLParser.parseOPML(with: parserData)
} catch { } catch {
os_log(.error, log: log, "OPML Import failed: %@.", error.localizedDescription) logger.error("OPML Import failed for \(self.fileURL): \(error.localizedDescription)")
return nil return nil
} }
@ -115,8 +117,8 @@ extension OPMLFile: DataFileDelegate {
let opmlDocumentString = opmlDocument() let opmlDocumentString = opmlDocument()
guard let data = opmlDocumentString.data(using: .utf8, allowLossyConversion: true) else { guard let data = opmlDocumentString.data(using: .utf8, allowLossyConversion: true) else {
assertionFailure("OPML String conversion to Data failed.") assertionFailure("OPML String conversion to Data failed for \(self.fileURL).")
os_log(.error, log: log, "OPML String conversion to Data failed.") logger.error("OPML String conversion to Data failed for \(self.fileURL)")
return nil return nil
} }
@ -125,6 +127,6 @@ extension OPMLFile: DataFileDelegate {
func dataFileWriteToDiskDidFail(for dataFile: DataFile, error: Error) { func dataFileWriteToDiskDidFail(for dataFile: DataFile, error: Error) {
os_log(.error, log: log, "OPML save to disk failed: %@.", error.localizedDescription) logger.error("OPML save to disk failed for \(self.fileURL): \(error.localizedDescription)")
} }
} }