New repository methods

src/data/entities.rs

@@ -1,5 +1,6 @@
 use crate::app::AppState;
 use crate::core::srs::{FADE_PER_DAY, MAX_SCORE, OrderMode, WordOpenMode};
+use crate::data::repositories::Repository;
 use crate::data::{INVALID_ID, Id};
 use chrono::{DateTime, NaiveDate, Utc};
 use fsrs::MemoryState;
@@ -116,42 +117,34 @@ impl DeckSettings {
 
         let ast = engine.compile(&self.filter);
         if let Ok(ast) = ast {
-            let groups = &state.word_groups;
+            let groups = state.word_groups.read();
+            let query = state
+                .dictionary.read().query_par(| word: &WordData|{
+                let mut more = rhai::Map::new();
+                for iced in &word.additional {
+                    more.insert(iced.0.clone().into(), iced.1.clone().into());
+                }
+                let mut scope = Scope::new();
+                let group_name = groups.get_ref(&mut groups.handle_by_id(word.group_id)).unwrap().name;
 
-            list = state
-                .dictionary
-                .par_iter()
-                .enumerate()
-                .filter(|(_, word)| {
-                    let mut more = rhai::Map::new();
-                    for iced in &word.additional {
-                        more.insert(iced.0.clone().into(), iced.1.clone().into());
-                    }
-                    let mut scope = Scope::new();
-                    scope
-                        .push_constant("id", word.id.0 as i64)
-                        .push_constant("key", word.key.clone())
-                        .push_constant("value", word.value.clone())
-                        .push_constant("tags", word.tags.clone())
-                        .push_constant("more", more)
-                        .push_constant(
-                            "group",
-                            groups
-                                .iter()
-                                .find(|g| g.id == word.group_id)
-                                .cloned()
-                                .expect("No group id")
-                                .name,
-                        );
+                scope
+                    .push_constant("id", word.id.0 as i64)
+                    .push_constant("key", word.key.clone())
+                    .push_constant("value", word.value.clone())
+                    .push_constant("tags", word.tags.clone())
+                    .push_constant("more", more)
+                    .push_constant(
+                        "group",
+                        group_name,
+                    );
+
+                let result = engine.eval_ast_with_scope::<bool>(&mut scope, &ast);
+                if let Ok(result) = result {
+                    return result;
+                }
+                false
+            });
 
-                    let result = engine.eval_ast_with_scope::<bool>(&mut scope, &ast);
-                    if let Ok(result) = result {
-                        return result;
-                    }
-                    false
-                })
-                .map(|(index, _)| index)
-                .collect();
 
             info!("Collecting available words is {:?}", time.elapsed());
 
@@ -214,7 +207,7 @@ impl CardState {
     }
 }
 
-pub struct CustomField{
+pub struct CustomField {
     pub id: Id,
     pub name: String,
 }