Oliver/bible
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fix weird issue with book names

Browse Source
This commit is contained in:
Rushmore75
2025-03-25 15:30:54 -06:00
parent 55c3e5b175
commit d26c02d239
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bible.rs
View File

@@ -115,10 +115,10 @@ pub fn get(query: &str, loc: &str) {
if let Some(chapter) = chatper { if let Some(chapter) = chatper {
if let Ok(chap_num) = chapter.parse::<usize>() { if let Ok(chap_num) = chapter.trim().parse::<usize>() {
if let Some(chapter) = book.get_chapter_by_index(chap_num) { if let Some(chapter) = book.get_chapter_by_index(chap_num) {
if let Some(verse) = verse { if let Some(verse) = verse {
if let Ok(verse_num) = verse.parse::<usize>() { if let Ok(verse_num) = verse.trim().parse::<usize>() {
// return specific verse // return specific verse
if let Some(verse) = chapter.get_verse_by_index(verse_num) { 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); 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::<usize>(); let end = range[1].parse::<usize>();
if let (Ok(s), Ok(e)) = (start,end) { 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 { for verse_idx in s..=e {
if let Some(v) = chapter.get_verse_by_index(verse_idx) { if let Some(v) = chapter.get_verse_by_index(verse_idx) {
println!("{style_underline}{style_bold}{}{style_reset}: {}", v.number, v); println!("{style_underline}{style_bold}{}{style_reset}: {}", v.number, v);
@@ -141,7 +141,8 @@ pub fn get(query: &str, loc: &str) {
} }
} }
} else { } 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)] #[derive(Deserialize)]
struct Bible { struct Bible {
#[serde(rename = "@translation")] #[serde(rename = "@translation")]
version: String, _version: String,
#[serde(rename = "testament")] #[serde(rename = "testament")]
testaments: Vec<Testament>, testaments: Vec<Testament>,
} }
@@ -196,7 +197,7 @@ struct Bible {
struct Testament { struct Testament {
#[serde(rename = "@name")] #[serde(rename = "@name")]
// yes, this would make a nice enum // yes, this would make a nice enum
testament: String, _testament: String,
#[serde(rename = "book")] #[serde(rename = "book")]
books: Vec<Book>, books: Vec<Book>,
} }
@@ -218,9 +219,8 @@ struct Chapter {
} }
impl Display for Chapter { impl Display for Chapter {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { 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 { for v in &self.verses {
writeln!(f, "|\t{}", v)?; writeln!(f, "{style_bold}{style_underline}{}{style_reset}: {}", v.number, v)?;
} }
Ok(()) Ok(())
} }