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 rusqlite::Connection;
+use cjdic2_core::db::Database;
 
 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 rusqlite::Connection;
+use cjdic2_core::db::Database;
 
 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 rusqlite::Connection;
+use cjdic2_core::db::Database;
 
 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(())