Skip to content

Save JSON along the .wav. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wkoszek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Save JSON along the .wav. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions OpenSuperWhisper/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,33 @@ class ContentViewModel: ObservableObject {
// Capture the current recording duration
let duration = await MainActor.run { self.recordingDuration }

// Create a new Recording instance
// Create a new Recording and save audio + metadata
let timestamp = Date()
let fileName = "\(Int(timestamp.timeIntervalSince1970)).wav"
let finalURL = Recording(
let recording = Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: duration // Use tracked duration
).url

)
// Ensure recordings folder exists
try FileManager.default.createDirectory(
at: Recording.recordingsDirectory,
withIntermediateDirectories: true
)
// Move the temporary recording to final location
try recorder.moveTemporaryRecording(from: tempURL, to: finalURL)

let audioURL = recording.url
try recorder.moveTemporaryRecording(from: tempURL, to: audioURL)
// Write metadata JSON alongside audio
let metadataURL = audioURL.deletingPathExtension().appendingPathExtension("json")
let encoder = JSONEncoder()
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
let metadataData = try encoder.encode(recording)
try metadataData.write(to: metadataURL)
// Save the recording to store
await MainActor.run {
self.recordingStore.addRecording(Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: self.recordingDuration // Use tracked duration
))
self.recordingStore.addRecording(recording)
}

print("Transcription result: \(text)")
Expand Down
35 changes: 19 additions & 16 deletions OpenSuperWhisper/FileDropHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,29 +84,32 @@ class FileDropHandler: ObservableObject {
url: url, settings: Settings()
)

// Create a new Recording instance
// Create a new Recording and save audio + metadata
let timestamp = Date()
let fileName = "\(Int(timestamp.timeIntervalSince1970)).wav"
let finalURL = Recording(
let recording = Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: fileDuration
).url

// Copy the file for playback
try FileManager.default.copyItem(at: url, to: finalURL)

// Save the recording to store
self.recordingStore.addRecording(
Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: self.fileDuration
))
)
// Ensure recordings folder exists
try FileManager.default.createDirectory(
at: Recording.recordingsDirectory,
withIntermediateDirectories: true
)
// Copy audio file
let audioURL = recording.url
try FileManager.default.copyItem(at: url, to: audioURL)
// Write metadata JSON alongside audio
let metadataURL = audioURL.deletingPathExtension().appendingPathExtension("json")
let encoder = JSONEncoder()
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
let metadataData = try encoder.encode(recording)
try metadataData.write(to: metadataURL)
// Save the recording to the store
self.recordingStore.addRecording(recording)

} catch {
print("Error processing dropped audio file: \(error)")
Expand Down
30 changes: 17 additions & 13 deletions OpenSuperWhisper/Indicator/IndicatorWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,29 +51,33 @@ class IndicatorViewModel: ObservableObject {
print("start decoding...")
let text = try await transcription.transcribeAudio(url: tempURL, settings: Settings())

// Create a new Recording instance
// Create a new Recording and save audio + metadata
let timestamp = Date()
let fileName = "\(Int(timestamp.timeIntervalSince1970)).wav"
let finalURL = Recording(
let recording = Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: 0 // TODO: Get actual duration
).url

)
// Ensure recordings folder exists
try FileManager.default.createDirectory(
at: Recording.recordingsDirectory,
withIntermediateDirectories: true
)
// Move the temporary recording to final location
try recorder.moveTemporaryRecording(from: tempURL, to: finalURL)

let audioURL = recording.url
try recorder.moveTemporaryRecording(from: tempURL, to: audioURL)
// Write metadata JSON alongside audio
let metadataURL = audioURL.deletingPathExtension().appendingPathExtension("json")
let encoder = JSONEncoder()
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
let metadataData = try encoder.encode(recording)
try metadataData.write(to: metadataURL)
// Save the recording to store
await MainActor.run {
self.recordingStore.addRecording(Recording(
id: UUID(),
timestamp: timestamp,
fileName: fileName,
transcription: text,
duration: 0 // TODO: Get actual duration
))
self.recordingStore.addRecording(recording)
}

insertTextUsingPasteboard(text)
Expand Down
11 changes: 8 additions & 3 deletions OpenSuperWhisper/Models/Recording.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@ struct Recording: Identifiable, Codable, FetchableRecord, PersistableRecord, Equ
return lhs.id == rhs.id
}

var url: URL {
/// Directory where recording files are stored.
static var recordingsDirectory: URL {
let applicationSupport = FileManager.default.urls(
for: .applicationSupportDirectory, in: .userDomainMask
).first!
let appDirectory = applicationSupport.appendingPathComponent(Bundle.main.bundleIdentifier!)
let recordingsDirectory = appDirectory.appendingPathComponent("recordings")
return recordingsDirectory.appendingPathComponent(fileName)
return appDirectory.appendingPathComponent("recordings")
}

/// File URL for this recording.
var url: URL {
Self.recordingsDirectory.appendingPathComponent(fileName)
}

// MARK: - Database Table Definition
Expand Down