update

.github/workflows/rust.yml

@@ -46,7 +46,7 @@ jobs:
           cargo fmt -- --check
 
       - name: Clippy
-        run: cargo clippy --all-targets -- -D warnings
+        run: cargo clippy --all-features --all-targets -- -D warnings
 
       - name: Build
         run: cargo build --all-features --verbose

engine/translator/src/lib.rs

@@ -12,10 +12,11 @@
 //! dictionary.insert("halo".to_string(), ["hello".to_string()].to_vec());
 //! dictionary.insert("nihao".to_string(), ["hello".to_string()].to_vec());
 //!
+//! // We build the translator.
+//! let mut translator = Translator::new(dictionary, true);
+//!
 //! // Translation via scripting
 //! #[cfg(feature = "rhai")]
-//! let mut translators = HashMap::new();
-//! #[cfg(feature = "rhai")]
 //! {
 //!     let engine = Engine::new();
 //!     let hi = engine.compile(r#"
@@ -25,15 +26,9 @@
 //!             }
 //!         }
 //!     "#).unwrap();
-//!     translators.insert("hi".to_string(), hi);
+//!     translator.register("hi".to_string(), hi);
 //! }
 //!
-//! // We build the translator.
-//! #[cfg(not(feature = "rhai"))]
-//! let translator = Translator::new(dictionary, true);
-//! #[cfg(feature = "rhai")]
-//! let translator = Translator::new(dictionary, translators, true);
-//!
 //! #[cfg(feature = "rhai")]
 //! assert_eq!(
 //!     translator.translate("hi"),
@@ -65,19 +60,27 @@ pub struct Translator {
 
 impl Translator {
     /// Initiate a new translator.
-    pub fn new(
-        dictionary: HashMap<String, Vec<String>>,
-        #[cfg(feature = "rhai")] translators: HashMap<String, AST>,
-        auto_commit: bool,
-    ) -> Self {
+    pub fn new(dictionary: HashMap<String, Vec<String>>, auto_commit: bool) -> Self {
         Self {
             dictionary,
-            #[cfg(feature = "rhai")]
-            translators,
             auto_commit,
+            #[cfg(feature = "rhai")]
+            translators: HashMap::default()
         }
     }
 
+    #[cfg(feature = "rhai")]
+    /// Register a translator
+    pub fn register(&mut self, name: String, ast: AST) {
+        self.translators.insert(name, ast);
+    }
+
+    #[cfg(feature = "rhai")]
+    /// Unregister a translator
+    pub fn unregister(&mut self, name: &str) {
+        self.translators.remove(name);
+    }
+
     /// Generate a list of predicates based on the input.
     pub fn translate(&self, input: &str) -> Vec<(String, String, Vec<String>, bool)> {
         #[cfg(feature = "rhai")]
@@ -143,9 +146,13 @@ mod tests {
         let mut dictionary = HashMap::new();
         dictionary.insert("halo".to_string(), ["hello".to_string()].to_vec());
 
-        //
+        // We config the translator
+        #[cfg(not(feature = "rhai"))]
+        let translator = Translator::new(dictionary, true);
         #[cfg(feature = "rhai")]
-        let mut translators = HashMap::new();
+        let mut translator = Translator::new(dictionary, true);
+
+        //
         #[cfg(feature = "rhai")]
         {
             let engine = Engine::new();
@@ -161,16 +168,11 @@ mod tests {
             "#,
                 )
                 .unwrap();
-            translators.insert("none".to_string(), ast1);
-            translators.insert("some".to_string(), ast2);
+            translator.register("none".to_string(), ast1);
+            translator.unregister("none");
+            translator.register("some".to_string(), ast2);
         }
 
-        // We config the translator
-        #[cfg(not(feature = "rhai"))]
-        let translator = Translator::new(dictionary, true);
-        #[cfg(feature = "rhai")]
-        let translator = Translator::new(dictionary, translators, true);
-
         assert_eq!(translator.translate("h"), vec![]);
         #[cfg(feature = "rhai")]
         assert_eq!(

service/src/lib.rs

@@ -31,12 +31,16 @@ pub fn run(config: Config, mut frontend: impl Frontend) -> Result<(), Box<dyn er
         .unwrap_or((32, false, 10));
     let mut keyboard = Enigo::new();
     let mut preprocessor = Preprocessor::new(map, buffer_size);
-    let translator = Translator::new(
-        config.extract_translation(),
-        #[cfg(feature = "rhai")]
-        config.extract_translators()?,
-        auto_commit,
-    );
+    #[cfg(not(feature = "rhai"))]
+    let translator = Translator::new(config.extract_translation(), auto_commit);
+    #[cfg(feature = "rhai")]
+    let mut translator = Translator::new(config.extract_translation(), auto_commit);
+    #[cfg(feature = "rhai")]
+    config
+        .extract_translators()?
+        .into_iter()
+        .for_each(|(name, ast)| translator.register(name, ast));
+
     let mut is_special_pressed = false;
 
     frontend.set_page_size(page_size);