Fixed searching with files

Now every files content is beeing read manually and then added as a text document
tom-ludwig · Nov 9, 2023 · 01aa79a · 01aa79a
1 parent 5a22fdb
commit 01aa79a
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 26 deletions.
diff --git a/SearchKitDemo/ContentView.swift b/SearchKitDemo/ContentView.swift
@@ -13,28 +13,34 @@ struct ContentView: View {
     @State var files = [FileViewModel]()
     @State var indexer = SearchIndexer.Memory.Create()
     @State private var elapsedTime: TimeInterval?
-
+    @State private var searchTime: TimeInterval?
+    @State private var searchQuery: String = ""
     var body: some View {
         NavigationView {
             SidebarView(files: $files)
 
             VStack {
+                TextField("Query", text: $searchQuery)
+                    .textFieldStyle(.roundedBorder)
+                    .padding()
+                    .frame(maxWidth: 200)
                 HStack {
                     VStack {
                         Button("Index") {
-                             let startTime = Date()
+                            let startTime = Date()
                             guard let indexer = indexer else {
                                 return
                             }
 
                             files.forEach { file in
-                                let result = indexer.add(fileURL: file.url, canReplace: false)
+//                                let result = indexer.add(fileURL: file.url, canReplace: false)
+                                let result = indexer.add(file.url, text: file.content!, canReplace: false)
                                 print(result)
                             }
 
                             indexer.flush()
 
-                            print(indexer.search("cruising", limit: 10))
+                            print(indexer.documents())
 
                             let endTime = Date()
                             elapsedTime = endTime.timeIntervalSince(startTime)
@@ -46,13 +52,22 @@ struct ContentView: View {
                         }
                     }
 
-                    Button("Search") {
-                        let results = indexer?.search("cruising")
-                        guard let results = results else {
-                            return
+                    VStack {
+                        Button("Search") {
+                            let startTime = Date()
+                            let results = indexer?.search(searchQuery)
+                            guard let results = results else {
+                                print("No results found")
+                                return
+                            }
+                            for result in results {
+                                print(result.url)
+                            }
+                            let endTime = Date()
+                            searchTime = endTime.timeIntervalSince(startTime)
                         }
-                        for result in results {
-                            print(result.url)
+                        if let searchTime = searchTime {
+                            Text("\(searchTime)")
                         }
                     }
                 }
@@ -70,25 +85,66 @@ struct ContentView: View {
 
         }.toolbar {
             Button("Open") {
-                let openPanel = NSOpenPanel()
-                openPanel.canChooseFiles = false
-                openPanel.canChooseDirectories = true
-                openPanel.allowsMultipleSelection = false
+                addFilesWithContentText()
+            }
+        }
+    }
+
+    func addFilesWithURL() {
+        let openPanel = NSOpenPanel()
+        openPanel.canChooseFiles = false
+        openPanel.canChooseDirectories = true
+        openPanel.allowsMultipleSelection = false
+
+        if openPanel.runModal() == .OK {
+            if let selectedFolderURL = openPanel.url {
+                let fileManager = FileManager.default
 
-                if openPanel.runModal() == .OK {
-                    if let selectedFolderURL = openPanel.url {
-                        let fileManager = FileManager.default
+                if let enumerator = fileManager.enumerator(at: selectedFolderURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles], errorHandler: nil) {
+                    for case let fileURL as URL in enumerator {
+                        if let file = try? FileViewModel(name: fileURL.lastPathComponent, url: fileURL) {
+                            files.append(file)
+                        } else {
+                            print("Error happend on: \(fileURL)")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    func addFilesWithContentText() {
+        let openPanel = NSOpenPanel()
+        openPanel.canChooseFiles = false
+        openPanel.canChooseDirectories = true
+        openPanel.allowsMultipleSelection = false
+
+        if openPanel.runModal() == .OK {
+            if let selectedFolderURL = openPanel.url {
+                let fileManager = FileManager.default
+
+                if let enumerator = fileManager.enumerator(at: selectedFolderURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles], errorHandler: nil) {
+                    for case let fileURL as URL in enumerator {
+                        var isDirec: ObjCBool = false
+                        fileManager.fileExists(atPath: fileURL.path, isDirectory: &isDirec)
 
-                        if let enumerator = fileManager.enumerator(at: selectedFolderURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles], errorHandler: nil) {
-                            for case let fileURL as URL in enumerator {
-                                do {
-                                    if let file = try? FileViewModel(name: fileURL.lastPathComponent, url: fileURL) {
-                                        files.append(file)
-                                    }
-                                } catch {
-                                    print("File could not be added.")
-                                }
+                        guard isDirec.boolValue == false else {
+                            print("is a dir")
+                            continue
+                        }
+//                        let fileContentData = try? Data(contentsOf: fileURL)
+//                        let fileContentString = String(data: fileContentData!, encoding: .utf8)! // TODO: Remove force unwrapping
+                        do {
+                            guard let fileContent = try? String(contentsOf: fileURL) else {
+                                continue
+                            }
+                            if let file = try? FileViewModel(name: fileURL.lastPathComponent, url: fileURL, content: fileContent) {
+                                files.append(file)
+                            } else {
+                                print("an error occured")
                             }
+                        } catch {
+                            print("fatal error")
                         }
                     }
                 }

diff --git a/SearchKitDemo/FileViewModel.swift b/SearchKitDemo/FileViewModel.swift
@@ -11,4 +11,17 @@ struct FileViewModel: Identifiable {
     let id = UUID()
     let name: String
     let url: URL
+    let content: String?
+
+    init(name: String, url: URL) {
+        self.name = name
+        self.url = url
+        self.content = nil
+    }
+
+    init(name: String, url: URL, content: String) {
+        self.name = name
+        self.url = url
+        self.content = content
+    }
 }