Merge pull request #33 from mgxv/refactor/dedup-app-support-url

Extract shared Application Support URL resolution

Author: mgxv

Sources/AppOverrides.swift

@@ -26,15 +26,7 @@ extension AppOverrides: Codable {
 
 enum AppOverridesState {
     private static func url() -> URL? {
-        guard let appSupport = try? FileManager.default.url(
-            for: .applicationSupportDirectory,
-            in: .userDomainMask,
-            appropriateFor: nil,
-            create: false,
-        ) else { return nil }
-        return appSupport
-            .appendingPathComponent(Log.subsystem, isDirectory: true)
-            .appendingPathComponent("apps.json")
+        subsystemSupportURL("apps.json")
     }
 
     static func read() -> AppOverrides {

Sources/HotkeyWatcher.swift

@@ -127,15 +127,7 @@ final class HotkeyWatcher {
 /// shutdown so a stale value doesn't outlive the daemon.
 enum HotkeyState {
     private static func url() -> URL? {
-        guard let appSupport = try? FileManager.default.url(
-            for: .applicationSupportDirectory,
-            in: .userDomainMask,
-            appropriateFor: nil,
-            create: false,
-        ) else { return nil }
-        return appSupport
-            .appendingPathComponent(Log.subsystem, isDirectory: true)
-            .appendingPathComponent("hotkey.state")
+        subsystemSupportURL("hotkey.state")
     }
 
     static func write(_ state: String) {

Sources/Mode.swift

@@ -12,15 +12,7 @@ enum Mode: String {
 /// Default is `.smart` when the file is missing or malformed.
 enum ModeState {
     private static func url() -> URL? {
-        guard let appSupport = try? FileManager.default.url(
-            for: .applicationSupportDirectory,
-            in: .userDomainMask,
-            appropriateFor: nil,
-            create: false,
-        ) else { return nil }
-        return appSupport
-            .appendingPathComponent(Log.subsystem, isDirectory: true)
-            .appendingPathComponent("mode")
+        subsystemSupportURL("mode")
     }
 
     static func read() -> Mode {

Sources/Paths.swift

@@ -1,8 +1,23 @@
-// Filesystem paths used at runtime to locate the vendored
-// mediaremote-adapter script and MediaRemoteAdapter.framework.
+// Filesystem path resolution used at runtime: the vendored
+// mediaremote-adapter artifacts, and the Application Support directory
+// backing the on-disk `*State` stores.
 
 import Foundation
 
+/// `~/Library/Application Support/<subsystem>/<name>`, or nil if it
+/// can't be resolved. Shared by the `*State` stores.
+func subsystemSupportURL(_ name: String) -> URL? {
+    guard let appSupport = try? FileManager.default.url(
+        for: .applicationSupportDirectory,
+        in: .userDomainMask,
+        appropriateFor: nil,
+        create: false,
+    ) else { return nil }
+    return appSupport
+        .appendingPathComponent(Log.subsystem, isDirectory: true)
+        .appendingPathComponent(name)
+}
+
 struct AdapterArtifacts {
     let scriptPath: String
     let frameworkPath: String