feat(dict): override reopen and flush in AnyDictionary

chewing · Jan 2, 2024 · bb05466 · bb05466
1 parent 02688cf
commit bb05466
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/dictionary/mod.rs b/src/dictionary/mod.rs
@@ -518,6 +518,22 @@ impl Dictionary for AnyDictionary {
         }
     }
 
+    fn reopen(&mut self) -> Result<(), DictionaryUpdateError> {
+        match self {
+            AnyDictionary::SqliteDictionary(dict) => dict.reopen(),
+            AnyDictionary::TrieDictionary(dict) => dict.reopen(),
+            AnyDictionary::HashMapDictionary(dict) => dict.reopen(),
+        }
+    }
+
+    fn flush(&mut self) -> Result<(), DictionaryUpdateError> {
+        match self {
+            AnyDictionary::SqliteDictionary(dict) => dict.flush(),
+            AnyDictionary::TrieDictionary(dict) => dict.flush(),
+            AnyDictionary::HashMapDictionary(dict) => dict.flush(),
+        }
+    }
+
     fn insert<Syl: AsRef<Syllable>>(
         &mut self,
         syllables: &[Syl],

diff --git a/src/dictionary/sqlite.rs b/src/dictionary/sqlite.rs
@@ -270,7 +270,7 @@ impl From<RusqliteError> for DictionaryUpdateError {
 
 impl Dictionary for SqliteDictionary {
     fn lookup_phrase<Syl: AsRef<Syllable>>(&self, syllables: &[Syl]) -> Phrases<'static> {
-        let syllables_bytes = syllables.into_syllables_bytes();
+        let syllables_bytes = syllables.into_bytes();
         let mut stmt = self
             .conn
             .prepare_cached(
@@ -353,7 +353,7 @@ impl Dictionary for SqliteDictionary {
                 source: Some(Box::new(SqliteDictionaryError::ReadOnly)),
             });
         }
-        let syllables_bytes = syllables.into_syllables_bytes();
+        let syllables_bytes = syllables.into_bytes();
         let mut stmt = self.conn.prepare_cached(
             "INSERT OR REPLACE INTO dictionary_v1 (
                     syllables,
@@ -377,7 +377,7 @@ impl Dictionary for SqliteDictionary {
                 source: Some(Box::new(SqliteDictionaryError::ReadOnly)),
             });
         }
-        let syllables_bytes = syllables.into_syllables_bytes();
+        let syllables_bytes = syllables.into_bytes();
         let tx = self.conn.transaction()?;
         {
             let mut stmt = tx.prepare_cached(
@@ -424,7 +424,7 @@ impl Dictionary for SqliteDictionary {
         syllables: &[Syl],
         phrase_str: &str,
     ) -> Result<(), DictionaryUpdateError> {
-        let syllables_bytes = syllables.into_syllables_bytes();
+        let syllables_bytes = syllables.into_bytes();
         let mut stmt = self
             .conn
             .prepare_cached("DELETE FROM dictionary_v1 WHERE syllables = ? AND phrase = ?")?;
@@ -507,7 +507,7 @@ impl DictionaryBuilder for SqliteDictionaryBuilder {
         } else {
             0
         };
-        let syllables_bytes = syllables.into_syllables_bytes();
+        let syllables_bytes = syllables.into_bytes();
         let mut stmt = self.dict.conn.prepare_cached(
             "INSERT OR REPLACE INTO dictionary_v1 (
                     syllables,

diff --git a/src/zhuyin/syllable.rs b/src/zhuyin/syllable.rs
@@ -281,11 +281,11 @@ impl AsRef<Syllable> for Syllable {
 /// TODO: docs
 pub trait IntoSyllablesBytes {
     /// TODO: docs
-    fn into_syllables_bytes(&self) -> Vec<u8>;
+    fn into_bytes(&self) -> Vec<u8>;
 }
 
 impl<Syl: AsRef<Syllable>> IntoSyllablesBytes for &[Syl] {
-    fn into_syllables_bytes(&self) -> Vec<u8> {
+    fn into_bytes(&self) -> Vec<u8> {
         let mut syllables_bytes = vec![];
         self.iter()
             .for_each(|syl| syllables_bytes.extend_from_slice(&syl.as_ref().to_le_bytes()));