Sorting books/chapters in order.

src/main.rs

@@ -77,6 +77,10 @@ static BOOKS: LazyLock<Vec<&str>> = LazyLock::new(|| {
     ])
 });
 
+static BOOK_MAP: LazyLock<HashMap<&str, usize>> =
+    LazyLock::new(|| { 
+        HashMap::from_iter(BOOKS.iter().enumerate().map(|x| (*x.1, x.0 + 1)))});
+
 // find_files in base_dir that end with extension bible.
 fn find_files(base_dir: &str, bible: &str) -> Vec<String> {
     let paths = std::fs::read_dir(base_dir).unwrap();
@@ -86,14 +90,31 @@ fn find_files(base_dir: &str, bible: &str) -> Vec<String> {
         if let Ok(dir) = path {
             let filename = dir.file_name().to_string_lossy().to_string();
             if filename.ends_with(bible) {
-                // result.push(dir.file_name().to_string_lossy().to_string());
-                result.push(dir.path().to_string_lossy().to_string());
+                result.push(filename);
+                // result.push(dir.path().to_string_lossy().to_string());
             }
         }
     }
 
+    let sorter_helper = |x:&String| -> (usize,i32) {
+        let v : Vec<&str> = x.split(".").collect();
+        let mut b:usize = 0;
+        if BOOK_MAP.contains_key(v[0]) {
+            b = BOOK_MAP[v[0]];
+        }
+        let c:i32 = v[1].parse().unwrap_or(0);
+        (b,c)
+    };
+
+    // 1. Make it work. 2. Make it fast.
+
     // It would be nice to sort these (by book and chapter), so they are in order.
     // Should I just return file_names instead of path?
+    result.sort_by(|a, b| {
+        let a_v = sorter_helper(a);
+        let b_v = sorter_helper(b);
+        a_v.cmp(&b_v)
+    });
     result
 }
 
@@ -226,14 +247,17 @@ fn main() {
         Some(Commands::Extract { count, all }) => {
             println!("Extract...");
             let mut files = find_files(cli.work.to_str().unwrap(), cli.bible.as_str());
-            files.insert(0, String::from("bible/GEN.1.NIV"));
+            let mut filepath = Path::new(&cli.work);
 
             let mut chapters: HashMap<String, String> = HashMap::<String, String>::new();
 
             let mut extractor = |file| {
                 println!("File: {}", file);
-
-                let buffer = std::fs::read_to_string(Path::new(file)).unwrap();
+                /* 
+                let mut filepath = cli.work.clone();
+                filepath = filepath.join(file);
+                */
+                let buffer = std::fs::read_to_string(filepath.join(file)).unwrap();
                 let document = scraper::Html::parse_document(&buffer);
 
                 let h1_selector = scraper::Selector::parse("h1").unwrap();
@@ -315,6 +339,10 @@ fn main() {
 
             println!("Chapters: {:?}", chapters);
 
+            /*
+            "AMO.8.9": "“And on that day,” declares the Lord God,\n“I will make the sun go down at noonand darken the earth in broad daylight.\n"}
+            ^ noonand ?  Shouldn't that be "noon and"?  Check original. Original has a break between them.  Check merge routine.
+             */
             /*
             // for file in files.iter().take(*count as usize) {
             for file in files_iter {