From d26c02d239343aff84d7470716e2eb606c4b4096 Mon Sep 17 00:00:00 2001 From: Rushmore75 Date: Tue, 25 Mar 2025 15:30:54 -0600 Subject: [PATCH] fix weird issue with book names --- src/bible.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bible.rs b/src/bible.rs index 53b1f3c..77914d6 100644 --- a/src/bible.rs +++ b/src/bible.rs @@ -115,10 +115,10 @@ pub fn get(query: &str, loc: &str) { if let Some(chapter) = chatper { - if let Ok(chap_num) = chapter.parse::() { + if let Ok(chap_num) = chapter.trim().parse::() { if let Some(chapter) = book.get_chapter_by_index(chap_num) { if let Some(verse) = verse { - if let Ok(verse_num) = verse.parse::() { + if let Ok(verse_num) = verse.trim().parse::() { // return specific verse if let Some(verse) = chapter.get_verse_by_index(verse_num) { println!("{style_underline}{style_bold}{} {}:{}{style_reset}: {}", found_book.1, chapter.number, verse.number, verse); @@ -131,7 +131,7 @@ pub fn get(query: &str, loc: &str) { let end = range[1].parse::(); if let (Ok(s), Ok(e)) = (start,end) { - println!("{style_underline}{style_bold}{} {}:{}-{}{style_reset}", found_book.1, chapter.number, s, e); + println!("{style_underline}{style_bold}{} {}:{}-{}{style_reset}:", found_book.1, chapter.number, s, e); for verse_idx in s..=e { if let Some(v) = chapter.get_verse_by_index(verse_idx) { println!("{style_underline}{style_bold}{}{style_reset}: {}", v.number, v); @@ -141,7 +141,8 @@ pub fn get(query: &str, loc: &str) { } } } else { - println!("{}", chapter); + println!("{style_bold}{style_underline}{} {}{style_reset}:", found_book.1, chapter.number); + print!("{}", chapter); } } } @@ -187,7 +188,7 @@ impl Chapter { #[derive(Deserialize)] struct Bible { #[serde(rename = "@translation")] - version: String, + _version: String, #[serde(rename = "testament")] testaments: Vec, } @@ -196,7 +197,7 @@ struct Bible { struct Testament { #[serde(rename = "@name")] // yes, this would make a nice enum - testament: String, + _testament: String, #[serde(rename = "book")] books: Vec, } @@ -218,9 +219,8 @@ struct Chapter { } impl Display for Chapter { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - writeln!(f, "{style_bold}{style_underline}{}{style_reset}", self.number)?; for v in &self.verses { - writeln!(f, "|\t{}", v)?; + writeln!(f, "{style_bold}{style_underline}{}{style_reset}: {}", v.number, v)?; } Ok(()) }