Update debounce timing.

niw · Sep 18, 2024 · 19f92e5 · 19f92e5
1 parent 236d777
commit 19f92e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/Applications/Translator/Sources/MainView.swift b/Applications/Translator/Sources/MainView.swift
@@ -90,7 +90,7 @@ struct MainView: View {
         }
         .toolbar {
             ToolbarItemGroup {
-                if !translatorService.isAutoTranslationEnabled {
+                if !translatorService.isAutomaticTranslationEnabled {
                     Button {
                         Task {
                             do {
@@ -104,7 +104,7 @@ struct MainView: View {
                     .disabled(translatorService.inputString.isEmpty)
                 }
 
-                Toggle(isOn: translatorServiceBindable.isAutoTranslationEnabled) {
+                Toggle(isOn: translatorServiceBindable.isAutomaticTranslationEnabled) {
                     Label {
                         Text("Automatic")
                     } icon: {

diff --git a/Sources/TranslatorSupport/TranslatorService.swift b/Sources/TranslatorSupport/TranslatorService.swift
@@ -29,9 +29,9 @@ private final class Box<T> {
 @MainActor
 @Observable
 public final class TranslatorService {
-    public var isAutoTranslationEnabled: Bool = true {
+    public var isAutomaticTranslationEnabled: Bool = true {
         didSet {
-            guard oldValue != isAutoTranslationEnabled else {
+            guard oldValue != isAutomaticTranslationEnabled else {
                 return
             }
             inputDidChange()
@@ -66,7 +66,7 @@ public final class TranslatorService {
     }
 
     private func inputDidChange() {
-        guard isAutoTranslationEnabled else {
+        guard isAutomaticTranslationEnabled else {
             return
         }
 
@@ -94,7 +94,7 @@ public final class TranslatorService {
     }
 
     public func translate() async throws {
-        guard !isAutoTranslationEnabled else {
+        guard !isAutomaticTranslationEnabled else {
             return
         }
 
@@ -129,6 +129,13 @@ public final class TranslatorService {
                 }
             }
 
+            let trimmedInputString = inputString.trimmingCharacters(in: .whitespacesAndNewlines)
+
+            guard !trimmedInputString.isEmpty else {
+                translatedString = ""
+                return
+            }
+
             if debounce {
                 try await Task.sleep(nanoseconds: 1.0.seconds)
             }
@@ -137,20 +144,14 @@ public final class TranslatorService {
                 throw Error.failed(reason: "No model available.")
             }
 
-            translatedString = ""
-
-            let trimmedInputString = inputString.trimmingCharacters(in: .whitespacesAndNewlines)
-
-            guard !trimmedInputString.isEmpty else {
-                return
-            }
-
             let prompt = Translator.prompt(
                 mode: mode,
                 style: style,
                 input: trimmedInputString
             )
 
+            translatedString = ""
+
             for try await output in llamaModel.complete(prompt) {
                 translatedString.append(output)
             }