We've added a config file. Don't forget config.rs.

src/config.rs

@@ -0,0 +1,26 @@
+use serde::{Deserialize, Serialize};
+// use serde_json::Result;
+use anyhow::{Context, Result};
+use std::collections::HashMap;
+use std::fs;
+use std::{fs::File, io::Write};
+
+#[derive(Serialize, Deserialize)]
+pub struct Configuration {
+    pub user_agent: String,
+    pub versions: HashMap<String, String>,
+}
+
+pub fn read_config(filename: &str) -> Result<Configuration> {
+    let data = fs::read_to_string(filename)
+        .with_context(|| format!("Failed reading filename {}", filename))?;
+    let config: Configuration = serde_json::from_str(&data)?;
+    Ok(config)
+}
+
+pub fn write_config(filename: &str, config: &Configuration) -> Result<()> {
+    let data = serde_json::to_string_pretty(config)?;
+    let mut file = File::create(filename)?;
+    file.write_all(data.as_bytes())?;
+    Ok(())
+}

src/main.rs

@@ -63,31 +63,12 @@ enum Commands {
     Test {},
 }
 
+/// Configuration filename
 const CONFIG_FILE : &str = "app.config";
 
-/*
-static APP_USER_AGENT: &str =
-    "Mozilla/5.0 (X11; Linux x86_64; rv:135.0) Gecko/20100101 Firefox/135.0";
-*/
-
-// Not needed, I process relative URLs correctly now.
-// static BASE_URL: &str = "https://www.bible.com";
-
+/// Verse of the Day URL
 static VOD_URL: &str = "https://www.bible.com/verse-of-the-day";
 
-/*
-static VERSION_URLS: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from([
-        ("ESV", "https://www.bible.com/bible/59/GEN.1.ESV"),
-        ("KJV", "https://www.bible.com/bible/1/GEN.1.KJV"),
-        ("NIV", "https://www.bible.com/bible/111/GEN.INTRO1.NIV"),
-        ("NKJV", "https://www.bible.com/bible/114/GEN.1.NKJV"),
-        // https://www.bible.com/bible/111/GEN.1.NIV"),
-        ("YLT98", "https://www.bible.com/bible/821/GEN.1.YLT98"),
-    ])
-});
-*/
-
 static BOOKS: LazyLock<Vec<&str>> = LazyLock::new(|| {
     Vec::from([
         "GEN", "EXO", "LEV", "NUM", "DEU", "JOS", "JDG", "RUT", "1SA", "2SA", "1KI", "2KI", "1CH",
@@ -112,11 +93,12 @@ fn find_files(base_dir: &str, version: &str) -> Vec<String> {
             let filename = dir.file_name().to_string_lossy().to_string();
             if filename.ends_with(version) {
                 result.push(filename);
-                // result.push(dir.path().to_string_lossy().to_string());
             }
         }
     }
 
+    // Sort filenames by the order of the books in BOOKS.
+
     let sorter_helper = |x: &String| -> (usize, i32) {
         let v: Vec<&str> = x.split(".").collect();
         let mut b: usize = 0;
@@ -139,10 +121,6 @@ fn find_files(base_dir: &str, version: &str) -> Vec<String> {
     result
 }
 
-// Start here
-// static URL: &str = "https://www.bible.com/bible/59/PSA.95.ESV";
-// "https://www.bible.com/bible/59/GEN.1.ESV";
-
 // And maybe:
 // https://www.bible.com/bible/2692/GEN.1.NASB2020
 // https://www.bible.com/bible/1/GEN.1.KJV
@@ -181,25 +159,11 @@ fn main() -> Result<()> {
             config.user_agent = new_agent;
             println!("User agent now {}", &config.user_agent);
             config::write_config(CONFIG_FILE, &config)?;
-            return Ok(());
         } else {
             println!("User agent OK.");
         }
     }
 
-    /*
-    if !VERSION_URLS.contains_key(cli.version.as_str()) {
-        println!("Sorry, I don't know about Bible Version [{}].", cli.version);
-        println!("I do know about the following:");
-
-        // Keys sorted in order.
-        for (name, _) in VERSION_URLS.iter() {
-            println!("  {}", name);
-        }
-        return Ok(());
-    }
-    */
-
     match &cli.command {
         Some(Commands::Fetch { delay }) => {
             let client = reqwest::blocking::Client::builder()
@@ -224,18 +188,10 @@ fn main() -> Result<()> {
                 let next_chapter = parse::find_next_chapter(&result.html);
 
                 if let Ok(next_url) = next_chapter {
-                    // Ok!  We have something
-                    // more = true;
-
-                    /*
-                    if next_url.starts_with("/") {
-                        url = String::from(BASE_URL) + &next_url;
-                    } else {
-                        url = next_url.to_string();
-                    }
-                    */
                     if let Ok(abs_url) = fetch::relative_to_absolute(&next_url, &url) {
                         url = abs_url;
+                    } else {
+                        more = false;
                     }
                 } else {
                     // We didn't find the Next Chapter link, so stop.
@@ -390,6 +346,7 @@ fn main() -> Result<()> {
                 println!("------");
             }
         }
+
         Some(Commands::Test {}) => {
             println!("Testing...");
             let client = reqwest::blocking::Client::builder()

src/parse.rs

@@ -96,20 +96,7 @@ pub fn find_vod(html: &String) -> Result<Vec<VerseOfDay>> {
         }
     }
 
-    /*
-    // Verse of the day is div with two a's.
-    let h1_selector = scraper::Selector::parse("div>h1").unwrap();
-    let h1 = document.select(&h1_selector).next().unwrap();
-    println!("{:?}", h1.text().collect::<Vec<_>>());
-    let a = next_element(h1).unwrap();
-    println!("a : {}", a.html());
-    */
-
-    /*
-    let a = next_element(a).unwrap();
-    println!("a : {}", a.html());
-    */
-    // Previous ones are in div[class="mlb-2"]
+     // Previous ones are in div[class="mlb-2"]
 
     let prev_div_selector = scraper::Selector::parse(r#"div[class="mlb-2"]"#).unwrap();
     let a_selector1 =
@@ -133,34 +120,8 @@ pub fn find_vod(html: &String) -> Result<Vec<VerseOfDay>> {
             }
             // println!("{}", element_text(p)); // p.text().collect::<Vec<_>>());
         }
-
-        /*
-        for a in prev_div.select(&a_selector1) {
-            if let Some(href) = a.attr("href") {
-                // let text = a.text().collect::<Vec<_>>();
-                println!("{}", element_text(a)); // text);
-                // println!("html: {}", a.html());
-            };
-        }
-        println!("-----");
-        */
-    }
-
-    /*
-    println!("And finally...");
-    let a_selector =
-        scraper::Selector::parse(r#"div>a[href^="/bible/"][class~="no-underline"]"#).unwrap();
-    let mut last_verse = String::new();
-    for a in document.select(&a_selector) {
-        if let Some(href) = a.attr("href") {
-            let text = a.text().collect::<Vec<_>>();
-            println!("{:?}", text);
-            println!("html: {}", a.html());
-        };
     }
-    */
     Ok(result)
-    // bail!("More dERP!");
 }
 
 pub fn find_next_chapter(html: &String) -> Result<String> {