finished ch12.5

minigrep/src/lib.rs

@@ -1,10 +1,12 @@
 use std::fs;
 use std::error::Error;
+use std::env;
 
 // refactor 9
 pub struct Config {
     pub query: String,
     pub file_path: String,
+    pub ignore_case: bool,
 }
 
 impl Config {
@@ -16,7 +18,9 @@ impl Config {
         let query = args[1].clone();
         let file_path = args[2].clone();
 
-        Ok(Config { query, file_path })
+        let ignore_case = env::var("IGNORE_CASE").is_ok();
+
+        Ok(Config { query, file_path, ignore_case })
     }
 }
 
@@ -25,8 +29,19 @@ pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
 
     // refactor 10
     // println!("With text:\n{contents}")
+    // refactor 12
+    let results = if config.ignore_case {
+        search_case_insensitive(&config.query, &contents)
+    } else {
+        search(&config.query, &contents)
+    };
 
-    for line in search(&config.query, &contents) {
+    // refactor 12
+    // for line in search(&config.query, &contents) {
+    //     println!("{line}");
+    // }
+
+    for line in results {
         println!("{line}");
     }
 
@@ -36,12 +51,33 @@ pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
 pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
     // original that only can fail
     // vec![]
+    let mut results = Vec::new();
 
     for line in contents.lines() {
         if line.contains(query) {
             // do something with line
+            results.push(line);
         }
     }
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str, 
+    contents: &'a str
+) -> Vec<&'a str> {
+    // orignal that only fails
+    // vec![]
+
+    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)]
@@ -49,13 +85,28 @@ mod tests {
     use super::*;
 
     #[test]
-    fn one_result() {
+    fn case_sensitive() {
         let query = "duct";
         let contents = "\
 Rust:
 safe, fast, productive.
-Pick three.";
+Pick three.
+Duct tape.";
 
         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)
+        );
+    }
 }

minigrep/src/main.rs

@@ -23,12 +23,11 @@ fn main() {
     // let config = Config::new(&args);
 
     // recfactor 6
-    let config = Config::build(&args);
-    // refactor 8
-    //.unwrap_or_else(|err| {
-    //     println!("Problem parsing arguments: {err}");
-    //     process::exit(1);
-    // });
+    let config = Config::build(&args).unwrap_or_else(|err| {
+            // refactor 8
+        println!("Problem parsing arguments: {err}");
+        process::exit(1);
+    });
 
     // refactor 10
     // println!("Searching for {}", config.query);