Logging changes

- Adds `Logging` protocol
- Moves to Swift-style `OSLog` usage

os_log to Logger

os_log audit

Replacment of os.log with Logging
This commit is contained in:
Stuart Breckenridge
2022-08-03 15:37:12 +08:00
parent bff3c26490
commit 0dd4689bf0
52 changed files with 270 additions and 271 deletions

View File

@@ -8,35 +8,41 @@
import WidgetKit
import SwiftUI
import RSCore
struct Provider: TimelineProvider {
struct Provider: TimelineProvider, Logging {
let decoder = WidgetDataDecoder()
func placeholder(in context: Context) -> WidgetTimelineEntry {
do {
let data = try WidgetDataDecoder.decodeWidgetData()
let data = try decoder.decodeWidgetData()
return WidgetTimelineEntry(date: Date(), widgetData: data)
} catch {
return WidgetTimelineEntry(date: Date(), widgetData: WidgetDataDecoder.sampleData())
logger.error("Failed to decode widget data: \(error.localizedDescription, privacy: .public)")
return WidgetTimelineEntry(date: Date(), widgetData: decoder.sampleData())
}
}
func getSnapshot(in context: Context, completion: @escaping (WidgetTimelineEntry) -> Void) {
if context.isPreview {
do {
let data = try WidgetDataDecoder.decodeWidgetData()
let data = try decoder.decodeWidgetData()
completion(WidgetTimelineEntry(date: Date(), widgetData: data))
} catch {
logger.error("Failed to decode widget data: \(error.localizedDescription, privacy: .public)")
completion(WidgetTimelineEntry(date: Date(),
widgetData: WidgetDataDecoder.sampleData()))
widgetData: decoder.sampleData()))
}
} else {
do {
let widgetData = try WidgetDataDecoder.decodeWidgetData()
let widgetData = try decoder.decodeWidgetData()
let entry = WidgetTimelineEntry(date: Date(), widgetData: widgetData)
completion(entry)
} catch {
logger.error("Failed to decode widget data: \(error.localizedDescription, privacy: .public)")
let entry = WidgetTimelineEntry(date: Date(),
widgetData: WidgetDataDecoder.sampleData())
widgetData: decoder.sampleData())
completion(entry)
}
}
@@ -48,9 +54,10 @@ struct Provider: TimelineProvider {
var entry: WidgetTimelineEntry
do {
let widgetData = try WidgetDataDecoder.decodeWidgetData()
let widgetData = try decoder.decodeWidgetData()
entry = WidgetTimelineEntry(date: date, widgetData: widgetData)
} catch {
logger.error("Failed to decode widget data: \(error.localizedDescription, privacy: .public)")
entry = WidgetTimelineEntry(date: date, widgetData: WidgetData(currentUnreadCount: 0, currentTodayCount: 0, currentStarredCount: 0, unreadArticles: [], starredArticles: [], todayArticles: [], lastUpdateTime: Date()))
}

View File

@@ -102,6 +102,6 @@ struct SmartFeedSummaryWidgetView: View {
struct SmartFeedSummaryWidgetView_Previews: PreviewProvider {
static var previews: some View {
SmartFeedSummaryWidgetView(entry: Provider.Entry.init(date: Date(), widgetData: WidgetDataDecoder.sampleData()))
SmartFeedSummaryWidgetView(entry: Provider.Entry.init(date: Date(), widgetData: WidgetDataDecoder().sampleData()))
}
}