jake/vOOice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SwiftData pagination race by isolating on MainActor

Browse Source
This commit is contained in:
Beingpax 2025-10-24 22:31:47 +05:45
parent b568fb9fa0
commit cacd38f339
2 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VoiceInk.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -7,7 +7,7 @@
"location" : "https://github.com/FluidInference/FluidAudio",
"state" : {
"branch" : "main",
"revision" : "a8f3bc7a3be7a93d7d5d412fdf71ae7922e92d09"
"revision" : "eec3d961f7bfab3d161dd39aeebfc861fcfb25b8"
}
},
{

65
VoiceInk/Views/TranscriptionHistoryView.swift
View File

@ -95,7 +95,9 @@ struct TranscriptionHistoryView: View {
if hasMoreContent {
Button(action: {
loadMoreContent()
Task {
await loadMoreContent()
}
}) {
HStack(spacing: 8) {
if isLoading {
@ -279,6 +281,7 @@ struct TranscriptionHistoryView: View {
)
}
@MainActor
private func loadInitialContent() async {
isLoading = true
defer { isLoading = false }
@ -290,50 +293,44 @@ struct TranscriptionHistoryView: View {
// Fetch initial page without a cursor
let items = try modelContext.fetch(cursorQueryDescriptor())
await MainActor.run {
displayedTranscriptions = items
// Update cursor to the timestamp of the last item
lastTimestamp = items.last?.timestamp
// If we got fewer items than the page size, there are no more items
hasMoreContent = items.count == pageSize
}
displayedTranscriptions = items
// Update cursor to the timestamp of the last item
lastTimestamp = items.last?.timestamp
// If we got fewer items than the page size, there are no more items
hasMoreContent = items.count == pageSize
} catch {
print("Error loading transcriptions: \(error)")
}
}
private func loadMoreContent() {
@MainActor
private func loadMoreContent() async {
guard !isLoading, hasMoreContent, let lastTimestamp = lastTimestamp else { return }
Task {
isLoading = true
defer { isLoading = false }
isLoading = true
defer { isLoading = false }
do {
// Fetch next page using the cursor
let newItems = try modelContext.fetch(cursorQueryDescriptor(after: lastTimestamp))
do {
// Fetch next page using the cursor
let newItems = try modelContext.fetch(cursorQueryDescriptor(after: lastTimestamp))
await MainActor.run {
// Append new items to the displayed list
displayedTranscriptions.append(contentsOf: newItems)
// Update cursor to the timestamp of the last new item
self.lastTimestamp = newItems.last?.timestamp
// If we got fewer items than the page size, there are no more items
hasMoreContent = newItems.count == pageSize
}
} catch {
print("Error loading more transcriptions: \(error)")
}
// Append new items to the displayed list
displayedTranscriptions.append(contentsOf: newItems)
// Update cursor to the timestamp of the last new item
self.lastTimestamp = newItems.last?.timestamp
// If we got fewer items than the page size, there are no more items
hasMoreContent = newItems.count == pageSize
} catch {
print("Error loading more transcriptions: \(error)")
}
}
private func resetPagination() async {
await MainActor.run {
displayedTranscriptions = []
lastTimestamp = nil
hasMoreContent = true
isLoading = false
}
@MainActor
private func resetPagination() {
displayedTranscriptions = []
lastTimestamp = nil
hasMoreContent = true
isLoading = false
}
private func deleteTranscription(_ transcription: Transcription) {