non blocking search with progress view, file content still blocks

Author: Atacan Durmusoglu

Shared/FileSearch/FileSearchModel.swift

@@ -14,19 +14,20 @@ extension String {
 struct FileModel: Identifiable {
     let id = UUID()
     let path: String
-    var url: URL  {
+    var url: URL {
         URL(fileURLWithPath: path)
     }
 }
 
 class FileSearch: ObservableObject {
     @Published var searchText: String = ""
-    var pickedPath = ""
+    @Published var pickedPath = ""
 //    @Published var foundFiles: [String] = []
     @Published var foundFiles: [FileModel] = []
 //    @Published var selectedFile: String = ""
     @Published var selectedFile: FileModel? = nil // .init(name: "")
     @Published var selectedFileContent: String = ""
+    @Published var isSearching = false
     var cancellables: Set<AnyCancellable> = []
 
     init() {
@@ -35,7 +36,7 @@ class FileSearch: ObservableObject {
 
     func filePicker() {
         guard !searchText.isEmpty else {
-            foundFiles = [FileModel(path: "insert a text to search for")]
+            foundFiles = [FileModel(path: "Insert a text to search for")]
             return
         }
         let openPanel = NSOpenPanel()
@@ -46,17 +47,9 @@ class FileSearch: ObservableObject {
         openPanel.canChooseFiles = false
         openPanel.begin { [weak self] result in
             if result.rawValue == NSApplication.ModalResponse.OK.rawValue {
-                if let selectedPath = openPanel.url?.path.escapingSpaces(), let searchText = self?.searchText {
+                if let selectedPath = openPanel.url?.path.escapingSpaces() {
+                    self?.isSearching = true
                     self?.pickedPath = selectedPath
-                    let command = "grep -rl '\(searchText)' \(selectedPath)"
-                    do {
-                        print(command)
-                        self?.foundFiles = try safeShell(command).components(separatedBy: "\n").map { name in
-                            FileModel(path: name)
-                        }
-                    } catch {
-                        print(error)
-                    }
                 }
             }
         }
@@ -68,16 +61,77 @@ class FileSearch: ObservableObject {
         }
     }
 
+    func runCommand(_ command: String) async -> [FileModel] {
+        do {
+            let shellOutput = try safeShell(command)
+            guard !shellOutput.isEmpty else { return [] }
+
+            let lines = shellOutput.components(separatedBy: "\n")
+            return lines.map { name in
+                FileModel(path: name)
+            }
+        } catch {
+            return [FileModel(path: error.localizedDescription)]
+        }
+    }
+
+    func readFile(contentsOfFile path: String) async -> String {
+        do {
+            let content = try String(contentsOfFile: path)
+            return content
+        } catch {
+            return error.localizedDescription
+        }
+    }
+
     func makePublishers() {
-        $selectedFile.sink { file in
-            do {
+        $selectedFile
+            .asyncMap { file -> String in
                 if let fileUnwrap = file {
-                    self.selectedFileContent = try String(contentsOfFile: fileUnwrap.path)
+                    return await self.readFile(contentsOfFile: fileUnwrap.path)
+                } else {
+                    return "No file selected"
+                }
+            }
+            .receive(on: RunLoop.main)
+            .sink { [weak self] content in
+                self?.selectedFileContent = content
+            }
+            .store(in: &cancellables)
+
+        $pickedPath
+            .asyncMap { selectedPath -> [FileModel] in
+                guard !selectedPath.isEmpty else {
+                    return [FileModel(path: "No directory selected")]
+                }
+                let command = "grep -rl '\(self.searchText)' \(selectedPath)"
+                let files = await self.runCommand(command)
+
+                if files.isEmpty {
+                    return [FileModel(path: "No files found in \(selectedPath)")]
+                }
+                return files
+            }
+            .receive(on: RunLoop.main)
+            .sink { [weak self] files in
+                self?.foundFiles = files
+                self?.isSearching = false
+            }
+            .store(in: &cancellables)
+    }
+}
+
+extension Publisher {
+    func asyncMap<T>(
+        _ transform: @escaping (Output) async -> T
+    ) -> Publishers.FlatMap<Future<T, Never>, Self> {
+        flatMap { value in
+            Future { promise in
+                Task {
+                    let output = await transform(value)
+                    promise(.success(output))
                 }
-            } catch {
-                self.selectedFileContent = error.localizedDescription
             }
         }
-        .store(in: &cancellables)
     }
 }

Shared/FileSearch/Views/ButtonFilePickerPanelView.swift

@@ -20,6 +20,9 @@ struct ButtonFilePickerPanelView: View {
             } label: {
                 Text("Choose Directory")
             } // <-Button
+            if fileSearchModel.isSearching {
+                ProgressView("Please wait...")
+            }
             Spacer()
         } // <-HStack
         .padding(.top)

Shared/Main/ShellCommand.swift

@@ -24,7 +24,9 @@ func safeShell(_ command: String) throws -> String {
     try task.run() // <--updated
 
     let data = pipe.fileHandleForReading.readDataToEndOfFile()
-    let output = String(data: data, encoding: .utf8)!
+    if let output = String(data: data, encoding: .utf8) {
+        return output
+    }
 
-    return output
+    return ""
 }