הוספת תקופה עבור כל מחבר על פי הקובץ סדר הדורות

Author: Y-PLONI

core/src/commonMain/kotlin/io/github/kdroidfilter/seforimlibrary/core/IdResolverProvider.kt

@@ -12,6 +12,7 @@ interface IdResolverProvider {
     fun resolveCategoryId(title: String, parentId: Long?, level: Int): Long?
     fun resolveSourceId(name: String): Long?
     fun resolveAuthorId(name: String): Long?
+    fun resolveGenerationId(name: String): Long?
     fun resolveTopicId(name: String): Long?
     fun resolveConnectionTypeId(name: String): Long?
     fun resolvePubPlaceId(name: String): Long?

core/src/commonMain/kotlin/io/github/kdroidfilter/seforimlibrary/core/models/Author.kt

@@ -2,14 +2,30 @@ package io.github.kdroidfilter.seforimlibrary.core.models
 
 import kotlinx.serialization.Serializable
 
+/**
+ * Represents a generation / era code (e.g. חז"ל, ראשונים, אחרונים …)
+ *
+ * @property id The unique identifier of the generation
+ * @property name The name of the generation
+ */
+@Serializable
+data class Generation(
+    val id: Long = 0,
+    val name: String
+)
+
 /**
  * Represents a book author in the library
  *
  * @property id The unique identifier of the author
  * @property name The name of the author
+ * @property generationId The identifier of the generation/era of this author (nullable)
+ * @property generationName The display name of the generation (nullable, populated on read)
  */
 @Serializable
 data class Author(
     val id: Long = 0,
-    val name: String
+    val name: String,
+    val generationId: Long? = null,
+    val generationName: String? = null
 )

dao/src/commonMain/kotlin/io/github/kdroidfilter/seforimlibrary/dao/extensions/ModelExtensions.kt

@@ -6,6 +6,7 @@ import io.github.kdroidfilter.seforimlibrary.core.models.Author
 import io.github.kdroidfilter.seforimlibrary.core.models.Book
 import io.github.kdroidfilter.seforimlibrary.core.models.Category
 import io.github.kdroidfilter.seforimlibrary.core.models.ConnectionType
+import io.github.kdroidfilter.seforimlibrary.core.models.Generation
 import io.github.kdroidfilter.seforimlibrary.core.models.Line
 import io.github.kdroidfilter.seforimlibrary.core.models.LineAltTocMapping
 import io.github.kdroidfilter.seforimlibrary.core.models.Link
@@ -34,6 +35,19 @@ private val logger = Logger.withTag("ModelExtensions")
  */
 fun io.github.kdroidfilter.seforimlibrary.db.Author.toModel(): Author {
     return Author(
+        id = id,
+        name = name,
+        generationId = generationId
+    )
+}
+
+/**
+ * Converts a database Generation entity to a domain Generation model.
+ *
+ * @return The domain Generation model
+ */
+fun io.github.kdroidfilter.seforimlibrary.db.Generation.toModel(): Generation {
+    return Generation(
         id = id,
         name = name
     )

dao/src/commonMain/kotlin/io/github/kdroidfilter/seforimlibrary/dao/repository/SeforimRepository.kt

@@ -13,6 +13,7 @@ import io.github.kdroidfilter.seforimlibrary.core.models.Author
 import io.github.kdroidfilter.seforimlibrary.core.models.Book
 import io.github.kdroidfilter.seforimlibrary.core.models.Category
 import io.github.kdroidfilter.seforimlibrary.core.models.ConnectionType
+import io.github.kdroidfilter.seforimlibrary.core.models.Generation
 import io.github.kdroidfilter.seforimlibrary.core.models.Line
 import io.github.kdroidfilter.seforimlibrary.core.models.LineAltTocMapping
 import io.github.kdroidfilter.seforimlibrary.core.models.LineTocMapping
@@ -577,19 +578,76 @@ class SeforimRepository(databasePath: String, private val driver: SqlDriver) {
         return@withContext author?.toModel()
     }
 
+    // ── Generation helpers ───────────────────────────────────────────
+
+    /**
+     * Insert a generation (era) and return its ID.
+     * If [explicitId] is provided, it is used as the ID (for stable ID resolution).
+     * If the generation already exists, returns its existing ID.
+     */
+    suspend fun insertGeneration(name: String, explicitId: Long? = null): Long = withContext(Dispatchers.IO) {
+        logger.d { "Inserting generation: $name" + (explicitId?.let { " with explicit ID $it" } ?: "") }
+        val existing = database.generationQueriesQueries.selectByName(name).executeAsOneOrNull()
+        if (existing != null) return@withContext existing.id
+
+        if (explicitId != null) {
+            database.generationQueriesQueries.insertWithId(explicitId, name)
+            return@withContext explicitId
+        }
+
+        database.generationQueriesQueries.insert(name)
+        val id = database.generationQueriesQueries.lastInsertRowId().executeAsOne()
+        if (id != 0L) return@withContext id
+
+        // fallback
+        val retry = database.generationQueriesQueries.selectByName(name).executeAsOneOrNull()
+        return@withContext retry?.id ?: 0L
+    }
+
+    /**
+     * Resolve a generation name to its ID, or null if not found.
+     */
+    suspend fun getGenerationIdByName(name: String): Long? = withContext(Dispatchers.IO) {
+        database.generationQueriesQueries.selectIdByName(name).executeAsOneOrNull()
+    }
+
+    /**
+     * Return all generations.
+     */
+    suspend fun getAllGenerations(): List<Generation> = withContext(Dispatchers.IO) {
+        database.generationQueriesQueries.selectAll().executeAsList().map { it.toModel() }
+    }
+
+    /**
+     * Update the generation for a given author ID.
+     */
+    suspend fun updateAuthorGeneration(authorId: Long, generationId: Long?) = withContext(Dispatchers.IO) {
+        database.authorQueriesQueries.updateGeneration(generationId, authorId)
+    }
+
+    // ── Author insertion ─────────────────────────────────────────────
+
     // Insert an author and return its ID
-    suspend fun insertAuthor(name: String): Long = withContext(Dispatchers.IO) {
+    suspend fun insertAuthor(name: String, generationId: Long? = null): Long = withContext(Dispatchers.IO) {
         logger.d{"Inserting author: $name"}
 
         // Check if author already exists
         val existingAuthor = database.authorQueriesQueries.selectByName(name).executeAsOneOrNull()
         if (existingAuthor != null) {
+            // If a generationId is supplied and the existing author doesn't have one, update it
+            if (generationId != null && existingAuthor.generationId == null) {
+                database.authorQueriesQueries.updateGeneration(generationId, existingAuthor.id)
+            }
             logger.d{"Author already exists with ID: ${existingAuthor.id}"}
             return@withContext existingAuthor.id
         }
 
-        // Insert the author
-        database.authorQueriesQueries.insert(name)
+        // Insert the author (with optional generationId)
+        if (generationId != null) {
+            database.authorQueriesQueries.insertWithGeneration(name, generationId)
+        } else {
+            database.authorQueriesQueries.insert(name)
+        }
 
         // Get the ID of the inserted author
         val authorId = database.authorQueriesQueries.lastInsertRowId().executeAsOne()

dao/src/commonMain/sqldelight/io/github/kdroidfilter/seforimlibrary/db/AuthorQueries.sq

@@ -20,13 +20,41 @@ INSERT INTO author (name)
 VALUES (?)
 ON CONFLICT (name) DO NOTHING;
 
+insertWithGeneration:
+INSERT INTO author (name, generationId)
+VALUES (?, ?)
+ON CONFLICT (name) DO UPDATE SET generationId = COALESCE(excluded.generationId, author.generationId);
+
 insertAndGetId:
 INSERT OR IGNORE INTO author (name)
 VALUES (?);
 
 selectIdByName:
 SELECT id FROM author WHERE name = ? LIMIT 1;
 
+updateGeneration:
+UPDATE author SET generationId = ? WHERE id = ?;
+
+updateGenerationByName:
+UPDATE author SET generationId = ? WHERE name = ?;
+
+selectByGeneration:
+SELECT a.* FROM author a WHERE a.generationId = ? ORDER BY a.name;
+
+selectWithGeneration:
+SELECT a.id, a.name, a.generationId, g.name AS generationName
+FROM author a
+LEFT JOIN generation g ON a.generationId = g.id
+ORDER BY a.name;
+
+selectWithGenerationByBookId:
+SELECT a.id, a.name, a.generationId, g.name AS generationName
+FROM author a
+JOIN book_author ba ON a.id = ba.authorId
+LEFT JOIN generation g ON a.generationId = g.id
+WHERE ba.bookId = ?
+ORDER BY a.name;
+
 delete:
 DELETE FROM author WHERE id = ?;
 

dao/src/commonMain/sqldelight/io/github/kdroidfilter/seforimlibrary/db/Database.sq

@@ -23,13 +23,24 @@ CREATE TABLE IF NOT EXISTS category_closure (
 CREATE INDEX IF NOT EXISTS idx_category_closure_ancestor ON category_closure(ancestorId);
 CREATE INDEX IF NOT EXISTS idx_category_closure_descendant ON category_closure(descendantId);
 
+-- Generations table (era / period code table)
+CREATE TABLE IF NOT EXISTS generation (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name TEXT NOT NULL UNIQUE
+);
+
+CREATE INDEX IF NOT EXISTS idx_generation_name ON generation(name);
+
 -- Authors table
 CREATE TABLE IF NOT EXISTS author (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-    name TEXT NOT NULL UNIQUE
+    name TEXT NOT NULL UNIQUE,
+    generationId INTEGER,
+    FOREIGN KEY (generationId) REFERENCES generation(id) ON DELETE SET NULL
 );
 
 CREATE INDEX IF NOT EXISTS idx_author_name ON author(name);
+CREATE INDEX IF NOT EXISTS idx_author_generation ON author(generationId);
 
 -- Table des topics
 CREATE TABLE IF NOT EXISTS topic (

dao/src/commonMain/sqldelight/io/github/kdroidfilter/seforimlibrary/db/GenerationQueries.sq

@@ -0,0 +1,35 @@
+-- Queries for generations (era / period)
+
+selectAll:
+SELECT * FROM generation ORDER BY id;
+
+selectById:
+SELECT * FROM generation WHERE id = ?;
+
+selectByName:
+SELECT * FROM generation WHERE name = ? LIMIT 1;
+
+insert:
+INSERT INTO generation (name)
+VALUES (?)
+ON CONFLICT (name) DO NOTHING;
+
+insertWithId:
+INSERT OR IGNORE INTO generation (id, name)
+VALUES (?, ?);
+
+insertAndGetId:
+INSERT OR IGNORE INTO generation (name)
+VALUES (?);
+
+selectIdByName:
+SELECT id FROM generation WHERE name = ? LIMIT 1;
+
+delete:
+DELETE FROM generation WHERE id = ?;
+
+countAll:
+SELECT COUNT(*) FROM generation;
+
+lastInsertRowId:
+SELECT last_insert_rowid();

generator/externalbooks/build.gradle.kts

@@ -26,6 +26,25 @@ kotlin {
     }
 }
 
+// Download books.db from Google Drive if not already present
+tasks.register<JavaExec>("downloadBooksDb") {
+    group = "application"
+    description = "Download books.db from Google Drive if it doesn't exist locally."
+
+    dependsOn("jvmJar")
+    mainClass.set("io.github.kdroidfilter.seforimlibrary.externalbooks.BooksDbFetcherKt")
+    classpath = files(tasks.named("jvmJar")) + configurations.getByName("jvmRuntimeClasspath")
+
+    val defaultBooksDb = layout.buildDirectory.file("books.db").get().asFile.absolutePath
+    val booksDb = if (project.hasProperty("booksDb")) {
+        project.property("booksDb") as String
+    } else {
+        defaultBooksDb
+    }
+
+    args(booksDb)
+}
+
 // Import external book metadata (HebrewBooks + OtzarHaChochma) into seforim.db
 tasks.register<JavaExec>("importExternalBooks") {
     group = "application"