Logger convenience getter on controllers

Author: rustle

Sources/ScreenReader/Controllers/Application.swift

@@ -6,6 +6,7 @@
 
 import AccessibilityElement
 import Cocoa
+import os
 
 public enum ApplicationError: Error {
     case observerError(ObserverError)
@@ -19,9 +20,15 @@ public actor Application<ObserverType: Observer>: Controller where ObserverType.
         ApplicationObserver<ObserverType>
     ) async throws -> Controller
 
+    private var logger: Logger {
+        Loggers.Controller.application
+    }
+
     public let element: ElementType
+
     private var observer: ApplicationObserver<ObserverType>?
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     private var focusedUIElement: Controller?
     private let output: Output
     private var observerFactory: () async throws -> ApplicationObserver<ObserverType>

Sources/ScreenReader/Controllers/Button.swift

@@ -6,13 +6,21 @@
 
 import AccessibilityElement
 import Foundation
+import os
 
 public actor Button<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.button
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/ComboBox.swift

@@ -6,13 +6,21 @@
 
 import AccessibilityElement
 import Foundation
+import os
 
 public actor ComboBox<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.comboBox
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/List.swift

@@ -11,9 +11,16 @@ import os
 public actor List<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.list
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/Table.swift

@@ -12,9 +12,16 @@ import os
 public actor Table<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.table
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/TextArea.swift

@@ -6,13 +6,21 @@
 
 import AccessibilityElement
 import Foundation
+import os
 
 public actor TextArea<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.textArea
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/Unknown.swift

@@ -11,12 +11,20 @@ import os
 public actor Unknown<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     private let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.unknown
+    }
+
     private unowned let application: Application<ObserverType>
+
     private let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
 #if DEBUG
     private var cachedDebugInfo: [String:Any]?
 #endif // DEBUG
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/WebArea.swift

@@ -6,13 +6,21 @@
 
 import AccessibilityElement
 import Foundation
+import os
 
 public actor WebArea<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
+    private var logger: Logger {
+        Loggers.Controller.webArea
+    }
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,

Sources/ScreenReader/Controllers/Window.swift

@@ -11,9 +11,16 @@ import os
 public actor Window<ObserverType: Observer>: Controller where ObserverType.ObserverElement: Hashable {
     public typealias ElementType = ObserverType.ObserverElement
     public let element: ElementType
+
     private unowned let application: Application<ObserverType>
+
     let observer: ApplicationObserver<ObserverType>
     private var observerTokens: [ApplicationObserver<ObserverType>.ObserverToken] = []
+
+    private var logger: Logger {
+        Loggers.Controller.window
+    }
+
     public init(
         element: ElementType,
         application: Application<ObserverType>,