Moved SQL into a file. Squashed warnings.

src/main.rs

@@ -3,6 +3,8 @@ use clap::{Parser, Subcommand};
 use config::save_basic_json;
 use reqwest;
 use scraper;
+use std::fs::File;
+use std::io::Write;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
@@ -10,13 +12,13 @@ use std::{
     sync::LazyLock,
 };
 use std::{thread, time::Duration};
-use std::fs::File;
-use std::io::Write;
 
 mod config;
 mod fetch;
 mod parse;
 
+const SQL_INIT: &str = include_str!("sql/init.sql");
+
 // Setup the command line options
 
 #[derive(Parser)]
@@ -309,11 +311,10 @@ fn main() -> Result<()> {
             };
 
             let mut last_book = String::new();
-            
+
             let mut extractor = |file| -> Result<()> {
                 println!("File: {}", file);
-                let bv =
-                    parse::extract_verses(filepath.join(file).to_str().unwrap())?;
+                let bv = parse::extract_verses(filepath.join(file).to_str().unwrap())?;
 
                 println!("Book {} Chapter {} BV: {:?}", bv.0, bv.1, bv.2);
                 if bv.0 != last_book {
@@ -325,7 +326,7 @@ fn main() -> Result<()> {
                 let chapter = json_book.new_chapter(bv.1 as usize);
 
                 for (idx, bv_item) in bv.2.verses.into_iter().enumerate() {
-                    let verse = chapter.verse(idx+1);
+                    let verse = chapter.verse(idx + 1);
                     for bvi in bv_item {
                         verse.push(bvi);
                     }
@@ -356,37 +357,29 @@ fn main() -> Result<()> {
                 // SQL output
                 println!("Saving SQL: {}", sql_file.to_str().unwrap());
                 let mut file = File::create(sql_file)?;
-                writeln!(file, r#"CREATE TABLE "Books" (
-	"bid"	INTEGER,
-	"book"	TEXT NOT NULL UNIQUE,
-	PRIMARY KEY("bid" AUTOINCREMENT)
-);"#);
-                writeln!(file, r#"CREATE TABLE "Verses" (
-	"bid"	INTEGER,
-	"chapter"	INTEGER,
-	"verse"	INTEGER,
-	"sequence"	INTEGER,
-	"type"	TEXT,
-	"text"	TEXT,
-	PRIMARY KEY("bid","chapter","verse","sequence","verse"),
-	FOREIGN KEY("bid") REFERENCES "Books"("bid")
-);"#);
+
+                let _ = writeln!(file, "{}", SQL_INIT);
+
                 // Database tables are ready.
-                let mut book_id = HashMap::<String,usize>::new();
+                let mut book_id = HashMap::<String, usize>::new();
 
                 let base = "INSERT INTO Books(book) VALUES ";
                 let mut collection = Vec::<String>::new();
-                
-                for (bidx,book) in (&json_output.books).into_iter().enumerate() {
+
+                for (bidx, book) in (&json_output.books).into_iter().enumerate() {
                     collection.push(format!("(\"{}\")", book));
                     // Save index number
-                    book_id.insert(book.clone(), bidx+1 );
+                    book_id.insert(book.clone(), bidx + 1);
                     // writeln!(file, "INSERT INTO Books(book) VALUES (\"{}\");", book);
                 }
-                writeln!(file, "BEGIN TRANSACTION;");
-                writeln!(file, "{} {};", base, collection.join(","));
-                writeln!(file, "COMMIT;");
+                let _ = writeln!(file, "BEGIN TRANSACTION;");
+                let _ = writeln!(file, "{} {};", base, collection.join(","));
+                let _ = writeln!(file, "COMMIT;");
 
+                // This outputs the books in a random order (according to how
+                // the String keys are arranged in the HashMap).
+                // I would like them to be in order.
+                
                 for (book, info) in json_output.book {
                     // Find the index # we need.
 
@@ -397,7 +390,7 @@ fn main() -> Result<()> {
                         bid = *book_id.get(&book).unwrap();
                         bid_found = true;
                     }
-                    /* 
+                    /*
                     for (idx,b) in BOOK_NAMES.iter().enumerate() {
                         if book == *b  {
                             bid = idx;
@@ -411,18 +404,20 @@ fn main() -> Result<()> {
                         panic!("I couldn't find index for {}!", book);
                     }
 
-                    let base = "INSERT INTO Verses(bid, chapter, verse, sequence, type, text) VALUES ";
+                    let base =
+                        "INSERT INTO Verses(bid, chapter, verse, sequence, type, text) VALUES ";
                     collection.clear();
 
                     for (cidx, ch) in info.chapters.iter().enumerate() {
                         // Chapter would be cidx + 1
-                        writeln!(file, "BEGIN TRANSACTION;");
+                        let _ = writeln!(file, "BEGIN TRANSACTION;");
                         for (vidx, v) in ch.verses.iter().enumerate() {
                             // Verse would be vidx + 1
-                            
+
                             for (pidx, p) in v.iter().enumerate() {
-                                let mut t = String::new();
-                                let mut text = String::new();
+                                let mut t: String; //  = String::new();
+                                let text: String; // = String::new();
+
                                 match p {
                                     config::BasicVerseJSON::Heading(txt) => {
                                         t = String::from("H");
@@ -432,7 +427,12 @@ fn main() -> Result<()> {
                                         t = String::from("N");
                                         text = txt.clone();
                                     }
-                                    config::BasicVerseJSON::Verse{ text: txt, paragraph: p, quote: q, red: r} => {
+                                    config::BasicVerseJSON::Verse {
+                                        text: txt,
+                                        paragraph: p,
+                                        quote: q,
+                                        red: r,
+                                    } => {
                                         t = String::from("V");
                                         if *p {
                                             t.push_str("P");
@@ -447,15 +447,23 @@ fn main() -> Result<()> {
                                     }
                                 }
                                 // Part would be pidx + 1
-                                collection.push(format!("({},{},{},{},\"{}\",\"{}\")", bid, cidx+1, vidx+1, pidx+1, t, text));
+                                collection.push(format!(
+                                    "({},{},{},{},\"{}\",\"{}\")",
+                                    bid,
+                                    cidx + 1,
+                                    vidx + 1,
+                                    pidx + 1,
+                                    t,
+                                    text
+                                ));
                             }
                             // Output the insert statement
                             if !collection.is_empty() {
-                                writeln!(file, "{} {};", base, collection.join(","));
+                                let _ = writeln!(file, "{} {};", base, collection.join(","));
                                 collection.clear();
                             }
                         }
-                        writeln!(file, "COMMIT;");
+                        let _ = writeln!(file, "COMMIT;");
                     }
                 }
             }

src/parse.rs

@@ -294,7 +294,7 @@ impl WalkerParser {
                 if let VerseInformation::Content {
                     text: l_text,
                     quoted: l_q,
-                    paragraph: l_p,
+                    paragraph: _l_p,
                     red: l_r,
                 } = last
                 {

src/sql/init.sql

@@ -0,0 +1,15 @@
+CREATE TABLE "Books" (
+	"bid"	INTEGER,
+	"book"	TEXT NOT NULL UNIQUE,
+	PRIMARY KEY("bid" AUTOINCREMENT)
+);
+CREATE TABLE "Verses" (
+	"bid"	INTEGER,
+	"chapter"	INTEGER,
+	"verse"	INTEGER,
+	"sequence"	INTEGER,
+	"type"	TEXT,
+	"text"	TEXT,
+	PRIMARY KEY("bid","chapter","verse","sequence","verse"),
+	FOREIGN KEY("bid") REFERENCES "Books"("bid")
+);