Phase 9: Einrichtung, Autostart, Notarisierung — und die Mixer-Optik
Die Einrichtung beim ersten Start erklärt jede der vier Sachen einzeln und fragt jede einzeln an. Vier Systemdialoge hintereinander wären der übliche Weg und der falsche: wer nicht weiß wofür, klickt viermal „Nicht erlauben", und danach fragt macOS nie wieder. Sie kommt beim ersten Start immer, auch wenn zufällig schon alles erlaubt ist — sie erklärt auch den Helfer und den Autostart. Beim Autostart ist `requiresApproval` der Zustand, der weh tut. Wer das Anmeldeobjekt in den Systemeinstellungen abgeschaltet hat, kann in Onyx auf den Schalter drücken, so oft er will. Als „aus" angezeigt führt das in eine Schleife, also steht dort jetzt, wo es weitergeht. Der Mixer verliert den Schalter je Programm. Zehn Mini-Schalter untereinander sind das, was den Eindruck macht; am Regler zu ziehen ist ohnehin die Entscheidung, dieses Programm zu regeln, und der große Ausschalter stellt alles zurück. Der Regler ist selbst gezeichnet — der Systemregler bringt sein eigenes Erscheinungsbild mit und kann nicht zeigen, worauf es hier ankommt: den Pegel und die Grenze bei 100 %. Der Pegel wird im selben Durchlauf gemessen, in dem verstärkt wird, und über `Atomic` weitergereicht. Eine gewöhnliche Eigenschaft wäre ein Wettlauf, eine Sperre im Audiothread der klassische Weg zu Aussetzern. Dabei fällt das `Date()` aus dem Echtzeitpfad, das dort nie hingehört hat. Zwei Funde beim Bauen des Release-Wegs, beide hätten erst nach dem Hochladen zur Ablehnung geführt: der Helfer wurde ohne sicheren Zeitstempel signiert, und das Adapter-Framework ad-hoc. Beides gilt jetzt nur noch im Debug. Scripts/release.sh prüft Zertifikat und Notarisierungsprofil vorweg, statt nach zehn Minuten Bauen zu scheitern. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
@@ -27,6 +27,9 @@ public final class AudioMixer {
|
||||
private var taps: [String: ProcessTap] = [:]
|
||||
private var refreshTimer: Timer?
|
||||
private var watchdogTimer: Timer?
|
||||
private var levelTimer: Timer?
|
||||
/// Der letzte Ausschlag je Programm, 0…1.
|
||||
public private(set) var levels: [String: Double] = [:]
|
||||
private let defaults: UserDefaults
|
||||
/// Wann ein Prozess zuletzt Ton ausgegeben hat. Ohne dieses Gedächtnis
|
||||
/// verschwindet ein pausiertes Programm sofort aus der Liste.
|
||||
@@ -75,8 +78,10 @@ public final class AudioMixer {
|
||||
isEnabled = false
|
||||
refreshTimer?.invalidate(); refreshTimer = nil
|
||||
watchdogTimer?.invalidate(); watchdogTimer = nil
|
||||
levelTimer?.invalidate(); levelTimer = nil
|
||||
for tap in taps.values { tap.stop() }
|
||||
taps.removeAll()
|
||||
levels = [:]
|
||||
lastError = nil
|
||||
log.notice("Mixer ausgeschaltet — Tonweg unverändert")
|
||||
}
|
||||
@@ -99,6 +104,7 @@ public final class AudioMixer {
|
||||
isManaged: managed.contains(process.bundleID))
|
||||
}
|
||||
syncTaps()
|
||||
startLevelTimerIfNeeded()
|
||||
}
|
||||
|
||||
/// Legt Taps an und ab, sodass sie zu `managed` und den laufenden
|
||||
@@ -146,7 +152,7 @@ public final class AudioMixer {
|
||||
private func checkForStalledTaps() {
|
||||
for (bundleID, tap) in taps {
|
||||
guard tap.isRunning,
|
||||
Date().timeIntervalSince(tap.lastAudioAt) > 30,
|
||||
tap.secondsSinceAudio > 30,
|
||||
processes.first(where: { $0.bundleID == bundleID })?.isPlaying == true
|
||||
else { continue }
|
||||
|
||||
@@ -181,6 +187,41 @@ public final class AudioMixer {
|
||||
|
||||
public func isManaged(_ bundleID: String) -> Bool { managed.contains(bundleID) }
|
||||
|
||||
/// Der Ausschlag eines Programms, 0…1 — für die Pegelanzeige.
|
||||
public func level(for bundleID: String) -> Double { levels[bundleID] ?? 0 }
|
||||
|
||||
/// Holt die Ausschläge ab.
|
||||
///
|
||||
/// Läuft nur, solange überhaupt Taps bestehen: ohne abgegriffenes Programm
|
||||
/// gibt es nichts zu messen, und ein Zeitgeber, der 15-mal pro Sekunde
|
||||
/// nichts tut, gehört nicht in eine App, die im Hintergrund ruhig sein soll.
|
||||
private func sampleLevels() {
|
||||
guard !taps.isEmpty else {
|
||||
if !levels.isEmpty { levels = [:] }
|
||||
levelTimer?.invalidate()
|
||||
levelTimer = nil
|
||||
return
|
||||
}
|
||||
var next: [String: Double] = [:]
|
||||
for (bundleID, tap) in taps {
|
||||
let peak = Double(tap.takePeak())
|
||||
let previous = levels[bundleID] ?? 0
|
||||
// Schnell hoch, langsam runter. Ein Pegel, der jedem Puffer folgt,
|
||||
// flackert; einer, der nur fällt, verpasst die Spitzen.
|
||||
next[bundleID] = peak > previous ? peak : previous * 0.72
|
||||
}
|
||||
levels = next
|
||||
}
|
||||
|
||||
private func startLevelTimerIfNeeded() {
|
||||
guard levelTimer == nil, !taps.isEmpty else { return }
|
||||
let timer = Timer(timeInterval: 1.0 / 15, repeats: true) { [weak self] _ in
|
||||
Task { @MainActor in self?.sampleLevels() }
|
||||
}
|
||||
RunLoop.main.add(timer, forMode: .common)
|
||||
levelTimer = timer
|
||||
}
|
||||
|
||||
public func setManaged(_ isManaged: Bool, for bundleID: String) {
|
||||
if isManaged { managed.insert(bundleID) } else { managed.remove(bundleID) }
|
||||
persist()
|
||||
|
||||
@@ -1,109 +1,123 @@
|
||||
{
|
||||
"sourceLanguage" : "en",
|
||||
"strings" : {
|
||||
"" : {
|
||||
|
||||
"sourceLanguage": "en",
|
||||
"strings": {
|
||||
"": {},
|
||||
"%lld %%": {
|
||||
"comment": "A row of controls for adjusting the volume and muting a process.",
|
||||
"isCommentAutoGenerated": true
|
||||
},
|
||||
"%lld %%" : {
|
||||
"comment" : "A row of controls for adjusting the volume and muting a process.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"mixer.name" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Audio-Mixer"
|
||||
"mixer.name": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Audio-Mixer"
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Audio mixer"
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Audio mixer"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.noProcesses" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Kein Programm gibt gerade Ton aus"
|
||||
"mixer.noProcesses": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Kein Programm gibt gerade Ton aus"
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "No app is playing audio"
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "No app is playing audio"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.off" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Mixer ausschalten"
|
||||
"mixer.off": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Mixer ausschalten"
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Turn mixer off"
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Turn mixer off"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.off.explain" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Regelt die Lautstärke einzelner Programme, auch über 100 %."
|
||||
"mixer.off.explain": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Lautstärke einzelner Programme regeln, auch über 100 %."
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Sets the volume of individual apps, including above 100%."
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Set the volume of individual apps, including above 100 %."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.off.warning" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Dafür greift Onyx in den Tonweg der ausgewählten Programme ein. Beim Ausschalten wird der ursprüngliche Zustand sofort wiederhergestellt."
|
||||
"mixer.off.warning": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx leitet den Ton der geregelten Programme um. Beim Ausschalten ist der ursprüngliche Weg sofort wiederhergestellt."
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Onyx intercepts the audio path of the selected apps to do this. Turning it off restores the original state immediately."
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx routes the audio of the apps you control. Turning the mixer off restores the original path immediately."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.on" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Mixer einschalten"
|
||||
"mixer.on": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Mixer einschalten"
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Turn mixer on"
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Turn mixer on"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mixer.release": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Nicht mehr regeln"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Stop controlling"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"version" : "1.1"
|
||||
}
|
||||
"version": "1.1"
|
||||
}
|
||||
|
||||
@@ -15,15 +15,17 @@ public struct MixerView: View {
|
||||
}
|
||||
|
||||
public var body: some View {
|
||||
VStack(alignment: .leading, spacing: compact ? 6 : 10) {
|
||||
VStack(alignment: .leading, spacing: compact ? 10 : 14) {
|
||||
if mixer.isEnabled {
|
||||
if mixer.processes.isEmpty {
|
||||
Text("mixer.noProcesses", bundle: .module)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(Onyx.Color.textTertiary)
|
||||
.frame(maxWidth: .infinity, alignment: .center)
|
||||
.padding(.vertical, 8)
|
||||
} else {
|
||||
ForEach(mixer.processes.prefix(compact ? 4 : 10)) { process in
|
||||
ProcessRow(mixer: mixer, process: process, compact: compact)
|
||||
ProcessRow(mixer: mixer, process: process)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,40 +34,42 @@ public struct MixerView: View {
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
|
||||
Divider().overlay(Onyx.Color.hairline)
|
||||
// Der Notausschalter gehört sichtbar dazu, nicht in ein Menü:
|
||||
// wenn der Ton weg ist, ist das der Knopf, den man sucht.
|
||||
Button { mixer.disable() } label: {
|
||||
// Label(_:systemImage:) kennt kein Bundle und sucht immer
|
||||
// im Hauptbundle - die Strings liegen aber im Modulbundle.
|
||||
// Ohne den Umweg über Text steht im Knopf „mixer.off".
|
||||
Label {
|
||||
Text("mixer.off", bundle: .module).font(Onyx.Font.caption)
|
||||
} icon: {
|
||||
Image(systemName: "power")
|
||||
}
|
||||
Text("mixer.off", bundle: .module)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(Onyx.Color.textSecondary)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Onyx.Color.textSecondary)
|
||||
.padding(.top, 2)
|
||||
} else {
|
||||
OffState(mixer: mixer, compact: compact)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.animation(Onyx.Motion.value, value: mixer.processes.count)
|
||||
}
|
||||
}
|
||||
|
||||
/// Der ausgeschaltete Zustand erklärt, worauf man sich einlässt.
|
||||
/// Der ausgeschaltete Zustand erklärt, worauf man sich einlässt — in zwei
|
||||
/// Sätzen, nicht in einem Absatz. Wer vier Zeilen lesen muss, bevor er einen
|
||||
/// Regler sieht, liest sie nicht.
|
||||
private struct OffState: View {
|
||||
let mixer: AudioMixer
|
||||
let compact: Bool
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
Text("mixer.off.explain", bundle: .module)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(Onyx.Color.textSecondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "slider.horizontal.3")
|
||||
.font(.system(size: 15, weight: .light))
|
||||
.foregroundStyle(Onyx.Color.textTertiary)
|
||||
Text("mixer.off.explain", bundle: .module)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(Onyx.Color.textSecondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
|
||||
if !compact {
|
||||
Text("mixer.off.warning", bundle: .module)
|
||||
@@ -75,14 +79,14 @@ private struct OffState: View {
|
||||
}
|
||||
|
||||
Button { mixer.enable() } label: {
|
||||
Label {
|
||||
Text("mixer.on", bundle: .module).font(Onyx.Font.caption)
|
||||
} icon: {
|
||||
Image(systemName: "slider.horizontal.3")
|
||||
}
|
||||
Text("mixer.on", bundle: .module)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(Onyx.Color.surface)
|
||||
.padding(.horizontal, 10)
|
||||
.padding(.vertical, 4)
|
||||
.background(Onyx.Color.accent, in: .capsule)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Onyx.Color.accent)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -90,83 +94,78 @@ private struct OffState: View {
|
||||
private struct ProcessRow: View {
|
||||
let mixer: AudioMixer
|
||||
let process: AudioProcess
|
||||
let compact: Bool
|
||||
@State private var isHovered = false
|
||||
|
||||
private var managed: Bool { mixer.isManaged(process.bundleID) }
|
||||
private var muted: Bool { mixer.isMuted(process.bundleID) }
|
||||
private var volume: Double { mixer.volume(for: process.bundleID) }
|
||||
|
||||
var body: some View {
|
||||
let managed = mixer.isManaged(process.bundleID)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
HStack(spacing: 6) {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack(spacing: 7) {
|
||||
icon
|
||||
Text(process.name)
|
||||
.font(Onyx.Font.caption)
|
||||
.foregroundStyle(process.isPlaying ? Onyx.Color.textPrimary
|
||||
: Onyx.Color.textSecondary)
|
||||
.foregroundStyle(managed ? Onyx.Color.textPrimary : Onyx.Color.textSecondary)
|
||||
.lineLimit(1)
|
||||
// In der Mitte kürzen statt am Ende: bei zwei ähnlichen
|
||||
// Namen ist das Ende oft das Unterscheidende.
|
||||
.truncationMode(.middle)
|
||||
.layoutPriority(1)
|
||||
|
||||
if process.isPlaying {
|
||||
Circle().fill(Onyx.Color.positive).frame(width: 5, height: 5)
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
Spacer(minLength: 4)
|
||||
|
||||
// Die Prozentzahl erscheint erst, wenn sie etwas aussagt.
|
||||
// Bei jedem Programm „100 %" zu zeigen ist Zahlenrauschen.
|
||||
if managed {
|
||||
Button {
|
||||
mixer.setMuted(!mixer.isMuted(process.bundleID), for: process.bundleID)
|
||||
} label: {
|
||||
Image(systemName: mixer.isMuted(process.bundleID)
|
||||
? "speaker.slash.fill" : "speaker.wave.2.fill")
|
||||
.font(.system(size: 10))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(mixer.isMuted(process.bundleID)
|
||||
? Onyx.Color.critical : Onyx.Color.textTertiary)
|
||||
Text("\(Int(volume * 100)) %")
|
||||
.font(Onyx.Font.metricSmall)
|
||||
.foregroundStyle(volume > 1 ? Onyx.Color.warning : Onyx.Color.textTertiary)
|
||||
.monospacedDigit()
|
||||
.transition(.opacity)
|
||||
}
|
||||
|
||||
// Erst wenn ein Programm ausgewählt ist, wird sein Ton
|
||||
// abgegriffen. Alles andere läuft unverändert am Mixer vorbei.
|
||||
Toggle("", isOn: Binding(
|
||||
get: { managed },
|
||||
set: { mixer.setManaged($0, for: process.bundleID) }))
|
||||
.toggleStyle(.switch)
|
||||
.controlSize(.mini)
|
||||
.labelsHidden()
|
||||
}
|
||||
|
||||
if managed {
|
||||
// Die Prozentzahl steht beim Regler, nicht beim Namen: oben ist
|
||||
// sie die Breite, die den Namen abschneidet, hier gehört sie
|
||||
// ohnehin hin.
|
||||
HStack(spacing: 6) {
|
||||
Slider(value: Binding(
|
||||
get: { mixer.volume(for: process.bundleID) },
|
||||
set: { mixer.setVolume($0, for: process.bundleID) }),
|
||||
in: 0...Gain.maximumVolume)
|
||||
.controlSize(.mini)
|
||||
.disabled(mixer.isMuted(process.bundleID))
|
||||
.overlay(alignment: .leading) {
|
||||
// Markierung bei 100 %: darüber wird verstärkt, und
|
||||
// man soll sehen, wann man diese Grenze überschreitet.
|
||||
GeometryReader { geometry in
|
||||
Rectangle()
|
||||
.fill(Onyx.Color.hairline)
|
||||
.frame(width: 1, height: 8)
|
||||
.offset(x: geometry.size.width / Gain.maximumVolume, y: 4)
|
||||
}
|
||||
}
|
||||
HStack(spacing: 7) {
|
||||
VolumeBar(
|
||||
volume: volume,
|
||||
level: mixer.level(for: process.bundleID),
|
||||
isActive: managed && !muted,
|
||||
onChange: { newValue in
|
||||
// Am Regler zu ziehen **ist** die Entscheidung, dieses
|
||||
// Programm zu regeln. Ein zusätzlicher Schalter davor
|
||||
// wäre eine Hürde, die nichts schützt — der große
|
||||
// Ausschalter unten stellt ohnehin alles zurück.
|
||||
if !managed { mixer.setManaged(true, for: process.bundleID) }
|
||||
mixer.setVolume(newValue, for: process.bundleID)
|
||||
})
|
||||
|
||||
Text("\(Int(mixer.volume(for: process.bundleID) * 100)) %")
|
||||
.font(Onyx.Font.metricSmall)
|
||||
.foregroundStyle(mixer.volume(for: process.bundleID) > 1
|
||||
? Onyx.Color.warning : Onyx.Color.textTertiary)
|
||||
// Feste Breite, sonst wandert der Regler beim Ziehen.
|
||||
.frame(width: 34, alignment: .trailing)
|
||||
Button {
|
||||
if !managed { mixer.setManaged(true, for: process.bundleID) }
|
||||
mixer.setMuted(!muted, for: process.bundleID)
|
||||
} label: {
|
||||
Image(systemName: muted ? "speaker.slash.fill" : "speaker.wave.2.fill")
|
||||
.font(.system(size: 9))
|
||||
.frame(width: 12)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(muted ? Onyx.Color.critical
|
||||
: (managed ? Onyx.Color.textTertiary
|
||||
: Onyx.Color.textTertiary.opacity(0.5)))
|
||||
}
|
||||
}
|
||||
.contentShape(.rect)
|
||||
.onHover { isHovered = $0 }
|
||||
.contextMenu {
|
||||
if managed {
|
||||
Button {
|
||||
mixer.setManaged(false, for: process.bundleID)
|
||||
} label: {
|
||||
Text("mixer.release", bundle: .module)
|
||||
}
|
||||
}
|
||||
}
|
||||
.animation(Onyx.Motion.value, value: managed)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
@@ -174,15 +173,98 @@ private struct ProcessRow: View {
|
||||
// Auch Hilfsprozesse bekommen das Symbol ihres Programms — sonst steht
|
||||
// neben „Google Chrome" ein leerer Platzhalter.
|
||||
if let image = ProcessNaming.icon(bundleID: process.bundleID, pid: process.pid) {
|
||||
Image(nsImage: image).resizable().frame(width: 14, height: 14)
|
||||
Image(nsImage: image)
|
||||
.resizable().frame(width: 15, height: 15)
|
||||
.opacity(managed ? 1 : 0.65)
|
||||
} else {
|
||||
Image(systemName: "app.dashed")
|
||||
.font(.system(size: 11))
|
||||
.foregroundStyle(Onyx.Color.textTertiary)
|
||||
.frame(width: 15, height: 15)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Der Lautstärkeregler.
|
||||
///
|
||||
/// Selbst gezeichnet statt `Slider`: der Systemregler bringt sein eigenes
|
||||
/// Erscheinungsbild mit, das auf der dunklen Fläche wie ein Fremdkörper sitzt.
|
||||
/// Und er kann nicht zeigen, was hier den Unterschied macht — den Pegel und
|
||||
/// die Grenze bei 100 %.
|
||||
private struct VolumeBar: View {
|
||||
let volume: Double
|
||||
let level: Double
|
||||
let isActive: Bool
|
||||
let onChange: (Double) -> Void
|
||||
|
||||
@State private var isDragging = false
|
||||
|
||||
private let trackHeight: CGFloat = 5
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
let width = geometry.size.width
|
||||
let fraction = min(max(volume / Gain.maximumVolume, 0), 1)
|
||||
let fillWidth = width * fraction
|
||||
|
||||
ZStack(alignment: .leading) {
|
||||
Capsule()
|
||||
.fill(Onyx.Color.elevated)
|
||||
.frame(height: trackHeight)
|
||||
|
||||
// Markierung bei 100 %: darüber wird verstärkt, und man soll
|
||||
// sehen, wann man diese Grenze überschreitet.
|
||||
Rectangle()
|
||||
.fill(Onyx.Color.hairline)
|
||||
.frame(width: 1, height: trackHeight + 3)
|
||||
.offset(x: width / Gain.maximumVolume)
|
||||
|
||||
Capsule()
|
||||
.fill(volume > 1 ? Onyx.Color.warning : Onyx.Color.accent)
|
||||
.frame(width: fillWidth, height: trackHeight)
|
||||
.opacity(isActive ? 1 : 0.28)
|
||||
|
||||
// Der Pegel läuft **im** Regler mit, nicht daneben: eine
|
||||
// zweite Leiste pro Zeile wäre doppelt so viel Grafik für
|
||||
// dieselbe Auskunft.
|
||||
if isActive, level > 0.001 {
|
||||
Capsule()
|
||||
.fill(.white.opacity(0.35))
|
||||
.frame(width: fillWidth * meterFraction, height: trackHeight)
|
||||
.blendMode(.plusLighter)
|
||||
.allowsHitTesting(false)
|
||||
}
|
||||
|
||||
Circle()
|
||||
.fill(Onyx.Color.textPrimary)
|
||||
.frame(width: isDragging ? 10 : 8, height: isDragging ? 10 : 8)
|
||||
.shadow(color: .black.opacity(0.4), radius: 1, y: 0.5)
|
||||
.offset(x: fillWidth - (isDragging ? 5 : 4))
|
||||
.opacity(isActive ? 1 : 0.5)
|
||||
}
|
||||
.frame(height: 14)
|
||||
.contentShape(.rect)
|
||||
.gesture(
|
||||
DragGesture(minimumDistance: 0)
|
||||
.onChanged { value in
|
||||
isDragging = true
|
||||
let position = min(max(value.location.x / width, 0), 1)
|
||||
onChange(position * Gain.maximumVolume)
|
||||
}
|
||||
.onEnded { _ in isDragging = false })
|
||||
}
|
||||
.frame(height: 14)
|
||||
.animation(Onyx.Motion.value, value: isDragging)
|
||||
}
|
||||
|
||||
/// Ausschläge sind linear in der Amplitude und damit optisch nutzlos:
|
||||
/// halb so laut sieht aus wie fast nichts. Die Wurzel spreizt den unteren
|
||||
/// Bereich so weit, dass man überhaupt etwas sieht.
|
||||
private var meterFraction: Double {
|
||||
min(1, sqrt(min(max(level, 0), 1)))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Widget
|
||||
|
||||
public struct AudioMixerWidget: OnyxWidget {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Foundation
|
||||
import Synchronization
|
||||
import AudioToolbox
|
||||
import CoreAudio
|
||||
import AVFoundation
|
||||
@@ -34,15 +35,43 @@ final class ProcessTap {
|
||||
/// aber ein einzelner `Float` wird auf arm64 atomar geschrieben.
|
||||
private(set) var gain: Float = 1
|
||||
|
||||
/// Der höchste Ausschlag seit dem letzten Abholen — als Bitmuster, weil
|
||||
/// `Atomic` keine Fließkommazahlen führt.
|
||||
///
|
||||
/// Sperrenfrei und damit im Echtzeitpfad erlaubt. Eine gewöhnliche
|
||||
/// Eigenschaft zu beschreiben wäre ein Wettlauf mit dem Leser, und eine
|
||||
/// Sperre im Audiothread ist der klassische Weg zu Aussetzern.
|
||||
private let peakBits = Atomic<UInt32>(0)
|
||||
|
||||
/// Wann zuletzt Ton kam — in Sekunden seit dem Programmstart, damit der
|
||||
/// Echtzeitpfad keine `Date` anfassen muss.
|
||||
private let lastAudioUptime = Atomic<UInt64>(0)
|
||||
|
||||
private var tapID = AudioObjectID(kAudioObjectUnknown)
|
||||
private var aggregateID = AudioObjectID(kAudioObjectUnknown)
|
||||
private var procID: AudioDeviceIOProcID?
|
||||
private let tapUUID = UUID()
|
||||
|
||||
/// Wann zuletzt ein Puffer mit Inhalt kam — für den Wachhund.
|
||||
private(set) var lastAudioAt = Date()
|
||||
private(set) var isRunning = false
|
||||
|
||||
/// Wie lange dieser Tap schon nur Stille liefert.
|
||||
var secondsSinceAudio: TimeInterval {
|
||||
let stored = lastAudioUptime.load(ordering: .relaxed)
|
||||
guard stored > 0 else { return 0 }
|
||||
return max(0, Self.uptime() - Double(stored) / 1000)
|
||||
}
|
||||
|
||||
/// Der Ausschlag seit dem letzten Abruf, 0…1. Holt ihn ab und setzt zurück,
|
||||
/// damit die Anzeige abfällt, statt auf dem Höchstwert stehen zu bleiben.
|
||||
func takePeak() -> Float {
|
||||
Float(bitPattern: peakBits.exchange(0, ordering: .relaxed))
|
||||
}
|
||||
|
||||
private static func uptime() -> Double {
|
||||
Double(DispatchTime.now().uptimeNanoseconds) / 1_000_000_000
|
||||
}
|
||||
|
||||
init(process: AudioProcess) {
|
||||
self.process = process
|
||||
}
|
||||
@@ -111,7 +140,7 @@ final class ProcessTap {
|
||||
}
|
||||
|
||||
isRunning = true
|
||||
lastAudioAt = Date()
|
||||
lastAudioUptime.store(UInt64(Self.uptime() * 1000), ordering: .relaxed)
|
||||
log.notice("Tap aktiv für \(self.process.name, privacy: .public)")
|
||||
}
|
||||
|
||||
@@ -126,7 +155,7 @@ final class ProcessTap {
|
||||
let outputList = UnsafeMutableAudioBufferListPointer(output)
|
||||
|
||||
let factor = gain
|
||||
var sawAudio = false
|
||||
var peak: Float = 0
|
||||
|
||||
for (index, outputBuffer) in outputList.enumerated() {
|
||||
guard index < inputList.count,
|
||||
@@ -143,12 +172,23 @@ final class ProcessTap {
|
||||
// Nur begrenzen, wenn wirklich verstärkt wird — unterhalb der
|
||||
// Schwelle ist die Kennlinie ohnehin die Identität, und im
|
||||
// Echtzeitpfad zählt jede eingesparte Rechnung.
|
||||
outputSamples[sample] = factor > 1 ? SoftClip.apply(value) : value
|
||||
if !sawAudio, value != 0 { sawAudio = true }
|
||||
let limited = factor > 1 ? SoftClip.apply(value) : value
|
||||
outputSamples[sample] = limited
|
||||
// Der Ausschlag wird im selben Durchlauf mitgenommen: ein
|
||||
// zweiter Durchgang nur zum Messen wäre im Echtzeitpfad die
|
||||
// teuerste Art, an dieselbe Zahl zu kommen.
|
||||
let magnitude = abs(limited)
|
||||
if magnitude > peak { peak = magnitude }
|
||||
}
|
||||
}
|
||||
|
||||
if sawAudio { lastAudioAt = Date() }
|
||||
if peak > 0 {
|
||||
// Höchstwert behalten, bis die Anzeige ihn abholt — sonst
|
||||
// verschluckt ein Puffer mit Stille die Spitze davor.
|
||||
let previous = Float(bitPattern: peakBits.load(ordering: .relaxed))
|
||||
if peak > previous { peakBits.store(peak.bitPattern, ordering: .relaxed) }
|
||||
lastAudioUptime.store(UInt64(Self.uptime() * 1000), ordering: .relaxed)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Abbau
|
||||
|
||||
@@ -1,333 +1,358 @@
|
||||
{
|
||||
"sourceLanguage": "en",
|
||||
"strings": {
|
||||
"": {},
|
||||
"%lld": {
|
||||
"comment": "A day of the month. The argument is the day of the month.",
|
||||
"isCommentAutoGenerated": true
|
||||
"sourceLanguage" : "en",
|
||||
"strings" : {
|
||||
"" : {
|
||||
|
||||
},
|
||||
"calendar.source.apple": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Apple Kalender"
|
||||
"%lld" : {
|
||||
"comment" : "A day of the month. The argument is the day of the month.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"calendar.source.apple" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Apple Kalender"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Apple Calendar"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Apple Calendar"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.both": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Beide"
|
||||
"calendar.source.both" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Beide"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Both"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Both"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.calendarr": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr"
|
||||
"calendar.source.calendarr" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.readOnly": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx liest nur. Es meldet sich nie selbst an und schreibt nie nach Calendarr."
|
||||
"calendar.source.readOnly" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Onyx liest nur. Es meldet sich nie selbst an und schreibt nie nach Calendarr."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx only reads. It never signs in and never writes to Calendarr."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Onyx only reads. It never signs in and never writes to Calendarr."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.coverage": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Bekannt bis %@"
|
||||
"calendar.source.status.coverage" : {
|
||||
"extractionState" : "stale",
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Bekannt bis %@"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Known through %@"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Known through %@"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.incompatible": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr schreibt ein neueres Format. Bitte Onyx aktualisieren."
|
||||
"calendar.source.status.coverage %@" : {
|
||||
"comment" : "A footnote in the Calendarr settings, indicating the end of the coverage window.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"calendar.source.status.incompatible" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr schreibt ein neueres Format. Bitte Onyx aktualisieren."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr writes a newer format. Please update Onyx."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr writes a newer format. Please update Onyx."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.loggedOut": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "In Calendarr nicht angemeldet. Alte Termine werden nicht gezeigt."
|
||||
"calendar.source.status.loggedOut" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "In Calendarr nicht angemeldet. Alte Termine werden nicht gezeigt."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Not signed in to Calendarr. Old events are not shown."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Not signed in to Calendarr. Old events are not shown."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.neverWritten": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr einmal öffnen, damit ein Schnappschuss geschrieben wird."
|
||||
"calendar.source.status.neverWritten" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr einmal öffnen, damit ein Schnappschuss geschrieben wird."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Open Calendarr once so it can write a snapshot."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Open Calendarr once so it can write a snapshot."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.ready": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "%@ Termine, Stand %@"
|
||||
"calendar.source.status.ready" : {
|
||||
"extractionState" : "stale",
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "%@ Termine, Stand %@"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "%@ events, as of %@"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "%@ events, as of %@"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.status.unreadable": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Schnappschuss unlesbar: %@"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Snapshot unreadable: %@"
|
||||
"calendar.source.status.ready %@ %@" : {
|
||||
"comment" : "Die Anzahl der Termine in der The argument is the string “–”.",
|
||||
"isCommentAutoGenerated" : true,
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "calendar.source.status.ready %1$@ %2$@"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"calendar.source.title": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Terminquelle"
|
||||
"calendar.source.status.unreadable" : {
|
||||
"extractionState" : "stale",
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Schnappschuss unlesbar: %@"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendar source"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Snapshot unreadable: %@"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.allDay": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Ganztägig"
|
||||
"calendar.source.status.unreadable %@" : {
|
||||
"comment" : "A warning message explaining that a Calendarr source is not readable. The argument is a human-readable description of the problem.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"calendar.source.title" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Terminquelle"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "All day"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendar source"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.day.unknown": {
|
||||
"comment": "Erklärt einen ausgegrauten Tag: keine Information, nicht keine Termine",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Für diesen Tag liegen keine Daten vor"
|
||||
"widget.calendar.allDay" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Ganztägig"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "No data available for this day"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "All day"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.denied": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Kein Kalenderzugriff.\nIn den Systemeinstellungen erlauben."
|
||||
"widget.calendar.day.unknown" : {
|
||||
"comment" : "Erklärt einen ausgegrauten Tag: keine Information, nicht keine Termine",
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Für diesen Tag liegen keine Daten vor"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "No calendar access.\nAllow it in System Settings."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "No data available for this day"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.incompatible": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx ist zu alt für diese\nCalendarr-Version. Bitte aktualisieren."
|
||||
"widget.calendar.denied" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Kein Kalenderzugriff.\nIn den Systemeinstellungen erlauben."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx is too old for this\nCalendarr version. Please update."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "No calendar access.\nAllow it in System Settings."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.loggedOut": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "In Calendarr anmelden"
|
||||
"widget.calendar.incompatible" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Onyx ist zu alt für diese\nCalendarr-Version. Bitte aktualisieren."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Sign in to Calendarr"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Onyx is too old for this\nCalendarr version. Please update."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.name": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Kalender"
|
||||
"widget.calendar.loggedOut" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "In Calendarr anmelden"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendar"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Sign in to Calendarr"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.neverWritten": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendarr einmal öffnen,\ndamit Termine bereitstehen."
|
||||
"widget.calendar.name" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Kalender"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Open Calendarr once\nso events become available."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendar"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.noUpcoming": {
|
||||
"comment": "Nur zeigen, wenn der Zeitraum wirklich abgedeckt ist",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Nichts mehr für heute"
|
||||
"widget.calendar.neverWritten" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Calendarr einmal öffnen,\ndamit Termine bereitstehen."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Nothing left today"
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Open Calendarr once\nso events become available."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.unreadable": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Termine nicht lesbar.\nKonfigurationsfehler."
|
||||
"widget.calendar.noUpcoming" : {
|
||||
"comment" : "Nur zeigen, wenn der Zeitraum wirklich abgedeckt ist",
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Nichts mehr für heute"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Events unreadable.\nConfiguration error."
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Nothing left today"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"widget.calendar.unreadable" : {
|
||||
"localizations" : {
|
||||
"de" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Termine nicht lesbar.\nKonfigurationsfehler."
|
||||
}
|
||||
},
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Events unreadable.\nConfiguration error."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"version": "1.1"
|
||||
}
|
||||
"version" : "1.1"
|
||||
}
|
||||
35
Packages/OnyxKit/Sources/OnyxCore/LoginItemState.swift
Normal file
35
Packages/OnyxKit/Sources/OnyxCore/LoginItemState.swift
Normal file
@@ -0,0 +1,35 @@
|
||||
import Foundation
|
||||
|
||||
/// Der Zustand des Anmeldeobjekts — die Werte von `SMAppService.Status`,
|
||||
/// aber ohne ServiceManagement, damit sie prüfbar bleiben.
|
||||
public enum LoginItemState: Equatable, Sendable {
|
||||
/// Nicht eingetragen. Ein Aufruf von `register()` behebt es.
|
||||
case notRegistered
|
||||
case enabled
|
||||
/// Eingetragen, aber vom Nutzer in den Systemeinstellungen abgeschaltet.
|
||||
case requiresApproval
|
||||
/// Die App findet sich selbst nicht — ein Installationsproblem.
|
||||
case notFound
|
||||
case unknown
|
||||
|
||||
public init(statusRawValue: Int) {
|
||||
switch statusRawValue {
|
||||
case 0: self = .notRegistered
|
||||
case 1: self = .enabled
|
||||
case 2: self = .requiresApproval
|
||||
case 3: self = .notFound
|
||||
default: self = .unknown
|
||||
}
|
||||
}
|
||||
|
||||
/// Startet Onyx mit? Im Zweifel nein — lieber einen überflüssigen Klick
|
||||
/// verlangen als behaupten, es sei eingeschaltet, und es startet nicht.
|
||||
public var isEnabled: Bool { self == .enabled }
|
||||
|
||||
/// Ob der Weg über die Systemeinstellungen führt.
|
||||
///
|
||||
/// Das ist der Zustand, den man nicht verschweigen darf: wer das
|
||||
/// Anmeldeobjekt dort abgeschaltet hat, kann in Onyx auf den Schalter
|
||||
/// drücken, so oft er will — erneutes Registrieren ändert daran nichts.
|
||||
public var needsSystemSettings: Bool { self == .requiresApproval }
|
||||
}
|
||||
42
Packages/OnyxKit/Tests/OnyxCoreTests/LoginItemTests.swift
Normal file
42
Packages/OnyxKit/Tests/OnyxCoreTests/LoginItemTests.swift
Normal file
@@ -0,0 +1,42 @@
|
||||
import Testing
|
||||
@testable import OnyxCore
|
||||
|
||||
@Suite("Anmeldeobjekt")
|
||||
struct LoginItemTests {
|
||||
|
||||
@Test("Die Zustände von SMAppService werden vollständig abgebildet")
|
||||
func mapsAllStatuses() {
|
||||
#expect(LoginItemState(statusRawValue: 0) == .notRegistered)
|
||||
#expect(LoginItemState(statusRawValue: 1) == .enabled)
|
||||
#expect(LoginItemState(statusRawValue: 2) == .requiresApproval)
|
||||
#expect(LoginItemState(statusRawValue: 3) == .notFound)
|
||||
}
|
||||
|
||||
@Test("Ein unbekannter Zustand gilt nicht als eingeschaltet")
|
||||
func unknownIsNotEnabled() {
|
||||
// Lieber „aus" behaupten und den Nutzer erneut klicken lassen, als
|
||||
// „an" behaupten und Onyx startet nicht mit.
|
||||
#expect(!LoginItemState(statusRawValue: 99).isEnabled)
|
||||
}
|
||||
|
||||
@Test("Genehmigung ausstehend ist nicht dasselbe wie ausgeschaltet")
|
||||
func approvalIsNotOff() {
|
||||
// Der eigentliche Punkt. Wer das Anmeldeobjekt in den
|
||||
// Systemeinstellungen abgeschaltet hat, bekommt `requiresApproval`.
|
||||
// Zeigt Onyx das als „aus", drückt man den Schalter — und nichts
|
||||
// passiert, weil erneutes Registrieren daran nichts ändert. Es hilft
|
||||
// nur der Gang in die Systemeinstellungen, und genau das muss dastehen.
|
||||
let state = LoginItemState.requiresApproval
|
||||
#expect(!state.isEnabled)
|
||||
#expect(state.needsSystemSettings)
|
||||
}
|
||||
|
||||
@Test("Nur der ausgeschaltete Zustand lässt sich durch Registrieren beheben")
|
||||
func onlyNotRegisteredIsFixableInApp() {
|
||||
#expect(!LoginItemState.notRegistered.needsSystemSettings)
|
||||
#expect(!LoginItemState.enabled.needsSystemSettings)
|
||||
// Fehlt die Datei, hilft auch die Systemeinstellung nicht — dann stimmt
|
||||
// etwas mit der Installation nicht.
|
||||
#expect(!LoginItemState.notFound.needsSystemSettings)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user