Skip to content

fix: improve keystroke performance with debounced saves #84

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
farseenmanekhan1232 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: improve keystroke performance with debounced saves #84

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
69 changes: 48 additions & 21 deletions freewrite/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ struct ContentView: View {
@State private var didCopyPrompt: Bool = false // Add state for copy prompt feedback
@State private var backspaceDisabled = false // Add state for backspace toggle
@State private var isHoveringBackspaceToggle = false // Add state for backspace toggle hover
@State private var pendingSaveWorkItem: DispatchWorkItem? = nil // For debounced saves
let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
let entryHeight: CGFloat = 40

Expand All @@ -104,9 +105,8 @@ struct ContentView: View {
"\n\nJust say it"
]

// Add file manager and save timer
// Add file manager
private let fileManager = FileManager.default
private let saveTimer = Timer.publish(every: 1.0, on: .main, in: .common).autoconnect()

// Add cached documents directory
private let documentsDirectory: URL = {
Expand Down Expand Up @@ -1067,11 +1067,18 @@ struct ContentView: View {
loadExistingEntries()
}
.onChange(of: text) { _ in
// Save current entry when text changes
if let currentId = selectedEntryId,
let currentEntry = entries.first(where: { $0.id == currentId }) {
saveEntry(entry: currentEntry)
// Cancel any pending save
pendingSaveWorkItem?.cancel()

// Schedule a new save after 500ms of no typing
let workItem = DispatchWorkItem { [self] in
if let currentId = selectedEntryId,
let currentEntry = entries.first(where: { $0.id == currentId }) {
saveEntry(entry: currentEntry)
}
}
pendingSaveWorkItem = workItem
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: workItem)
}
.onReceive(timer) { _ in
if timerIsRunning && timeRemaining > 0 {
Expand All @@ -1085,6 +1092,14 @@ struct ContentView: View {
}
}
}
.onReceive(NotificationCenter.default.publisher(for: NSApplication.willResignActiveNotification)) { _ in
// Force save when app loses focus
pendingSaveWorkItem?.cancel()
if let currentId = selectedEntryId,
let currentEntry = entries.first(where: { $0.id == currentId }) {
saveEntry(entry: currentEntry)
}
}
.onReceive(NotificationCenter.default.publisher(for: NSWindow.willEnterFullScreenNotification)) { _ in
isFullscreen = true
}
Expand All @@ -1109,30 +1124,42 @@ struct ContentView: View {

do {
let content = try String(contentsOf: fileURL, encoding: .utf8)
let preview = content
.replacingOccurrences(of: "\n", with: " ")
.trimmingCharacters(in: .whitespacesAndNewlines)
let truncated = preview.isEmpty ? "" : (preview.count > 30 ? String(preview.prefix(30)) + "..." : preview)

// Find and update the entry in the entries array
if let index = entries.firstIndex(where: { $0.id == entry.id }) {
entries[index].previewText = truncated
}
updatePreviewTextFromContent(content, for: entry)
} catch {
print("Error updating preview text: \(error)")
}
}

// New method that computes preview from content without disk I/O
private func updatePreviewTextFromContent(_ content: String, for entry: HumanEntry) {
let preview = content
.replacingOccurrences(of: "\n", with: " ")
.trimmingCharacters(in: .whitespacesAndNewlines)
let truncated = preview.isEmpty ? "" : (preview.count > 30 ? String(preview.prefix(30)) + "..." : preview)

// Find and update the entry in the entries array
if let index = entries.firstIndex(where: { $0.id == entry.id }) {
entries[index].previewText = truncated
}
}

private func saveEntry(entry: HumanEntry) {
let documentsDirectory = getDocumentsDirectory()
let fileURL = documentsDirectory.appendingPathComponent(entry.filename)
let textToSave = text // Capture the text value

do {
try text.write(to: fileURL, atomically: true, encoding: .utf8)
print("Successfully saved entry: \(entry.filename)")
updatePreviewText(for: entry) // Update preview after saving
} catch {
print("Error saving entry: \(error)")
DispatchQueue.global(qos: .utility).async {
do {
try textToSave.write(to: fileURL, atomically: true, encoding: .utf8)
print("Successfully saved entry: \(entry.filename)")

// Update preview text on main thread
DispatchQueue.main.async {
self.updatePreviewTextFromContent(textToSave, for: entry)
}
} catch {
print("Error saving entry: \(error)")
}
}
}

Expand Down