Use Logger instead of OSLog

Author: qvacua

Commons/Sources/Commons/FoundationCommons.swift

@@ -109,4 +109,4 @@ public extension URL {
   var isPackage: Bool { (try? self.resourceValues(forKeys: [.isPackageKey]))?.isPackage ?? false }
 }
 
-private let log = OSLog(subsystem: "com.qvacua.vimr.commons", category: "general")
+private let log = Logger(subsystem: "com.qvacua.vimr.commons", category: "general")

Commons/Sources/Commons/LoggerCommons.swift

@@ -0,0 +1,74 @@
+/**
+ * Tae Won Ha - http://taewon.de - @hataewon
+ * See LICENSE
+ */
+
+import Foundation
+import os
+
+public extension Logger {
+  func trace(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line,
+    _ msg: some Any
+  ) {
+    #if TRACE
+      let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)] [TRACE] \(msg)"
+      self.log(level: .debug, "\(message)")
+    #endif
+  }
+
+  func debug(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line
+  ) {
+    #if DEBUG
+      let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)]"
+      self.log(level: .debug, "\(message)")
+    #endif
+  }
+
+  func debug(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line,
+    _ msg: some Any
+  ) {
+    #if DEBUG
+      let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)] \(msg)"
+      self.log(level: .debug, "\(message)")
+    #endif
+  }
+
+  func info(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line,
+    _ msg: some Any
+  ) {
+    let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)] \(msg)"
+    self.log(level: .info, "\(message)")
+  }
+
+  func error(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line,
+    _ msg: some Any
+  ) {
+    let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)] \(msg)"
+    self.log(level: .error, "\(message)")
+  }
+
+  func fault(
+    file: String = #file,
+    function: String = #function,
+    line: Int = #line,
+    _ msg: some Any
+  ) {
+    let message = "[\((file as NSString).lastPathComponent) - \(function):\(line)] \(msg)"
+    self.log(level: .fault, "\(message)")
+  }
+}

Commons/Sources/Commons/OSLogCommons.swift

@@ -109,7 +109,7 @@ public enum ProcessUtils {
       }
   }
 
-  private static let logger = OSLog(
+  private static let logger = Logger(
     subsystem: Defs.loggerSubsystem,
     category: Defs.LoggerCategory.general
   )

Commons/Sources/Commons/ProcessUtils.swift

@@ -333,8 +333,8 @@ public final class NvimView: NSView,
   var tabsCache = [NvimView.Tabpage]()
 
   var markedText: String?
-  let bridgeLogger = OSLog(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.bridge)
-  let log = OSLog(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
+  let bridgeLogger = Logger(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.bridge)
+  let log = Logger(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
 
   let sourceFileUrls: [URL]
 

NvimView/Sources/NvimView/NvimView.swift

@@ -277,7 +277,7 @@ final class Typesetter {
 
   private let ctRunsCache = FifoCache<[Unicode.UTF16.CodeUnit], [CTRun]>(count: 5000)
 
-  private let log = OSLog(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
+  private let log = Logger(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
 
   private struct NvimUtf16CellsRun {
     var startColumn: Int

NvimView/Sources/NvimView/Typesetter.swift

@@ -388,7 +388,7 @@ final class UGrid: CustomStringConvertible, Codable {
     }
   }
 
-  private let log = OSLog(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
+  private let log = Logger(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.view)
 }
 
 extension UGrid {

NvimView/Sources/NvimView/UGrid.swift

@@ -99,7 +99,7 @@ final class UiBridge {
     return true
   }
 
-  private let log = OSLog(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.bridge)
+  private let log = Logger(subsystem: Defs.loggerSubsystem, category: Defs.LoggerCategory.bridge)
 
   private let uuid: UUID
 

NvimView/Sources/NvimView/UiBridge.swift

@@ -40,7 +40,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
   private let perf = PerfTester()
 
-  private let log = OSLog(
+  private let log = Logger(
     subsystem: "com.qvacua.DrawerPerf",
     category: "perf-tester"
   )

NvimView/Support/DrawerPerf/AppDelegate.swift

@@ -121,7 +121,7 @@ class PerfTester {
     highestValue: 10
   )
 
-  private let log = OSLog(
+  private let log = Logger(
     subsystem: "com.qvacua.DrawerPerf",
     category: "perf-tester"
   )