Prevent issues with long file names

Mnpn · Apr 26, 2024 · 49e7767 · 49e7767
1 parent 3939e92
commit 49e7767
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/Azayaka.xcodeproj/project.pbxproj b/Azayaka.xcodeproj/project.pbxproj
@@ -318,7 +318,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 49;
+				CURRENT_PROJECT_VERSION = 50;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -352,7 +352,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 49;
+				CURRENT_PROJECT_VERSION = 50;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;

diff --git a/Azayaka/Preferences.swift b/Azayaka/Preferences.swift
@@ -169,12 +169,22 @@ struct Preferences: View {
     struct OutputSettings: View {
         @AppStorage("saveDirectory") private var saveDirectory: String?
         @AppStorage(fileName) private var _fileName: String = "Recording at %t"
+        @State private var fileNameLength = 0
+        private let dateFormatter = DateFormatter()
 
         var body: some View {
             VStack() {
                 GroupBox() {
                     VStack() {
                         TextField("File name", text: $_fileName).frame(maxWidth: 250)
+                            .onChange(of: _fileName) { newText in
+                                fileNameLength = getFileNameLength(newText)
+                            }
+                            .onAppear() {
+                                dateFormatter.dateFormat = "y-MM-dd HH.mm.ss"
+                                fileNameLength = getFileNameLength(_fileName)
+                            }
+                            .foregroundStyle(fileNameLength > NAME_MAX ? .red : .primary)
                         Text("\"%t\" will be replaced with the recording's start time.")
                             .font(.subheadline).foregroundColor(Color.gray)
                     }.padding(10).frame(maxWidth: .infinity)
@@ -191,7 +201,11 @@ struct Preferences: View {
                 }
             }
         }
-
+
+        func getFileNameLength(_ fileName: String) -> Int {
+            return fileName.replacingOccurrences(of: "%t", with: dateFormatter.string(from: Date())).count
+        }
+
         func updateOutputDirectory() { // todo: re-sandbox?
             let openPanel = NSOpenPanel()
             openPanel.canChooseFiles = false

diff --git a/Azayaka/Recording.swift b/Azayaka/Recording.swift
@@ -149,7 +149,7 @@ extension AppDelegate {
             case AudioFormat.alac.rawValue: fileEnding = "m4a"
             case AudioFormat.flac.rawValue: fileEnding = "flac"
             case AudioFormat.opus.rawValue: fileEnding = "ogg"
-        default: assertionFailure("loaded unknown audio format: ".local + fileEnding)
+            default: assertionFailure("loaded unknown audio format: ".local + fileEnding)
         }
         filePath = "\(getFilePath()).\(fileEnding)"
         audioFile = try! AVAudioFile(forWriting: URL(fileURLWithPath: filePath), settings: audioSettings, commonFormat: .pcmFormatFloat32, interleaved: false)
@@ -162,7 +162,9 @@ extension AppDelegate {
         if fileName == nil || fileName!.isEmpty {
             fileName = "Recording at %t".local
         }
-        return ud.string(forKey: "saveDirectory")! + "/" + fileName!.replacingOccurrences(of: "%t", with: dateFormatter.string(from: Date()))
+        // bit of a magic number but worst case ".flac" is 5 characters on top of this..
+        let fileNameWithDates = fileName!.replacingOccurrences(of: "%t", with: dateFormatter.string(from: Date())).prefix(Int(NAME_MAX) - 5)
+        return ud.string(forKey: "saveDirectory")! + "/" + fileNameWithDates
     }
 
     func getRecordingLength() -> String {