Refactor/audit quick wins

JammLab/DesignSystem/AppTheme.swift

@@ -65,6 +65,37 @@ struct AppThemeColors: Equatable {
     }
 }
 
+extension NSColor {
+    convenience init?(hexString: String) {
+        let trimmed = hexString.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+        let normalized = trimmed.hasPrefix("#") ? trimmed : "#\(trimmed)"
+        let digits = String(normalized.dropFirst())
+        guard normalized.count == 7, let value = Int(digits, radix: 16) else { return nil }
+
+        let red = CGFloat((value >> 16) & 0xFF) / 255
+        let green = CGFloat((value >> 8) & 0xFF) / 255
+        let blue = CGFloat(value & 0xFF) / 255
+
+        self.init(srgbRed: red, green: green, blue: blue, alpha: 1)
+    }
+
+    var hexString: String? {
+        hexString(using: .sRGB)
+    }
+
+    func hexString(using colorSpace: NSColorSpace, fallsBackToOriginalColor: Bool = false) -> String? {
+        guard let rgbColor = usingColorSpace(colorSpace) ?? (fallsBackToOriginalColor ? self : nil) else {
+            return nil
+        }
+
+        let red = Int((rgbColor.redComponent * 255).rounded())
+        let green = Int((rgbColor.greenComponent * 255).rounded())
+        let blue = Int((rgbColor.blueComponent * 255).rounded())
+
+        return String(format: "#%02X%02X%02X", red, green, blue)
+    }
+}
+
 private struct AppThemeColorsKey: EnvironmentKey {
     static let defaultValue = AppThemeColors.default
 }

JammLab/JammLabApp.swift

@@ -68,6 +68,14 @@ struct JammLabCommands: Commands {
     @ObservedObject var recentProjectsStore: RecentProjectsStore
 
     var body: some Commands {
+        fileCommands
+        editCommands
+        windowCommands
+        toolsCommands
+        helpCommands
+    }
+
+    private var fileCommands: some Commands {
         CommandGroup(replacing: .newItem) {
             Button("New Project") {
                 viewModel.newProject()
@@ -134,7 +142,9 @@ struct JammLabCommands: Commands {
             }
             .disabled(!viewModel.canExportNotation)
         }
+    }
 
+    private var editCommands: some Commands {
         CommandGroup(replacing: .undoRedo) {
             Button("Undo") {
                 viewModel.undoLastEdit()
@@ -148,7 +158,9 @@ struct JammLabCommands: Commands {
             .keyboardShortcut("z", modifiers: [.command, .shift])
             .disabled(!viewModel.canRedo)
         }
+    }
 
+    private var windowCommands: some Commands {
         CommandGroup(after: .toolbar) {
             Button("Show Notation Window") {
                 openWindow(id: AppWindowID.notation)
@@ -160,13 +172,17 @@ struct JammLabCommands: Commands {
             }
             .disabled(!viewModel.canToggleVideoWindow)
         }
+    }
 
+    private var toolsCommands: some Commands {
         CommandMenu("Tools") {
             Button("Tuner") {
                 openWindow(id: "tuner")
             }
         }
+    }
 
+    private var helpCommands: some Commands {
         CommandGroup(replacing: .help) {
             Button("Keyboard Shortcuts") {
                 openWindow(id: "hotkeys-help")

JammLab/Services/AudioAnalyzer.swift

@@ -5,16 +5,6 @@ protocol AudioAnalyzing {
     func analyze(url: URL, includesTempo: Bool, includesKey: Bool) async throws -> AnalysisResult
 }
 
-extension AudioAnalyzing {
-    func analyze(url: URL) async throws -> AnalysisResult {
-        try await analyze(url: url, includesTempo: true, includesKey: true)
-    }
-
-    func analyze(url: URL, includesTempo: Bool) async throws -> AnalysisResult {
-        try await analyze(url: url, includesTempo: includesTempo, includesKey: true)
-    }
-}
-
 enum AudioAnalyzerError: LocalizedError {
     case unsupportedBuffer
     case emptyAudio
@@ -68,21 +58,10 @@ final class AudioAnalyzer: AudioAnalyzing {
 
         try file.read(into: buffer, frameCount: AVAudioFrameCount(framesToRead))
 
-        guard let channels = buffer.floatChannelData else {
+        guard let mono = AudioSampleConverter.monoFloatSamples(from: buffer) else {
             throw AudioAnalyzerError.unsupportedBuffer
         }
 
-        let frameLength = Int(buffer.frameLength)
-        let channelCount = Int(format.channelCount)
-        var mono = Array(repeating: Float(0), count: frameLength)
-
-        for channel in 0..<channelCount {
-            let data = channels[channel]
-            for index in 0..<frameLength {
-                mono[index] += data[index] / Float(channelCount)
-            }
-        }
-
         guard mono.contains(where: { abs($0) > 0.0001 }) else {
             throw AudioAnalyzerError.emptyAudio
         }

JammLab/Services/CachedPeakformProvider.swift

@@ -1,6 +1,12 @@
 import CryptoKit
 import Foundation
 
+extension SHA256.Digest {
+    var lowercaseHexString: String {
+        map { String(format: "%02x", $0) }.joined()
+    }
+}
+
 final class CachedPeakformProvider: PeakformProvider {
     let samplesPerPeakLevels: [Int]
 
@@ -72,6 +78,6 @@ final class CachedPeakformProvider: PeakformProvider {
             return true
         }) {}
 
-        return hasher.finalize().map { String(format: "%02x", $0) }.joined()
+        return hasher.finalize().lowercaseHexString
     }
 }

JammLab/Services/StemSeparationService.swift

@@ -508,7 +508,7 @@ final class StemSeparationService {
         ].joined(separator: "|")
 
         let digest = SHA256.hash(data: Data(rawValue.utf8))
-        return digest.map { String(format: "%02x", $0) }.joined()
+        return digest.lowercaseHexString
     }
 
     private func applicationSupportDirectory() -> URL {

JammLab/Services/VideoAudioExtractionService.swift

@@ -75,7 +75,7 @@ final class VideoAudioExtractionService {
     static func cacheKey(for mediaURL: URL) -> String {
         let identity = mediaIdentity(for: mediaURL)
         let digest = SHA256.hash(data: Data(identity.utf8))
-        return digest.map { String(format: "%02x", $0) }.joined()
+        return digest.lowercaseHexString
     }
 
     static func mediaIdentity(for mediaURL: URL) -> String {

JammLab/ViewModels/AudioPlayerViewModel+Playback.swift

@@ -156,15 +156,15 @@ extension AudioPlayerViewModel {
     }
 
     func applyClickVolume(_ volume: Float, shouldPersist: Bool) {
-        clickVolume = min(1, max(0, volume))
+        clickVolume = clampedVolume(volume)
         playbackEngine.setClickVolume(clickVolume)
         guard shouldPersist else { return }
         UserDefaults.standard.set(clickVolume, forKey: "metronome.volume")
     }
 
     func setMainTrackVolume(_ volume: Float) {
         performUndoableEdit("Change Main Volume") {
-            mainTrackVolume = min(1, max(0, volume))
+            mainTrackVolume = clampedVolume(volume)
             playbackEngine.setMainVolume(mainTrackVolume)
         }
     }

JammLab/ViewModels/AudioPlayerViewModel+Project.swift

@@ -114,12 +114,7 @@ extension AudioPlayerViewModel {
         harmonySymbols = []
         notationItems = []
         projectKeySelection = nil
-        selectedRegionID = nil
-        selectedHarmonySymbolID = nil
-        clearNotationMeasureSelectionAndClipboard()
-        pendingHarmonyEditorRequest = nil
-        activeLoopRegionID = nil
-        notationDurationDenominator = NotationDuration.defaultDenominator
+        clearTransientEditingState()
         loopRegion = .empty
         timelineVisibleRange = 0...0
         userTimelineVisibleRange = 0...0
@@ -177,12 +172,7 @@ extension AudioPlayerViewModel {
         harmonySymbols = []
         notationItems = []
         projectKeySelection = nil
-        selectedRegionID = nil
-        selectedHarmonySymbolID = nil
-        clearNotationMeasureSelectionAndClipboard()
-        pendingHarmonyEditorRequest = nil
-        notationDurationDenominator = NotationDuration.defaultDenominator
-        activeLoopRegionID = nil
+        clearTransientEditingState()
         loopRegion = LoopRegion(start: 0, end: file.duration).clamped(to: file.duration)
         timelineVisibleRange = 0...file.duration
         userTimelineVisibleRange = timelineVisibleRange
@@ -258,12 +248,7 @@ extension AudioPlayerViewModel {
                 duration: resolvedProjectDuration
             )
             projectKeySelection = project.projectKeySelection
-            selectedRegionID = nil
-            selectedHarmonySymbolID = nil
-            clearNotationMeasureSelectionAndClipboard()
-            pendingHarmonyEditorRequest = nil
-            notationDurationDenominator = NotationDuration.defaultDenominator
-            activeLoopRegionID = nil
+            clearTransientEditingState()
             loopRegion = ProjectStateNormalizer.normalizedLoopRegion(
                 start: project.loopStart,
                 end: project.loopEnd,
@@ -309,6 +294,15 @@ extension AudioPlayerViewModel {
         }
     }
 
+    private func clearTransientEditingState() {
+        selectedRegionID = nil
+        selectedHarmonySymbolID = nil
+        clearNotationMeasureSelectionAndClipboard()
+        pendingHarmonyEditorRequest = nil
+        notationDurationDenominator = NotationDuration.defaultDenominator
+        activeLoopRegionID = nil
+    }
+
     func cancelBackgroundWork() {
         analysisTask?.cancel()
         analysisTask = nil

JammLab/Views/Components/AbletonNumberField.swift

@@ -28,15 +28,20 @@ struct AbletonNumberFieldConfiguration: Equatable {
 
 enum AbletonNumberFieldLogic {
     static func clamp(_ value: Double, configuration: AbletonNumberFieldConfiguration) -> Double {
-        guard value.isFinite else { return configuration.minValue }
-        return min(configuration.maxValue, max(configuration.minValue, value))
+        NumericControlLogic.clamp(
+            value,
+            minValue: configuration.minValue,
+            maxValue: configuration.maxValue
+        )
     }
 
     static func snapToStep(_ value: Double, configuration: AbletonNumberFieldConfiguration) -> Double {
-        let clampedValue = clamp(value, configuration: configuration)
-        let steps = ((clampedValue - configuration.minValue) / configuration.step).rounded()
-        let snapped = configuration.minValue + steps * configuration.step
-        return clamp(snapped, configuration: configuration)
+        NumericControlLogic.snapToStep(
+            value,
+            minValue: configuration.minValue,
+            maxValue: configuration.maxValue,
+            step: configuration.step
+        )
     }
 
     static func resetValue(configuration: AbletonNumberFieldConfiguration) -> Double {
@@ -45,7 +50,7 @@ enum AbletonNumberFieldLogic {
 
     static func format(_ value: Double, configuration: AbletonNumberFieldConfiguration) -> String {
         let snappedValue = snapToStep(value, configuration: configuration)
-        return String(format: "%.\(configuration.precision)f", snappedValue)
+        return NumericControlLogic.format(snappedValue, precision: configuration.precision)
     }
 
     static func parse(_ text: String, configuration: AbletonNumberFieldConfiguration) -> Double? {

JammLab/Views/Components/AppKitControlHelpers.swift

@@ -40,6 +40,24 @@ enum AppKitDragThreshold {
     }
 }
 
+enum NumericControlLogic {
+    static func clamp(_ value: Double, minValue: Double, maxValue: Double) -> Double {
+        guard value.isFinite else { return minValue }
+        return min(maxValue, max(minValue, value))
+    }
+
+    static func snapToStep(_ value: Double, minValue: Double, maxValue: Double, step: Double) -> Double {
+        let clampedValue = clamp(value, minValue: minValue, maxValue: maxValue)
+        let steps = ((clampedValue - minValue) / step).rounded()
+        let snappedValue = minValue + steps * step
+        return clamp(snappedValue, minValue: minValue, maxValue: maxValue)
+    }
+
+    static func format(_ value: Double, precision: Int) -> String {
+        String(format: "%.\(precision)f", value)
+    }
+}
+
 extension NSView {
     func configureCompactVerticalControlSizing() {
         setContentHuggingPriority(.required, for: .vertical)

JammLab/Views/Components/JammValueSlider.swift

@@ -28,15 +28,20 @@ struct JammValueSliderConfiguration: Equatable {
 
 enum JammValueSliderLogic {
     static func clamp(_ value: Double, configuration: JammValueSliderConfiguration) -> Double {
-        guard value.isFinite else { return configuration.minValue }
-        return min(configuration.maxValue, max(configuration.minValue, value))
+        NumericControlLogic.clamp(
+            value,
+            minValue: configuration.minValue,
+            maxValue: configuration.maxValue
+        )
     }
 
     static func snapToStep(_ value: Double, configuration: JammValueSliderConfiguration) -> Double {
-        let clampedValue = clamp(value, configuration: configuration)
-        let steps = ((clampedValue - configuration.minValue) / configuration.step).rounded()
-        let snappedValue = configuration.minValue + steps * configuration.step
-        return clamp(snappedValue, configuration: configuration)
+        NumericControlLogic.snapToStep(
+            value,
+            minValue: configuration.minValue,
+            maxValue: configuration.maxValue,
+            step: configuration.step
+        )
     }
 
     static func resetValue(configuration: JammValueSliderConfiguration) -> Double {
@@ -51,7 +56,7 @@ enum JammValueSliderLogic {
 
     static func format(_ value: Double, configuration: JammValueSliderConfiguration) -> String {
         let snappedValue = snapToStep(value, configuration: configuration)
-        return String(format: "%.\(configuration.precision)f", snappedValue)
+        return NumericControlLogic.format(snappedValue, precision: configuration.precision)
     }
 
     static func dragValue(

JammLab/Views/NoteColorPresentation.swift

@@ -55,28 +55,3 @@ final class NoteColorPanelPresenter: NSObject {
         onColorChanged?(hex)
     }
 }
-
-private extension NSColor {
-    convenience init?(hexString: String) {
-        guard let normalized = TimecodedNote.normalizedColorHex(hexString) else { return nil }
-
-        let digits = String(normalized.dropFirst())
-        guard let value = Int(digits, radix: 16) else { return nil }
-
-        let red = CGFloat((value >> 16) & 0xFF) / 255
-        let green = CGFloat((value >> 8) & 0xFF) / 255
-        let blue = CGFloat(value & 0xFF) / 255
-
-        self.init(srgbRed: red, green: green, blue: blue, alpha: 1)
-    }
-
-    var hexString: String? {
-        guard let rgbColor = usingColorSpace(.sRGB) else { return nil }
-
-        let red = Int((rgbColor.redComponent * 255).rounded())
-        let green = Int((rgbColor.greenComponent * 255).rounded())
-        let blue = Int((rgbColor.blueComponent * 255).rounded())
-
-        return String(format: "#%02X%02X%02X", red, green, blue)
-    }
-}

JammLab/Views/SettingsContentViews.swift

@@ -37,11 +37,7 @@ struct ThemeColorsSettingsContentView: View {
 
     private static func hexString(from color: Color) -> String {
         let nsColor = NSColor(color)
-        let rgbColor = nsColor.usingColorSpace(.deviceRGB) ?? nsColor
-        let red = Int((rgbColor.redComponent * 255).rounded())
-        let green = Int((rgbColor.greenComponent * 255).rounded())
-        let blue = Int((rgbColor.blueComponent * 255).rounded())
-        return String(format: "#%02X%02X%02X", red, green, blue)
+        return nsColor.hexString(using: .deviceRGB, fallsBackToOriginalColor: true) ?? "#000000"
     }
 }