fix: improvements

nopeanuts · Apr 6, 2024 · 5b23d89 · 5b23d89
1 parent cd8990c
commit 5b23d89
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 9 deletions.
diff --git a/Enchanted/Helpers/Accessibility.swift b/Enchanted/Helpers/Accessibility.swift
@@ -32,6 +32,7 @@ final class Accessibility {
 
     func getSelectedText() -> String? {
         if let text = getSelectedTextAX(), text.count > 1  {
+            print("getSelectedTextAX", text)
             return text
         }
 
@@ -58,6 +59,7 @@ final class Accessibility {
 
 
     func getSelectedTextViaCopy(retryAttempts: Int = 1) -> String? {
+
         let pasteboard = NSPasteboard.general
         let originalContents = pasteboard.pasteboardItems?.compactMap { $0.string(forType: .string) } ?? []
         pasteboard.clearContents()
@@ -85,6 +87,65 @@ final class Accessibility {
         }
 
         return newContent
+
+
+        print("via copy invocation")
+        DispatchQueue.main.async {
+            print("one", NSPasteboard.general.string(forType: .string))
+            sleep(1)
+            print("two", NSPasteboard.general.string(forType: .string))
+            sleep(1)
+            print("three", NSPasteboard.general.string(forType: .string))
+            sleep(1)
+            print("four", NSPasteboard.general.string(forType: .string))
+
+        }
+//        let pasteboard = NSPasteboard.general
+//        let originalContents = pasteboard.pasteboardItems?.compactMap { $0.string(forType: .string) } ?? []
+//        print("step 1", pasteboard.string(forType: .string))
+//        pasteboard.clearContents()
+//        pasteboard.setString("", forType: .string)
+//        print("step 2", pasteboard.string(forType: .string))
+//        usleep(1000000)
+//        sleep(1)
+//        var attempts = 0
+//        var newContent: String?
+
+
+//        while attempts < retryAttempts && newContent == nil {
+
+//            simulateCopyKeyPress()
+//            usleep(100000)
+
+
+//            print("step 3", pasteboard.string(forType: .string))
+//            newContent = pasteboard.string(forType: .string)
+//            print("pasteboard content", newContent)
+//            print("step 3.5", pasteboard.string(forType: .string))
+//            if let newContent = newContent, !newContent.isEmpty {
+//                break
+//            } else {
+//                newContent = nil
+//            }
+//            attempts += 1
+//        }
+
+//        if newContent == nil {
+//            pasteboard.clearContents()
+//            for item in originalContents {
+//                pasteboard.setString(item, forType: .string)
+//            }
+//        }
+
+//        defer {
+//            pasteboard.clearContents()
+//        }
+//        
+//        print("step 4", pasteboard.string(forType: .string))
+//        print("returning via copy method", newContent)
+
+        return nil
+//        return newContent
     }
 
     func simulateCopyKeyPress() {

diff --git a/Enchanted/UI/macOS/CompletionsEditor/CompletionsEditor.swift b/Enchanted/UI/macOS/CompletionsEditor/CompletionsEditor.swift
@@ -15,6 +15,7 @@ struct CompletionsEditor: View {
 
     private func requestAccessibility() {
         Task {
+            print("Requesting accessibility")
             await Accessibility.shared.showAccessibilityInstructionsWindow()
             Accessibility.shared.simulateCopyKeyPress()
         }

diff --git a/Enchanted/UI/macOS/Components/CompletionPanelView.swift b/Enchanted/UI/macOS/Components/CompletionPanelView.swift
@@ -92,11 +92,11 @@ struct PanelCompletionsView: View {
             HStack(alignment: .center) {
                 switch completionMode {
                 case .completionsInApp:
-                    Text("Response in **App**.")
+                    Text("Respond in **App**.")
                 case .completionsInCurrentWindow:
-                    Text("Response in **Window**.")
+                    Text("Respond in **Window**.")
                 case .completionsInWindowDelayed:
-                    Text("Response in **Window** with trigger.")
+                    Text("Respond in **Window** with trigger.")
                 }
 
                 Text("SPACE")
@@ -115,7 +115,7 @@ struct PanelCompletionsView: View {
         }
         .padding()
         .background {
-            RoundedRectangle(cornerRadius: 8).fill(.ultraThinMaterial)
+            RoundedRectangle(cornerRadius: 8).fill(.ultraThickMaterial)
         }
         .onKeyboardShortcut(key: .space, modifiers: []) {
             withAnimation {

diff --git a/Enchanted/UI/macOS/Components/PromptPanelView.swift b/Enchanted/UI/macOS/Components/PromptPanelView.swift
@@ -138,7 +138,7 @@ struct PromptPanelView: View {
             }
             .padding(12)
             .background {
-                RoundedRectangle(cornerRadius: 8).fill(.ultraThinMaterial)
+                RoundedRectangle(cornerRadius: 8).fill(.ultraThickMaterial)
             }
         }
         .frame(minWidth: 500, maxWidth: 500)

diff --git a/Enchanted/UI/macOS/PromptPanel/PanelManager.swift b/Enchanted/UI/macOS/PromptPanel/PanelManager.swift
@@ -11,7 +11,8 @@ import Carbon
 import AsyncAlgorithms
 
 final actor Printer {
-    func print(_ message: String) {
+    func write(_ message: String) {
+        print("clipboard printing", message)
         Clipboard.shared.setString(message)
         usleep(50000)
         Accessibility.simulatePasteCommand()
@@ -56,15 +57,16 @@ class PanelManager: NSObject, NSApplicationDelegate {
             }
 
             print("printing: \((sentencesToConsume)) \(Date())")
-            await printer.print(sentencesToConsume)
+            await printer.write(sentencesToConsume)
             lastPrintApplication = NSWorkspace.shared.runningApplications.first{$0.isActive}
         }
     }
 
 
     @MainActor
     @objc func togglePanel() {
-        if panel == nil {
+        let accessibilityStatus = Accessibility.shared.checkAccessibility()
+        if !accessibilityStatus {
             Accessibility.shared.showAccessibilityInstructionsWindow()
         }
 
@@ -82,7 +84,7 @@ class PanelManager: NSObject, NSApplicationDelegate {
                     self?.hidePanel()
                 }
 
-                return
+                return
             }
 
             hidePanel()