can request separate books

.ignore

@@ -0,0 +1,2 @@
+*.json
+*.xcodeproj/*

Fenestra.swift

@@ -5,6 +5,8 @@
 //  Created by Saint on 5/20/24.
 //
 
+import GRDB
+import GRDBQuery
 import Foundation
 import SwiftUI
 import WrappingHStack
@@ -14,8 +16,11 @@ struct SegRow: View {
     var ribbonId: Int64
     @State var highlights = Set<Int>()
 
+    let intraWordSpacing = CGFloat(1.6)
     var body: some View {
         var segSplit = seg.body.components(separatedBy: ";;")
+        Print("got here meow")
+        Print(segSplit)
         let decoder = JSONDecoder()
         var retView = WrappingHStack(alignment: .leading, horizontalSpacing: 0) {
             ForEach(0 ..< segSplit.count, id: \.self) { segIndex in
@@ -53,7 +58,8 @@ struct SegRow: View {
                         Text(arrayOfText[index])
                             .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00)))
                             .font(Font.custom("AveriaSerifLibre-Regular", size: fontSize))
-                            .padding(.horizontal, 1.5) // intra word spacing
+
+                            .padding(.horizontal, intraWordSpacing) // intra word spacing
                             .if(self.highlights.contains(verse.verse)) { $0.background(Color(hex: highlightColor)) }
                             .foregroundColor(Color.white)
                             .onTapGesture {
@@ -79,7 +85,6 @@ struct SegRow: View {
 struct Pane: View {
     @ObservedObject var paneConnector: PaneConnector
 
-    @State var segs: [SegDenorm]
     @State var selectedRibbon: [Ribbon]
 
     @State var width: CGFloat
@@ -89,6 +94,8 @@ struct Pane: View {
 
     @State var refresh: Bool = false
 
+    @Query(SegDenormRequest(book: "bible.mark")) private var segs: [SegDenorm]
+
     @Environment(\.appDatabase) private var appDatabase
 
     // var handleVisibilityChanged: (String, VisibilityChange,  VisibilityTracker<String>) -> Void
@@ -125,6 +132,9 @@ struct Pane: View {
 
                     Task {
                         DispatchQueue.main.async {
+                            if paneConnector.visibilityTracker == nil {
+                                return
+                            }
                             let gTracker = paneConnector.visibilityTracker!
 
                             Print("scroll Id target: \(paneConnector.scrollId)")

SegDenormRequest.swift

@@ -24,15 +24,37 @@ struct SegDenormRequest: Queryable {
     }
 
     func fetchValue(_ db: Database) throws -> [SegDenorm] {
-        print("WOOOOOOF")
+        print("segs denorm fetching for \(book)")
-        var sql = "select seg_id as id, seg.book as book, group_concat(line.body, ';;') as body from seg join line on seg.line_id = line.rowid WHERE seg.book = 'bible.john' group by seg.seg_id"
+        print(book)
+        var sql = """
+        select seg_id as id, seg.book as book, group_concat(line.body, ';;') as body from \
+        (select * from seg  where seg.book = '\(book)') as seg \
+        join (select * from line  where line.book = '\(book)') as line \
+        on seg.line_id = line.line_id  group by seg.seg_id
+        """
+
+        do
+        {
+            var ret =  try SegDenorm.fetchAll(db, sql: sql)
+
+        print("SEGS DENORM")
+        print(ret[0])
+
+
+
+        // var sql2 = """
+        // select count(1) from seg where seg.book = '\(book)'
+        // """
+
+        //     var ret2 =  try SegDenorm.fetchAll(db, sql: sql2)
+
+        // print("test sql result")
+        // print(ret2[0])
+
 
-        do {
-            var ret =  try SegDenorm.fetchAll(db, sql: sql) // [Player]
 
-        // print("SEGS DENORM")
-        // print(ret)
         return ret
+
     } catch let error {
         print(error.localizedDescription)
         print(error)

SelectedRibbonRequest.swift

@@ -51,8 +51,6 @@ struct SelectedRibbonRequest: Queryable {
         // var ret3 =  try Ribbon.fetchAll(db, sql: "SELECT * FROM Ribbon") // [Player]
         // print(ret3)
 
-
-
         // print("FETCH JOIN RIBBON")
         var ret =  try Ribbon.fetchAll(db, sql: "SELECT Ribbon.* FROM SelectedRibbon join Ribbon on SelectedRibbon.ribbonId = ribbon.rowId WHERE SelectedRibbon.rowId = 1") // [Player]
         // print(ret)

gloss/AppDatabase.swift

@@ -39,6 +39,7 @@ struct AppDatabase {
                 t.autoIncrementedPrimaryKey("id")
                 t.column("body", .text).notNull()
                 t.column("chap", .integer).notNull()
+                t.column("line_id", .integer).notNull()
                 t.column("book", .text).notNull()
                 t.column("verse", .integer)
             }
@@ -70,7 +71,8 @@ struct AppDatabase {
                 t.column("scrollOffset", .integer).notNull()
             }
 
-            try db.create(table: "foo2") { t in
+            // change this to nuke/remake the database
+            try db.create(table: "foo1") { t in
                 t.autoIncrementedPrimaryKey("id")
                 t.column("ribbonId", .integer).notNull()
             }
@@ -212,27 +214,36 @@ extension AppDatabase {
     }
 
     func importJson(_ filename: String, _ db: Database) throws {
-        let importJson : JsonImport = load(filename)
+        let importJson: JsonImport = load(filename)
 
-        if try Line.all().isEmpty(db) {
+        var x = 0
-            for l in importJson.lines {
+        // if try Line.all().isEmpty(db) {
-                print("importing Lines")
+        for l in importJson.lines {
-                _ = try l.inserted(db)
+            // print("importing Lines")
+            if x < 5 {
+                print(l)
+                x += 1
             }
+            _ = try l.inserted(db)
+        }
 
-            for l in importJson.segs {
+        x = 0
-                print("importing SEGS")
+        for l in importJson.segs {
-                _ = try l.inserted(db)
+            // print("importing SEGS")
+
+            if x < 5 {
+                print(l)
+                x += 1
             }
+            _ = try l.inserted(db)
         }
     }
 
     /// Create random Lines if the database is empty.
     func initDatabase() throws {
+        do {
         try dbWriter.write { db in
-
             if try Line.all().isEmpty(db) {
-
                 try importJson("john_export.json", db)
                 try importJson("mark_export.json", db)
                 _ = try Ribbon(id: 1, pos: 1, title: "John", book: "bible.john", scrollId: "1", scrollOffset: 0).inserted(db)
@@ -241,6 +252,11 @@ extension AppDatabase {
                 _ = try SelectedRibbon(id: 1, ribbonId: 1).inserted(db)
             }
         }
+        } catch {
+            print("Error info: \(error)")
+        }
+
+
     }
 
 }

gloss/ContentView.swift

@@ -214,14 +214,13 @@ struct ContentView: View {
     @State var readOffset = CGPoint()
     @State var dragOffset = CGFloat()
 
+    @Query(SegDenormRequest(book: "bible.john")) private var segs: [SegDenorm]
 
     @State var draggedRibbon: Ribbon?
     @State var isDragging = false
 
     @Environment(\.appDatabase) private var appDatabase
 
-    @Query(SegDenormRequest(book: "bible.mark")) private var segs: [SegDenorm]
-
     @Query(RibbonRequest()) private var ribbons: [Ribbon]
     @Query<SelectedRibbonRequest> var selectedRibbon: [Ribbon]
 
@@ -273,7 +272,6 @@ struct ContentView: View {
                 VStack {
                     // Top pane
                     Pane(paneConnector: paneConnector,
-                         segs: segs,
                          selectedRibbon: selectedRibbon,
                          width: geometry.size.width - 50,
                          height: geometry.size.height / 2)

gloss/Line.swift

@@ -1,39 +1,17 @@
 import GRDB
 /// The Line struct.
-///
-/// Identifiable conformance supports SwiftUI list animations, and type-safe
-/// GRDB primary key methods.
-/// Equatable conformance supports tests.
 struct Line: Identifiable, Equatable {
-    /// The player id.
-    ///
-    /// Int64 is the recommended type for auto-incremented database ids.
-    /// Use nil for players that are not inserted yet in the database.
     var id: Int64?
     var chap: Int
+    var line_id: Int // this is a line_id per book
     var verse: Int
     var body: String
     var book: String
 }
 
 extension Line {
-
     private static let books = [
         "John", "Matthew", "Imitation of Christ"]
-    
-    /// Creates a new player with empty name and zero score
-    // static func new() -> Line {
-    //     Line(id: nil, chap: 1, body: "")
-    // }
-    
-    /// Returns a random score
-    static func randomScore() -> Int {
-        10 * Int.random(in: 0...100)
-    }
-
-    static func randomBook() -> String {
-        books.randomElement()!
-    }
 }
 
 // MARK: - Persistence

gloss/LineRequest.swift

@@ -49,11 +49,12 @@ struct LineRequest: Queryable {
     // This method is not required by Queryable, but it makes it easier
     // to test LineRequest.
     func fetchValue(_ db: Database) throws -> [Line] {
-        if book == "" {
+        return try Line.filter(bookColumn ==  book).fetchAll(db)
-            return try Line.filter(bookColumn ==  Line.randomBook()).fetchAll(db)
+        // if book == "" {
-        } else {
+        //     return try Line.filter(bookColumn ==  Line.randomBook()).fetchAll(db)
-            return try Line.filter(bookColumn ==  book).fetchAll(db)
+        // } else {
-        }
+        //     return try Line.filter(bookColumn ==  book).fetchAll(db)
+        // }
         // switch ordering {
         // case .byScore:
         //     return try Line.all().fetchAll(db)

gloss/Persistence.swift

@@ -40,6 +40,7 @@ extension AppDatabase {
             //     // demo purpose.
             //     try appDatabase.createRandomPlayersIfEmpty()
             // }
+            print("initing database")
             try appDatabase.initDatabase()