Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Restore fast log parsing

Manav Rathiff220eeba2fc
diff --git a/apple/apps/ensu/Ensu/Settings/LogsView.swift b/apple/apps/ensu/Ensu/Settings/LogsView.swift
index ad05b86e03..7726c91bf4 100644
--- a/apple/apps/ensu/Ensu/Settings/LogsView.swift
+++ b/apple/apps/ensu/Ensu/Settings/LogsView.swift
@@ -133,16 +133,19 @@ struct LogsView: View {
for line in text.components(separatedBy: .newlines) {
guard !line.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { continue }
- if let match = line.wholeMatch(
- of: #/\[(.+?)\]\[(.+?)\] \[(.+?)\] (.*)/#.matchingSemantics(.unicodeScalar))
+ if let match = logLineRegex?.firstMatch(
+ in: line, range: NSRange(line.startIndex..., in: line)),
+ let tagRange = Range(match.range(at: 1), in: line),
+ let levelRange = Range(match.range(at: 2), in: line),
+ let timestampRange = Range(match.range(at: 3), in: line),
+ let messageRange = Range(match.range(at: 4), in: line)
{
- let (_, tag, level, timestamp, message) = match.output
entries.append(
EnsuLogEntry(
- timestamp: logLineFormatter.date(from: String(timestamp)) ?? Date(),
- level: EnsuLogLevel(rawValue: String(level)) ?? .info,
- tag: String(tag),
- message: String(message),
+ timestamp: logLineFormatter.date(from: String(line[timestampRange])) ?? Date(),
+ level: EnsuLogLevel(rawValue: String(line[levelRange])) ?? .info,
+ tag: String(line[tagRange]),
+ message: String(line[messageRange]),
details: nil
)
)
@@ -306,6 +309,9 @@ private struct LogDetailView: View {
}
}
+private let logLineRegex = try? NSRegularExpression(
+ pattern: #"^\[(.+?)\]\[(.+?)\] \[(.+?)\] (.*)$"#)
+
private let logTimestampFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.locale = Locale.current