diff --git a/Cargo.toml b/Cargo.toml index 2fbd135..1ff7641 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -epub = "1.2.2" +epub = "2.0.0" ncurses = "5.101.0" soup = "0.5.1" diff --git a/src/html_module.rs b/src/html_module.rs index e80b9b5..859e0f5 100644 --- a/src/html_module.rs +++ b/src/html_module.rs @@ -15,7 +15,7 @@ Last edited: 5/20/23 */ use soup::{Soup}; -pub fn main(content: String) -> String { +pub fn main(content: &str) -> String { let str_content = content; let soup = Soup::new(&str_content); let page = soup.text(); diff --git a/src/main.rs b/src/main.rs index 868ddb0..ad89a2c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,12 +41,11 @@ fn epub_func(epub_file: &str){ let is_reading = true; while is_reading == true { let mut next_or_last = String::new(); - doc.set_current_page(page_num).expect("end of book"); + doc.set_current_page(page_num); let content = doc.get_current_str(); let str_content = content.unwrap(); - let page = html_module::main(str_content); - println!("{}", page); + let page = html_module::main(&str_content.0); ncurses_module::main(page); let input_size = std::io::stdin().read_line(&mut next_or_last); diff --git a/src/ncurses_module.rs b/src/ncurses_module.rs index a45ced7..cde91d4 100644 --- a/src/ncurses_module.rs +++ b/src/ncurses_module.rs @@ -11,10 +11,12 @@ Last edited: 5/20/23 use ncurses; use ncurses::{initscr, WINDOW}; -pub fn main(text: String) { - +pub fn main(mut text: String) { + ncurses::clear(); initscr(); ncurses::addstr(&*text); + + ncurses::refresh(); println!("If you can read this, you are in the ncurses_module"); } \ No newline at end of file