db sub schema (via Arc)

src-core/examples/add-to-yomitan.rs

@@ -5,11 +5,11 @@ use std::{
 };
 
 use anyhow::{Context, Ok};
-use cjdic2_core::db::import_bundled_zip_file;
+use cjdic2_core::db::Database;
-use rusqlite::Connection;
 
 fn main() -> Result<(), anyhow::Error> {
-    let conn = &mut Connection::open("test.db")?;
+    let db = Database::new("test.db")?;
+
     let zip_dir = Path::new("src-tauri/resources/yomitan");
     println!("zip_dir: {:?}", absolute(zip_dir)); // Relative to workspace root
 
@@ -23,7 +23,7 @@ fn main() -> Result<(), anyhow::Error> {
             let start = Instant::now();
 
             println!("zip_file: {:?}", p);
-            println!("{:?}", import_bundled_zip_file(conn, p, "ja")?,);
+            println!("{:?}", db.yomitan().import_bundled_zip_file(p, "ja")?,);
             println!("[{:.2?}]", start.elapsed(),);
         } else {
             println!("not zip_file: {:?}", p);

src-core/examples/search-yomitan.rs

@@ -1,14 +1,13 @@
 use std::time::Instant;
 
 use anyhow::Ok;
-use cjdic2_core::db::search_yomitan;
+use cjdic2_core::db::Database;
-use rusqlite::Connection;
 
 fn main() -> Result<(), anyhow::Error> {
-    let conn = &mut Connection::open("test.db")?;
+    let db = Database::new("test.db")?;
 
     let start = Instant::now();
-    let rs = search_yomitan(conn, "擦る", "する", 10, 0)?;
+    let rs = db.yomitan().search_yomitan("擦る", "する", 10, 0)?;
     println!("{:#?}", rs);
     println!("n={}", rs.len());
     println!("[{:.2?}]", start.elapsed());

src-core/examples/yomitan-mod-schema.rs

@@ -1,14 +1,13 @@
 use std::time::Instant;
 
 use anyhow::Ok;
-use cjdic2_core::db::create_schema;
+use cjdic2_core::db::Database;
-use rusqlite::Connection;
 
 fn main() -> Result<(), anyhow::Error> {
-    let conn = &mut Connection::open("test.db")?;
+    let db = Database::new("test.db")?;
 
     let start = Instant::now();
-    create_schema(conn)?;
+    db.yomitan().create_schema()?;
     println!("[{:.2?}]", start.elapsed());
 
     Ok(())

src-core/src/db.rs

@@ -1,24 +1,31 @@
-use std::{path::Path, sync::Mutex};
+use std::{
+    path::Path,
+    sync::{Arc, Mutex},
+};
 
 use rusqlite::{Connection, Result};
 
 use crate::models::Entry;
 
 mod yomitan;
-pub use yomitan::{YomitanRow, create_schema, import_bundled_zip_file, search_yomitan};
 
+#[derive(Clone)]
 pub struct Database {
-    conn: Mutex<Connection>,
+    pub(crate) conn: Arc<Mutex<Connection>>,
 }
 
 impl Database {
     pub fn new<P: AsRef<Path>>(path: P) -> Result<Self> {
         let conn = Connection::open(path)?;
         Ok(Self {
-            conn: Mutex::new(conn),
+            conn: Arc::new(Mutex::new(conn)),
         })
     }
 
+    pub fn yomitan(&self) -> yomitan::YomitanDatabase {
+        yomitan::YomitanDatabase::new(self.clone())
+    }
+
     pub fn init(&self) -> Result<()> {
         let conn = self.conn.lock().unwrap();
 

src-core/src/db/kanjidic.rs

@@ -0,0 +1 @@
+

src-core/src/db/yomitan.rs

@@ -2,19 +2,30 @@ use std::{collections::HashMap, fs::File, io::Read, path::PathBuf};
 
 use anyhow::Context;
 use blake3::hash;
-use rusqlite::{Connection, Transaction, params};
+use rusqlite::{Result, Transaction, params};
 use serde::Serialize;
 use serde_json::Value;
 use zip::ZipArchive;
 
-use crate::CJDicError;
+use crate::{CJDicError, db::Database};
 
 fn blake3_hex(s: &str) -> String {
     format!("{}", hash(s.as_bytes()))
 }
 
-pub fn create_schema(conn: &Connection) -> rusqlite::Result<()> {
+pub struct YomitanDatabase {
-    conn.execute_batch(
+    db: Database,
+}
+
+impl YomitanDatabase {
+    pub(crate) fn new(db: Database) -> Self {
+        Self { db }
+    }
+
+    pub fn create_schema(&self) -> Result<()> {
+        let conn = self.db.conn.lock().unwrap();
+
+        conn.execute_batch(
         "
         PRAGMA journal_mode = WAL;
         PRAGMA foreign_keys = ON;
@@ -89,26 +100,342 @@ pub fn create_schema(conn: &Connection) -> rusqlite::Result<()> {
         ",
     )?;
 
-    conn.execute_batch(
+        conn.execute_batch(
-        "
+            "
         CREATE INDEX IF NOT EXISTS dictionaries_lang ON dictionaries (lang);
 
         CREATE INDEX IF NOT EXISTS terms_term ON terms (term);
         CREATE INDEX IF NOT EXISTS terms_reading ON terms (reading);
         ",
-    )?;
+        )?;
 
-    let mut stmt = conn.prepare("SELECT 1 FROM schema_meta WHERE key = 'schema_version'")?;
+        let mut stmt = conn.prepare("SELECT 1 FROM schema_meta WHERE key = 'schema_version'")?;
-    if stmt.exists([])? == false {
+        if stmt.exists([])? == false {
-        conn.prepare("INSERT INTO schema_meta (key, value) VALUES ('schema_version', '1')")?
+            conn.prepare("INSERT INTO schema_meta (key, value) VALUES ('schema_version', '1')")?
+                .execute([])?;
+            conn.prepare(
+                "INSERT INTO schema_meta (key, value) VALUES ('created_at', datetime('now'))",
+            )?
             .execute([])?;
-        conn.prepare(
+        }
-            "INSERT INTO schema_meta (key, value) VALUES ('created_at', datetime('now'))",
+
-        )?
+        Ok(())
-        .execute([])?;
     }
 
-    Ok(())
+    pub fn import_bundled_zip_file(
+        &mut self,
+        zip_path: PathBuf,
+        lang: &str,
+    ) -> anyhow::Result<YomitanZipImportResult, CJDicError> {
+        self.create_schema()?;
+
+        let f =
+            File::open(&zip_path).with_context(|| format!("opening zip {}", zip_path.display()))?;
+        let mut archive = ZipArchive::new(f).with_context(|| "reading zip archive")?;
+
+        let index_file = match archive.by_name("index.json") {
+            Ok(mut f) => {
+                let mut s = String::new();
+                f.read_to_string(&mut s)?;
+                serde_json::from_str::<Value>(&s)?
+            }
+            Err(e) => {
+                // TODO: proper error handling
+                eprintln!("{}", e);
+                return Ok(YomitanZipImportResult {
+                    exists: false,
+                    load: false,
+                    error: Some(format!("{}", e)),
+                });
+            }
+        };
+
+        let title = index_file
+            .get("title")
+            .and_then(Value::as_str)
+            .unwrap_or("")
+            .to_string();
+        let revision = index_file
+            .get("revision")
+            .and_then(Value::as_str)
+            .unwrap_or("")
+            .to_string();
+
+        let mut conn = self.db.conn.lock().unwrap();
+
+        // Skip if already installed
+        let exists: bool = conn
+            .prepare("SELECT 1 FROM dictionaries WHERE title = ?1 AND revision = ?2")?
+            .exists([title, revision])?;
+        if exists {
+            return Ok(YomitanZipImportResult {
+                exists: true,
+                load: false,
+                error: None,
+            });
+        }
+
+        let tx = conn.transaction()?;
+        tx.execute(
+            "INSERT INTO dictionaries (title, revision, author, url, description, lang) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
+            params![
+                index_file.get("title").and_then(Value::as_str),
+                index_file.get("revision").and_then(Value::as_str),
+                index_file.get("author").and_then(Value::as_str),
+                index_file.get("url").and_then(Value::as_str),
+                index_file.get("description").and_then(Value::as_str),
+                lang,
+            ],
+        )?;
+
+        let dict_id: i64 = tx.query_row("SELECT last_insert_rowid()", [], |r| r.get(0))?;
+
+        // prepare statements
+        let insert_glossary = "INSERT OR IGNORE INTO glossaries (hash, content) VALUES (?1, ?2)";
+        let select_glossary = "SELECT id FROM glossaries WHERE hash = ?1";
+        let insert_def = "INSERT OR IGNORE INTO def_tag_sets (tags) VALUES (?1)";
+        let select_def = "SELECT id FROM def_tag_sets WHERE tags = ?1";
+        let insert_term_tags = "INSERT OR IGNORE INTO term_tag_sets (tags) VALUES (?1)";
+        let select_term_tags = "SELECT id FROM term_tag_sets WHERE tags = ?1";
+        let insert_rules = "INSERT OR IGNORE INTO rule_sets (rules) VALUES (?1)";
+        let select_rules = "SELECT id FROM rule_sets WHERE rules = ?1";
+        let insert_term = "INSERT INTO terms (dict_id, term, reading, def_tags_id, rules_id, score, glossary_id, sequence, term_tags_id) VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9)";
+        let insert_meta =
+            "INSERT INTO term_meta (dict_id, term, mode, reading, data) VALUES (?1,?2,?3,?4,?5)";
+        let insert_tag = "INSERT OR IGNORE INTO tags (dict_id, name, category, sort_order, notes, score) VALUES (?1,?2,?3,?4,?5,?6)";
+
+        let mut glossary_cache: HashMap<String, i64> = HashMap::new();
+        let mut def_cache: HashMap<String, i64> = HashMap::new();
+        let mut term_tags_cache: HashMap<String, i64> = HashMap::new();
+        let mut rules_cache: HashMap<String, i64> = HashMap::new();
+
+        // term banks
+        let mut bank_i = 1;
+        loop {
+            let name = format!("term_bank_{}.json", bank_i);
+            match archive.by_name(&name) {
+                Ok(mut f) => {
+                    let mut s = String::new();
+                    f.read_to_string(&mut s)?;
+                    let entries: Vec<Value> = serde_json::from_str(&s)?;
+                    for e in entries {
+                        let term = e.get(0).and_then(Value::as_str).unwrap_or("");
+                        let reading = e.get(1).and_then(Value::as_str).unwrap_or("");
+                        let def_tags = e
+                            .get(2)
+                            .and_then(Value::as_str)
+                            .map(|s| s.trim())
+                            .filter(|s| !s.is_empty())
+                            .map(|s| s.to_string());
+                        let rules = e
+                            .get(3)
+                            .and_then(Value::as_str)
+                            .map(|s| s.trim())
+                            .filter(|s| !s.is_empty())
+                            .map(|s| s.to_string());
+                        let score = e.get(4).and_then(Value::as_i64).unwrap_or(0);
+                        let glossary_val = e.get(5).cloned().unwrap_or(Value::Null);
+                        let sequence = e.get(6).and_then(Value::as_i64);
+                        let term_tags = e
+                            .get(7)
+                            .and_then(Value::as_str)
+                            .map(|s| s.trim())
+                            .filter(|s| !s.is_empty())
+                            .map(|s| s.to_string());
+
+                        let glossary_json = serde_json::to_string(&glossary_val)?;
+                        let hash = blake3_hex(&glossary_json);
+                        let glossary_id = if let Some(&id) = glossary_cache.get(&hash) {
+                            id
+                        } else {
+                            tx.execute(insert_glossary, params![hash, glossary_json])?;
+                            let id: i64 =
+                                tx.query_row(select_glossary, params![hash], |r| r.get(0))?;
+                            glossary_cache.insert(hash.clone(), id);
+                            id
+                        };
+
+                        let def_id = if let Some(s) = def_tags.as_deref() {
+                            intern(&tx, insert_def, select_def, &mut def_cache, s)?
+                        } else {
+                            0
+                        };
+                        let rules_id = if let Some(s) = rules.as_deref() {
+                            intern(&tx, insert_rules, select_rules, &mut rules_cache, s)?
+                        } else {
+                            0
+                        };
+                        let term_tags_id = if let Some(s) = term_tags.as_deref() {
+                            intern(
+                                &tx,
+                                insert_term_tags,
+                                select_term_tags,
+                                &mut term_tags_cache,
+                                s,
+                            )?
+                        } else {
+                            0
+                        };
+
+                        tx.execute(
+                            insert_term,
+                            params![
+                                dict_id,
+                                term,
+                                reading,
+                                if def_id != 0 {
+                                    Some(def_id)
+                                } else {
+                                    Option::<i64>::None
+                                },
+                                if rules_id != 0 {
+                                    Some(rules_id)
+                                } else {
+                                    Option::<i64>::None
+                                },
+                                score,
+                                glossary_id,
+                                sequence,
+                                if term_tags_id != 0 {
+                                    Some(term_tags_id)
+                                } else {
+                                    Option::<i64>::None
+                                },
+                            ],
+                        )?;
+                    }
+                    bank_i += 1;
+                    continue;
+                }
+                Err(_) => break,
+            }
+        }
+
+        // term_meta banks
+        let mut meta_i = 1;
+        loop {
+            let name = format!("term_meta_bank_{}.json", meta_i);
+            match archive.by_name(&name) {
+                Ok(mut f) => {
+                    let mut s = String::new();
+                    f.read_to_string(&mut s)?;
+                    let entries: Vec<Value> = serde_json::from_str(&s)?;
+                    for e in entries {
+                        let term = e.get(0).and_then(Value::as_str).unwrap_or("");
+                        let mode = e.get(1).and_then(Value::as_str).unwrap_or("");
+                        let data = e.get(2).cloned().unwrap_or(Value::Null);
+                        let reading = data
+                            .get("reading")
+                            .and_then(Value::as_str)
+                            .map(|s| s.to_string());
+                        tx.execute(
+                            insert_meta,
+                            params![dict_id, term, mode, reading, serde_json::to_string(&data)?],
+                        )?;
+                    }
+                    meta_i += 1;
+                    continue;
+                }
+                Err(_) => break,
+            }
+        }
+
+        // tag banks
+        let mut tag_i = 1;
+        loop {
+            let name = format!("tag_bank_{}.json", tag_i);
+            match archive.by_name(&name) {
+                Ok(mut f) => {
+                    let mut s = String::new();
+                    f.read_to_string(&mut s)?;
+                    let entries: Vec<Value> = serde_json::from_str(&s)?;
+                    for e in entries {
+                        let name = e.get(0).and_then(Value::as_str).unwrap_or("");
+                        let category = e.get(1).and_then(Value::as_str);
+                        let sort_order = e.get(2).and_then(Value::as_i64).unwrap_or(0);
+                        let notes = e.get(3).and_then(Value::as_str);
+                        let tag_score = e.get(4).and_then(Value::as_i64).unwrap_or(0);
+                        tx.execute(
+                            insert_tag,
+                            params![dict_id, name, category, sort_order, notes, tag_score],
+                        )?;
+                    }
+                    tag_i += 1;
+                    continue;
+                }
+                Err(_) => break,
+            }
+        }
+
+        tx.commit()?;
+
+        conn.execute_batch("VACUUM;")?;
+
+        Ok(YomitanZipImportResult {
+            exists: true,
+            load: true,
+            error: None,
+        })
+    }
+
+    pub fn search_yomitan(
+        &self,
+        q_term: &str,
+        q_reading: &str,
+        limit: u32,
+        offset: u32,
+    ) -> Result<Vec<YomitanRow>, CJDicError> {
+        let and_or = if q_term == q_reading { "OR" } else { "AND" };
+
+        // TODO: consider using = if not GLOB string
+        let sql = format!(
+            r#"
+        SELECT
+            t.term,
+            t.reading,
+            COALESCE(dt.tags,  '')  AS def_tags,
+            COALESCE(r.rules,  '')  AS rules,
+            t.score,
+            g.content               AS glossary_json,
+            t.sequence,
+            COALESCE(tt.tags,  '')  AS term_tags,
+            d.title                 AS dict_title
+        FROM terms t
+        JOIN  glossaries    g  ON g.id  = t.glossary_id
+        JOIN  dictionaries  d  ON d.id  = t.dict_id
+        LEFT JOIN def_tag_sets  dt ON dt.id = t.def_tags_id
+        LEFT JOIN rule_sets      r ON r.id  = t.rules_id
+        LEFT JOIN term_tag_sets tt ON tt.id = t.term_tags_id
+        WHERE t.term GLOB ?1 {} t.reading GLOB ?2
+        ORDER BY t.score DESC
+        LIMIT ?3 OFFSET ?4
+        "#,
+            and_or
+        );
+
+        let conn = self.db.conn.lock().unwrap();
+
+        let mut stmt = conn.prepare(&sql)?;
+        let rows = stmt.query_map(params![q_term, q_reading, limit, offset], |r| {
+            Ok(YomitanRow {
+                term: r.get(0)?,
+                reading: r.get(1)?,
+                def_tags: r.get(2)?,
+                rules: r.get(3)?,
+                score: r.get(4)?,
+                glossary_json: r.get(5)?,
+                sequence: r.get(6)?,
+                term_tags: r.get(7)?,
+                dict_title: r.get(8)?,
+            })
+        })?;
+
+        let mut out = Vec::new();
+        for r in rows {
+            out.push(r?);
+        }
+        Ok(out)
+    }
 }
 
 fn intern(
@@ -134,258 +461,6 @@ pub struct YomitanZipImportResult {
     error: Option<String>,
 }
 
-pub fn import_bundled_zip_file(
-    conn: &mut Connection,
-    zip_path: PathBuf,
-    lang: &str,
-) -> anyhow::Result<YomitanZipImportResult, CJDicError> {
-    create_schema(&conn)?;
-
-    let f = File::open(&zip_path).with_context(|| format!("opening zip {}", zip_path.display()))?;
-    let mut archive = ZipArchive::new(f).with_context(|| "reading zip archive")?;
-
-    let index_file = match archive.by_name("index.json") {
-        Ok(mut f) => {
-            let mut s = String::new();
-            f.read_to_string(&mut s)?;
-            serde_json::from_str::<Value>(&s)?
-        }
-        Err(e) => {
-            // TODO: proper error handling
-            eprintln!("{}", e);
-            return Ok(YomitanZipImportResult {
-                exists: false,
-                load: false,
-                error: Some(format!("{}", e)),
-            });
-        }
-    };
-
-    let title = index_file
-        .get("title")
-        .and_then(Value::as_str)
-        .unwrap_or("")
-        .to_string();
-    let revision = index_file
-        .get("revision")
-        .and_then(Value::as_str)
-        .unwrap_or("")
-        .to_string();
-
-    // Skip if already installed
-    let exists: bool = conn
-        .prepare("SELECT 1 FROM dictionaries WHERE title = ?1 AND revision = ?2")?
-        .exists([title, revision])?;
-    if exists {
-        return Ok(YomitanZipImportResult {
-            exists: true,
-            load: false,
-            error: None,
-        });
-    }
-
-    let tx = conn.transaction()?;
-    tx.execute(
-            "INSERT INTO dictionaries (title, revision, author, url, description, lang) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
-            params![
-                index_file.get("title").and_then(Value::as_str),
-                index_file.get("revision").and_then(Value::as_str),
-                index_file.get("author").and_then(Value::as_str),
-                index_file.get("url").and_then(Value::as_str),
-                index_file.get("description").and_then(Value::as_str),
-                lang,
-            ],
-        )?;
-
-    let dict_id: i64 = tx.query_row("SELECT last_insert_rowid()", [], |r| r.get(0))?;
-
-    // prepare statements
-    let insert_glossary = "INSERT OR IGNORE INTO glossaries (hash, content) VALUES (?1, ?2)";
-    let select_glossary = "SELECT id FROM glossaries WHERE hash = ?1";
-    let insert_def = "INSERT OR IGNORE INTO def_tag_sets (tags) VALUES (?1)";
-    let select_def = "SELECT id FROM def_tag_sets WHERE tags = ?1";
-    let insert_term_tags = "INSERT OR IGNORE INTO term_tag_sets (tags) VALUES (?1)";
-    let select_term_tags = "SELECT id FROM term_tag_sets WHERE tags = ?1";
-    let insert_rules = "INSERT OR IGNORE INTO rule_sets (rules) VALUES (?1)";
-    let select_rules = "SELECT id FROM rule_sets WHERE rules = ?1";
-    let insert_term = "INSERT INTO terms (dict_id, term, reading, def_tags_id, rules_id, score, glossary_id, sequence, term_tags_id) VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9)";
-    let insert_meta =
-        "INSERT INTO term_meta (dict_id, term, mode, reading, data) VALUES (?1,?2,?3,?4,?5)";
-    let insert_tag = "INSERT OR IGNORE INTO tags (dict_id, name, category, sort_order, notes, score) VALUES (?1,?2,?3,?4,?5,?6)";
-
-    let mut glossary_cache: HashMap<String, i64> = HashMap::new();
-    let mut def_cache: HashMap<String, i64> = HashMap::new();
-    let mut term_tags_cache: HashMap<String, i64> = HashMap::new();
-    let mut rules_cache: HashMap<String, i64> = HashMap::new();
-
-    // term banks
-    let mut bank_i = 1;
-    loop {
-        let name = format!("term_bank_{}.json", bank_i);
-        match archive.by_name(&name) {
-            Ok(mut f) => {
-                let mut s = String::new();
-                f.read_to_string(&mut s)?;
-                let entries: Vec<Value> = serde_json::from_str(&s)?;
-                for e in entries {
-                    let term = e.get(0).and_then(Value::as_str).unwrap_or("");
-                    let reading = e.get(1).and_then(Value::as_str).unwrap_or("");
-                    let def_tags = e
-                        .get(2)
-                        .and_then(Value::as_str)
-                        .map(|s| s.trim())
-                        .filter(|s| !s.is_empty())
-                        .map(|s| s.to_string());
-                    let rules = e
-                        .get(3)
-                        .and_then(Value::as_str)
-                        .map(|s| s.trim())
-                        .filter(|s| !s.is_empty())
-                        .map(|s| s.to_string());
-                    let score = e.get(4).and_then(Value::as_i64).unwrap_or(0);
-                    let glossary_val = e.get(5).cloned().unwrap_or(Value::Null);
-                    let sequence = e.get(6).and_then(Value::as_i64);
-                    let term_tags = e
-                        .get(7)
-                        .and_then(Value::as_str)
-                        .map(|s| s.trim())
-                        .filter(|s| !s.is_empty())
-                        .map(|s| s.to_string());
-
-                    let glossary_json = serde_json::to_string(&glossary_val)?;
-                    let hash = blake3_hex(&glossary_json);
-                    let glossary_id = if let Some(&id) = glossary_cache.get(&hash) {
-                        id
-                    } else {
-                        tx.execute(insert_glossary, params![hash, glossary_json])?;
-                        let id: i64 = tx.query_row(select_glossary, params![hash], |r| r.get(0))?;
-                        glossary_cache.insert(hash.clone(), id);
-                        id
-                    };
-
-                    let def_id = if let Some(s) = def_tags.as_deref() {
-                        intern(&tx, insert_def, select_def, &mut def_cache, s)?
-                    } else {
-                        0
-                    };
-                    let rules_id = if let Some(s) = rules.as_deref() {
-                        intern(&tx, insert_rules, select_rules, &mut rules_cache, s)?
-                    } else {
-                        0
-                    };
-                    let term_tags_id = if let Some(s) = term_tags.as_deref() {
-                        intern(
-                            &tx,
-                            insert_term_tags,
-                            select_term_tags,
-                            &mut term_tags_cache,
-                            s,
-                        )?
-                    } else {
-                        0
-                    };
-
-                    tx.execute(
-                        insert_term,
-                        params![
-                            dict_id,
-                            term,
-                            reading,
-                            if def_id != 0 {
-                                Some(def_id)
-                            } else {
-                                Option::<i64>::None
-                            },
-                            if rules_id != 0 {
-                                Some(rules_id)
-                            } else {
-                                Option::<i64>::None
-                            },
-                            score,
-                            glossary_id,
-                            sequence,
-                            if term_tags_id != 0 {
-                                Some(term_tags_id)
-                            } else {
-                                Option::<i64>::None
-                            },
-                        ],
-                    )?;
-                }
-                bank_i += 1;
-                continue;
-            }
-            Err(_) => break,
-        }
-    }
-
-    // term_meta banks
-    let mut meta_i = 1;
-    loop {
-        let name = format!("term_meta_bank_{}.json", meta_i);
-        match archive.by_name(&name) {
-            Ok(mut f) => {
-                let mut s = String::new();
-                f.read_to_string(&mut s)?;
-                let entries: Vec<Value> = serde_json::from_str(&s)?;
-                for e in entries {
-                    let term = e.get(0).and_then(Value::as_str).unwrap_or("");
-                    let mode = e.get(1).and_then(Value::as_str).unwrap_or("");
-                    let data = e.get(2).cloned().unwrap_or(Value::Null);
-                    let reading = data
-                        .get("reading")
-                        .and_then(Value::as_str)
-                        .map(|s| s.to_string());
-                    tx.execute(
-                        insert_meta,
-                        params![dict_id, term, mode, reading, serde_json::to_string(&data)?],
-                    )?;
-                }
-                meta_i += 1;
-                continue;
-            }
-            Err(_) => break,
-        }
-    }
-
-    // tag banks
-    let mut tag_i = 1;
-    loop {
-        let name = format!("tag_bank_{}.json", tag_i);
-        match archive.by_name(&name) {
-            Ok(mut f) => {
-                let mut s = String::new();
-                f.read_to_string(&mut s)?;
-                let entries: Vec<Value> = serde_json::from_str(&s)?;
-                for e in entries {
-                    let name = e.get(0).and_then(Value::as_str).unwrap_or("");
-                    let category = e.get(1).and_then(Value::as_str);
-                    let sort_order = e.get(2).and_then(Value::as_i64).unwrap_or(0);
-                    let notes = e.get(3).and_then(Value::as_str);
-                    let tag_score = e.get(4).and_then(Value::as_i64).unwrap_or(0);
-                    tx.execute(
-                        insert_tag,
-                        params![dict_id, name, category, sort_order, notes, tag_score],
-                    )?;
-                }
-                tag_i += 1;
-                continue;
-            }
-            Err(_) => break,
-        }
-    }
-
-    tx.commit()?;
-
-    conn.execute_batch("VACUUM;")?;
-
-    Ok(YomitanZipImportResult {
-        exists: true,
-        load: true,
-        error: None,
-    })
-}
-
 #[derive(Serialize, Debug)]
 pub struct YomitanRow {
     term: String,
@@ -398,60 +473,3 @@ pub struct YomitanRow {
     term_tags: String,
     dict_title: String,
 }
-
-pub fn search_yomitan(
-    conn: &Connection,
-    q_term: &str,
-    q_reading: &str,
-    limit: u32,
-    offset: u32,
-) -> Result<Vec<YomitanRow>, CJDicError> {
-    let and_or = if q_term == q_reading { "OR" } else { "AND" };
-
-    // TODO: consider using = if not GLOB string
-    let sql = format!(
-        r#"
-        SELECT
-            t.term,
-            t.reading,
-            COALESCE(dt.tags,  '')  AS def_tags,
-            COALESCE(r.rules,  '')  AS rules,
-            t.score,
-            g.content               AS glossary_json,
-            t.sequence,
-            COALESCE(tt.tags,  '')  AS term_tags,
-            d.title                 AS dict_title
-        FROM terms t
-        JOIN  glossaries    g  ON g.id  = t.glossary_id
-        JOIN  dictionaries  d  ON d.id  = t.dict_id
-        LEFT JOIN def_tag_sets  dt ON dt.id = t.def_tags_id
-        LEFT JOIN rule_sets      r ON r.id  = t.rules_id
-        LEFT JOIN term_tag_sets tt ON tt.id = t.term_tags_id
-        WHERE t.term GLOB ?1 {} t.reading GLOB ?2
-        ORDER BY t.score DESC
-        LIMIT ?3 OFFSET ?4
-        "#,
-        and_or
-    );
-
-    let mut stmt = conn.prepare(&sql)?;
-    let rows = stmt.query_map(params![q_term, q_reading, limit, offset], |r| {
-        Ok(YomitanRow {
-            term: r.get(0)?,
-            reading: r.get(1)?,
-            def_tags: r.get(2)?,
-            rules: r.get(3)?,
-            score: r.get(4)?,
-            glossary_json: r.get(5)?,
-            sequence: r.get(6)?,
-            term_tags: r.get(7)?,
-            dict_title: r.get(8)?,
-        })
-    })?;
-
-    let mut out = Vec::new();
-    for r in rows {
-        out.push(r?);
-    }
-    Ok(out)
-}

src-core/src/service.rs

@@ -21,4 +21,8 @@ impl AppService {
     pub fn list_entries(&self) -> Result<Vec<Entry>, CJDicError> {
         Ok(self.db.fetch_all_entries()?)
     }
+
+    pub fn search_yomitan(&self, _term: &str, _reading: &str) -> Result<(), CJDicError> {
+        Ok(())
+    }
 }