go with observed object

Author: iaalm

yCHM/CHMFile.swift

@@ -9,18 +9,19 @@ import Foundation
 
 class CHMFile {
     let fd: OpaquePointer
-    let items: [CHMUnit]
-    let index: [CHMUnit]
-    let tree: [CHMUnit]
+    let items: CHMUnit
+    let index: CHMUnit
+    let tree: CHMUnit
 
     init(filename: String) {
         fd = chm_open(filename)
-        items = listCHMUnit(fd, filter: CHM_ENUMERATE_ALL).0
-        let hhcPath = items.first(where: {$0.path.lowercased().hasSuffix(".hhc")})?.path
+        let allItems = listCHMUnit(fd, filter: CHM_ENUMERATE_ALL).0
+        items = CHMUnit(name: "", path: "", children: allItems, parent: nil)
+        let hhcPath = allItems.first(where: {$0.path.lowercased().hasSuffix(".hhc")})?.path
         // if hhc == nil
         let hhcData = getUrlContent(fd, path: hhcPath!)
         tree = parseIndex(hhcData)
-        let hhkPath = items.first(where: {$0.path.lowercased().hasSuffix(".hhk")})?.path
+        let hhkPath = allItems.first(where: {$0.path.lowercased().hasSuffix(".hhk")})?.path
         // if hhk == nil
         let hhkData = getUrlContent(fd, path: hhkPath!)
         index = parseIndex(hhkData)
@@ -31,7 +32,7 @@ class CHMFile {
     }
 
     func entryPoint () -> CHMUnit {
-        var item = tree[0]
+        var item = tree.children![0]
         while item.children?[0] != nil {
             item = item.children![0]
         }

yCHM/ContentView.swift

@@ -15,9 +15,9 @@ struct ContentView: View {
     @State var selector: selectorType = .tree
     @State var searchText: String = ""
 
-    @State var index: [CHMUnitFiltable] = []
-    @State var tree: [CHMUnitFiltable] = []
-    @State var object: [CHMUnitFiltable] = []
+    @StateObject var index: CHMUnitFiltable = CHMUnitFiltable()
+    @StateObject var tree: CHMUnitFiltable = CHMUnitFiltable()
+    @StateObject var object: CHMUnitFiltable = CHMUnitFiltable()
 
     let docPicker = DocPicker()
 
@@ -43,9 +43,9 @@ struct ContentView: View {
                     }).disabled(selector == .object)
                 }
                 switch selector {
-                case .flat: TreeView(items: $index, textFilter: $searchText, selected: $location.unit)
-                case .tree: TreeView(items: $tree, textFilter: $searchText, selected: $location.unit)
-                case .object: TreeView(items: $object, textFilter: $searchText, selected: $location.unit)
+                case .flat: TreeView(items: index, textFilter: $searchText, selected: $location.unit)
+                case .tree: TreeView(items: tree, textFilter: $searchText, selected: $location.unit)
+                case .object: TreeView(items: object, textFilter: $searchText, selected: $location.unit)
                 }
             }
             .frame(minWidth: 100, idealWidth: 200, maxWidth: 200, minHeight: /*@START_MENU_TOKEN@*/0/*@END_MENU_TOKEN@*/, idealHeight: .infinity, maxHeight: .infinity, alignment: .center)
@@ -67,9 +67,9 @@ struct ContentView: View {
     func fileOpened(_ filename: String?) {
         if filename != nil {
             chm = CHMFile(filename: filename!)
-            index = chm!.index.map({CHMUnitFiltable(unit: $0)})
-            tree = chm!.tree.map({CHMUnitFiltable(unit: $0)})
-            object = chm!.items.map({CHMUnitFiltable(unit: $0)})
+            index.load(unit: chm!.index)
+            tree.load(unit: chm!.tree)
+            object.load(unit: chm!.items)
             location.urlCallback = chm!.urlCallback
             location.unit = CHMUnitFiltable(unit: chm!.entryPoint())
         }
@@ -80,13 +80,13 @@ struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         ContentView(
             location: CHMLocation(),
-            tree: [CHMUnitFiltable(unit: CHMUnit(path: "/", children: [
+            tree: CHMUnitFiltable(unit: CHMUnit(path: "/", children: [
                 .init(path: "/a/", children: [
                     .init(path: "/a/b"),
                     .init(path: "/a/c")
                 ]),
                 .init(path: "/d")
-            ]))]
+            ]))
         )
     }
 }

yCHM/IndexParser.swift

@@ -8,14 +8,14 @@
 import Foundation
 import SwiftSoup
 
-func parseIndex(_ data: Data) -> [CHMUnit] {
+func parseIndex(_ data: Data) -> CHMUnit {
     let htmlStr = decodeString(data: data)
     do {
         let doc = try SwiftSoup.parse(htmlStr)
-        return parseBody(doc.body()!).children ?? []
+        return parseBody(doc.body()!)
     } catch {
         logger.error("parse error")
-        return []
+        return CHMUnit()
     }
 }
 

yCHM/UnitViews.swift

@@ -8,16 +8,49 @@
 import Foundation
 import SwiftUI
 
-class CHMUnitFiltable: CHMUnit, Hashable {
-    let allChildren: [CHMUnitFiltable]?
-    var filteredChildren: [CHMUnitFiltable]?
+class CHMUnitFiltable: CHMUnit, Hashable, ObservableObject {
+    var allChildren: [CHMUnitFiltable]? = []
+    @Published var filteredChildren: [CHMUnitFiltable]? = []
+    var lastfilter: String = ""
+
+    override init() {
+        super.init()
+    }
 
     init(unit: CHMUnit) {
         allChildren = unit.children?.map({ CHMUnitFiltable(unit: $0) })
         filteredChildren = allChildren
         super.init(unit)
     }
 
+    func load(unit: CHMUnit) {
+        name = unit.name
+        path = unit.path
+        parent = unit.parent
+        children = unit.children
+        allChildren = unit.children?.map({ CHMUnitFiltable(unit: $0) })
+        filteredChildren = allChildren
+    }
+    
+    func filter(text: String) -> CHMUnitFiltable {
+        if lastfilter == text {
+            // urgely but break the update loop
+            return self
+        }
+        self.filteredChildren = allChildren?.filter({
+            if fuzzyMatch(query: text, text: $0.name) {
+                return true
+            }
+            var _ = $0.filter(text: text)
+            if ($0.filteredChildren?.count ?? -1) > 0 {
+                return true
+            }
+            return false
+        })
+        lastfilter = text
+        return self
+    }
+    
     static func == (lhs: CHMUnitFiltable, rhs: CHMUnitFiltable) -> Bool {
         return lhs.id == rhs.id
     }
@@ -28,13 +61,13 @@ class CHMUnitFiltable: CHMUnit, Hashable {
 }
 
 struct TreeView: View {
-    @Binding var items: [CHMUnitFiltable]
+    @ObservedObject var items: CHMUnitFiltable
     @Binding var textFilter: String
     @Binding var selected: CHMUnitFiltable?
 
     var body: some View {
         List(
-            filterByText(query: textFilter, items: items),
+            items.filter(text: textFilter).filteredChildren!,
             id: \.self, children: \.filteredChildren,
             selection: $selected) { unit in
             UnitView(unit: unit)
@@ -51,21 +84,6 @@ struct UnitView: View {
 
 }
 
-func filterByText(query: String, items: [CHMUnitFiltable]) -> [CHMUnitFiltable]
-{
-    return items.compactMap({
-        if fuzzyMatch(query: query, text: $0.name) {
-            return $0
-        }
-        let filteredChildren = filterByText(query: query, items: $0.allChildren ?? [])
-        if filteredChildren.count > 0 {
-            $0.filteredChildren = filteredChildren
-            return $0
-        }
-        return nil
-    })
-}
-
 func fuzzyMatch(query: String, text: String) -> Bool {
     var idx: String.Index? = text.startIndex
     for i in query {

yCHMTests/IndexParserTests.swift

@@ -158,14 +158,15 @@ class IndexParserTests: XCTestCase {
 
     func testPerformance() throws {
         let data = testHtml1.data(using: .utf8)!
-        var res: [CHMUnit] = []
+        var res: CHMUnit = CHMUnit()
         self.measure {
             res = parseIndex(data)
         }
         assertIndexIsRight(res)
     }
 
-    func assertIndexIsRight(_ units: [CHMUnit], specialItem: String = "specialitem") {
+    func assertIndexIsRight(_ unit: CHMUnit, specialItem: String = "specialitem") {
+        let units = unit.children!
         XCTAssertEqual(units.count, 3)
         XCTAssertEqual(units[0].name, "a")
         XCTAssertEqual(units[1].name, "b")