Skip to content

Commit 32a3327

Browse files
committed
Review fixes: uv.lock, JSON schema rename leftovers, Swift OIDA_ env + repo path
- Regenerated uv.lock (akousma path dep + shazamio optional extra resolved). - perception-report.schema.json: title/description still said hmm (JSON was missed by the rename file-set) — now oida. - macOS shell: hmmDataDirectory/hmmAudioDirectory → oidaDataDirectory/ oidaAudioDirectory; env now reads OIDA_DATA_DIR/OIDA_AUDIO_DIR first (legacy HMM_/AEAR_ still honored) and the daemon child env exports OIDA_*; fixed packaged-app repo fallback Documents/oida/oida → Documents/SFL/oida. - swift build clean; 113 unit tests pass. Legacy Application Support/hmm data migrated to Application Support/oida on this machine (hmm left as backup).
1 parent 6e5d570 commit 32a3327

6 files changed

Lines changed: 638 additions & 55 deletions

File tree

apps/macos/Sources/OidaMacOS/Services/DaemonSupervisor.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ final class DaemonSupervisor {
126126
? homebrewLibPaths.joined(separator: ":")
127127
: "\(homebrewLibPaths.joined(separator: ":")):\(existingDylibPath)"
128128
}
129-
if environment["HMM_DATA_DIR"] == nil, environment["AEAR_DATA_DIR"] == nil {
130-
environment["HMM_DATA_DIR"] = hmmDataDirectory().path
129+
if environment["OIDA_DATA_DIR"] == nil, environment["HMM_DATA_DIR"] == nil, environment["AEAR_DATA_DIR"] == nil {
130+
environment["OIDA_DATA_DIR"] = oidaDataDirectory().path
131131
}
132-
if environment["HMM_AUDIO_DIR"] == nil, environment["AEAR_AUDIO_DIR"] == nil {
133-
environment["HMM_AUDIO_DIR"] = hmmAudioDirectory().path
132+
if environment["OIDA_AUDIO_DIR"] == nil, environment["HMM_AUDIO_DIR"] == nil, environment["AEAR_AUDIO_DIR"] == nil {
133+
environment["OIDA_AUDIO_DIR"] = oidaAudioDirectory().path
134134
}
135135
return environment
136136
}

apps/macos/Sources/OidaMacOS/Services/MicTapManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class MicTapManager {
5454
queue.sync { ringSamples.removeAll(keepingCapacity: true) }
5555
}
5656

57-
func writeRecentAudio(seconds: Double, audioDirectory: URL = hmmAudioDirectory()) throws -> URL {
57+
func writeRecentAudio(seconds: Double, audioDirectory: URL = oidaAudioDirectory()) throws -> URL {
5858
guard isCapturing else { throw MicTapError.notCapturing }
5959
let requestedSeconds = max(0.25, min(seconds, ringMaxSeconds))
6060
let snapshot: (samples: [Float], sampleRate: Double) = queue.sync {

apps/macos/Sources/OidaMacOS/Services/SystemAudioTapManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ final class SystemAudioTapManager: NSObject {
123123
onStateChange?(.stopped)
124124
}
125125

126-
func writeRecentAudio(seconds: Double, audioDirectory: URL = hmmAudioDirectory()) throws -> NativeSystemAudioCapture {
126+
func writeRecentAudio(seconds: Double, audioDirectory: URL = oidaAudioDirectory()) throws -> NativeSystemAudioCapture {
127127
guard isCapturing else { throw SystemAudioTapCaptureError.notCapturing }
128128
let sourceRoute = currentSourceRoute ?? fallbackDisplayMixRoute()
129129
let requestedSeconds = max(0.25, min(seconds, ringMaxSeconds))

apps/macos/Sources/OidaMacOS/Support/RepositoryLocator.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import Foundation
22

3-
func hmmDataDirectory() -> URL {
3+
func oidaDataDirectory() -> URL {
44
let environment = ProcessInfo.processInfo.environment
5-
if let configured = environment["HMM_DATA_DIR"] ?? environment["AEAR_DATA_DIR"], !configured.isEmpty {
5+
if let configured = environment["OIDA_DATA_DIR"] ?? environment["HMM_DATA_DIR"] ?? environment["AEAR_DATA_DIR"],
6+
!configured.isEmpty {
67
return URL(fileURLWithPath: configured, isDirectory: true)
78
.standardizedFileURL
89
}
@@ -11,9 +12,10 @@ func hmmDataDirectory() -> URL {
1112
return applicationSupport.appendingPathComponent("oida", isDirectory: true)
1213
}
1314

14-
func hmmAudioDirectory() -> URL {
15+
func oidaAudioDirectory() -> URL {
1516
let environment = ProcessInfo.processInfo.environment
16-
if let configured = environment["HMM_AUDIO_DIR"] ?? environment["AEAR_AUDIO_DIR"], !configured.isEmpty {
17+
if let configured = environment["OIDA_AUDIO_DIR"] ?? environment["HMM_AUDIO_DIR"] ?? environment["AEAR_AUDIO_DIR"],
18+
!configured.isEmpty {
1719
return URL(fileURLWithPath: (configured as NSString).expandingTildeInPath, isDirectory: true)
1820
.standardizedFileURL
1921
}
@@ -29,7 +31,7 @@ func findOidaRepositoryRoot() -> URL? {
2931
URL(fileURLWithPath: fileManager.currentDirectoryPath),
3032
// Known checkout location so a packaged app (run from /Applications)
3133
// can still supervise the daemon.
32-
URL(fileURLWithPath: NSHomeDirectory()).appendingPathComponent("Documents/oida/oida", isDirectory: true)
34+
URL(fileURLWithPath: NSHomeDirectory()).appendingPathComponent("Documents/SFL/oida", isDirectory: true)
3335
].compactMap { $0 }
3436

3537
for candidate in candidates {

oida/schemas/perception-report.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json-schema.org/draft/2020-12/schema",
33
"$id": "https://oida.local/schemas/perception-report.schema.json",
4-
"title": "hmm PerceptionReport",
4+
"title": "oida PerceptionReport",
55
"type": "object",
66
"additionalProperties": false,
77
"required": [
@@ -413,7 +413,7 @@
413413
"object",
414414
"null"
415415
],
416-
"description": "Deterministic signal-level reading from measured DSP features (hmm signal listener)."
416+
"description": "Deterministic signal-level reading from measured DSP features (oida signal listener)."
417417
},
418418
"moss_passes": {
419419
"type": "array",

0 commit comments

Comments
 (0)