Start Implementing New Blocklist

src/predictors/basic_markov.rs

-use std::{collections::HashMap, fs::File};
+use std::{collections::HashMap, fs::{self, File}};
 
 use csv::ReaderBuilder;
 
@@ -46,13 +46,26 @@ impl Predictor for MarkovChainPredictor {
     }
 
     fn update_from_query(&mut self, query: &str) -> Result<(), Box<dyn std::error::Error>> {
-        let blocklist: Vec<&str> = match self.configuration.get("blocked_words") {
+        let mut raw_list = String::new();
+        let blocklist: Vec<&str> = match self.configuration.get("blocklist") {
             Some(list) => {
-                list.split_whitespace().collect()
+                match fs::read_to_string(list) {
+                    Ok(l) => {
+                        raw_list = l.clone();
+                        raw_list.lines().collect()
+                    },
+                    _ => Vec::new()
+                }
             },
             _ => Vec::new()
             
-        };    
+        };
+
+        for word in blocklist.clone() {
+            if query.contains(word) {
+                return Ok(());
+            }
+        }
 
         //println!("blocklist:{:?}",self.configuration);
 

src/predictors/basic_set.rs

-use std::{collections::HashMap, f32::consts::E, fs::File};
+use std::{collections::HashMap, f32::consts::E, fs::{self, File}};
 
 use crate::importers::Importer;
 
@@ -45,13 +45,26 @@ impl Predictor for SetPredictor {
     }
 
     fn update_from_query(&mut self, query: &str) -> Result<(), Box<dyn std::error::Error>> {
-        let blocklist: Vec<&str> = match self.configuration.get("blocked_words") {
+        let mut raw_list = String::new();
+        let blocklist: Vec<&str> = match self.configuration.get("blocklist") {
             Some(list) => {
-                list.split_whitespace().collect()
+                match fs::read_to_string(list) {
+                    Ok(l) => {
+                        raw_list = l.clone();
+                        raw_list.lines().collect()
+                    },
+                    _ => Vec::new()
+                }
             },
             _ => Vec::new()
             
-        };    
+        };
+
+        for word in blocklist.clone() {
+            if query.contains(word) {
+                return Ok(());
+            }
+        }
 
         //println!("blocklist:{:?}",self.configuration);