Fixed !!!

Author: Raphdf202

src/lib.rs

@@ -1,18 +1,11 @@
-use std::env;
-use std::fmt::Result;
+use std::error::Error;
 use std::fs;
 
-pub fn run(config: ()) -> Result {
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
     let contents = fs::read_to_string(config.filename)?;
 
-    let results = if config.case_sensitive {
-        search(&config.query, &contents)
-    } else {
-        search_case_insensitive(&config.query, &contents)
-    };
-
-    for line in results {
-        println!("{}", line)
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
     }
 
     Ok(())
@@ -21,20 +14,17 @@ pub fn run(config: ()) -> Result {
 pub struct Config {
     pub query: String,
     pub filename: String,
-    pub case_sensitive: bool,
 }
 
 impl Config {
-    pub fn new(args: &[String]) -> Result {
+    pub fn new(args: &[String]) -> Result<Config, &str> {
         if args.len() < 3 {
-            return Err(core::fmt::Error::msg("Not enough arguments"));
+            return Err("Not enough arguments");
         }
-        let query: String = args[1].clone();
-        let filename: String = args[2].clone();
-
-        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+        let query = args[1].clone();
+        let filename = args[2].clone();
 
-        Ok(())
+        Ok(Config { query, filename })
     }
 }
 
@@ -50,47 +40,18 @@ pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
     results
 }
 
-pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    let query = query.to_lowercase();
-    let mut results = Vec::new();
-
-    for line in contents.lines() {
-        if line.to_lowercase().contains(&query) {
-            results.push(line);
-        }
-    }
-
-    results
-}
-
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::search;
 
     #[test]
-    fn case_sensitive() {
+    fn one_result() {
         let query = "duct";
         let contents = "\
 Rust:
 safe, fast, productive.
-Pick three.
-Duct tape.";
+Pick three.";
 
         assert_eq!(vec!["safe, fast, productive."], search(query, contents));
     }
-
-    #[test]
-    fn case_insensitive() {
-        let query = "rUsT";
-        let contents = "\
-Rust:
-safe, fast, productive.
-Pick three.
-Trust me.";
-
-        assert_eq!(
-            vec!["Rust:", "Trust me."],
-            search_case_insensitive(query, contents)
-        )
-    }
 }

src/main.rs

@@ -1,13 +1,22 @@
 use std::env;
-use std::fs;
+use std::process;
+
+use searcher_txt::Config;
 
 fn main() {
     let args: Vec<String> = env::args().collect();
 
-    let query = &args[1];
-    let filename = &args[2];
-
-    let contents = fs::read_to_string(filename).expect("Error while reading the file");
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments : {}", err);
+        process::exit(1);
+    });
 
+    println!("Searching for \"{}\"", config.query);
+    println!("In file \"./{}\"", config.filename);
+    println!("Lines that contain \"{}\" :", config.query);
 
+    if let Err(e) = searcher_txt::run(config) {
+        println!("Application error : {}", e);
+        process::exit(1);
+    }
 }