diff --git a/Cargo.lock b/Cargo.lock index 3f8c0ba..441a251 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,6 +63,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + [[package]] name = "castaway" version = "0.1.2" @@ -111,6 +117,47 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossterm" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f7409c70a38a56216480fba371ee460207dd8926ccf5b4160591759559170" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "curl" version = "0.4.43" @@ -319,11 +366,14 @@ version = "0.5.1" dependencies = [ "base64", "colored", + "crossterm 0.24.0", "dirs", "isahc", "regex", "serde_json", "termsize", + "tui", + "unicode-width", ] [[package]] @@ -370,6 +420,16 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "lock_api" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.17" @@ -397,6 +457,18 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mio" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + [[package]] name = "numtoa" version = "0.1.0" @@ -434,6 +506,29 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "percent-encoding" version = "2.1.0" @@ -565,6 +660,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + [[package]] name = "serde" version = "1.0.142" @@ -582,6 +683,36 @@ dependencies = [ "serde", ] +[[package]] +name = "signal-hook" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + [[package]] name = "slab" version = "0.4.6" @@ -599,6 +730,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + [[package]] name = "socket2" version = "0.4.4" @@ -723,6 +860,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "tui" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96fe69244ec2af261bced1d9046a6fee6c8c2a6b0228e59e5ba39bc8ba4ed729" +dependencies = [ + "bitflags", + "cassowary", + "crossterm 0.23.2", + "unicode-segmentation", + "unicode-width", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -744,6 +894,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + [[package]] name = "url" version = "2.2.2" diff --git a/Cargo.toml b/Cargo.toml index a96a541..0b5c891 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,3 +15,6 @@ base64 = "0.13" termsize = "0.1.6" dirs = "4.0" serde_json = "1.0.83" +tui = "0.18.0" +crossterm = "0.24.0" +unicode-width = "0.1.9" diff --git a/src/anime/anime.rs b/src/anime/anime.rs index 9e2f217..25f6653 100644 --- a/src/anime/anime.rs +++ b/src/anime/anime.rs @@ -13,7 +13,7 @@ pub fn anime_stream(search: String, episode: u32, resume: bool) { string_input("Search anime: ") }; - let anime_list = anime_names(&query); + let anime_list = anime_names(query); let mut count = 0; print!("\x1B[2J\x1B[1;1H"); anime_list.iter().for_each(|anime| { diff --git a/src/anime/player.rs b/src/anime/player.rs index 284f24d..b63b7c3 100644 --- a/src/anime/player.rs +++ b/src/anime/player.rs @@ -9,5 +9,4 @@ pub fn open_video(link: (String, String)) { .expect("failed to open mpv"); // clear terminal - print!("\x1b[2J\x1b[1;1H"); } diff --git a/src/anime/scraper.rs b/src/anime/scraper.rs index f643c54..2825a11 100644 --- a/src/anime/scraper.rs +++ b/src/anime/scraper.rs @@ -31,7 +31,7 @@ pub fn get_ep_location(url: &str) -> String { location.to_str().unwrap().to_string() } -pub fn anime_names(query: &str) -> Vec { +pub fn anime_names(query: String) -> Vec { let url = format!("https://gogoanime.lu//search.html?keyword={}", query); //relpace all spaces with %20 let url = url.replace(' ', "%20"); diff --git a/src/main.rs b/src/main.rs index 2069c29..d1de902 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ mod anime; mod helpers; mod ln; +mod ui; use anime::anime::anime_stream; use colored::Colorize; @@ -14,7 +15,7 @@ use crate::anime::{ }; use crate::helpers::take_input::{int_input, string_input}; use crate::ln::{menu::chapter_selector, open_text::open_bat, scraper::get_full_text}; - +use crate::ui::anime_ui::ui_anime; fn main() { let mut help = false; let mut anime = false; @@ -89,7 +90,8 @@ fn main() { if ln == true { ln_read(&search, chapter); } else if anime == true { - anime_stream(search, episode, resume); + //anime_stream(search, episode, resume); + ui_anime(); } else { println!("Invalid argument"); } diff --git a/src/ui/anime_ui.rs b/src/ui/anime_ui.rs new file mode 100644 index 0000000..d9658b7 --- /dev/null +++ b/src/ui/anime_ui.rs @@ -0,0 +1,286 @@ +use crate::open_video; +use crate::{anime_ep_range, anime_link, anime_names}; +use crate::{get_anime_id, get_token, get_user_anime_progress, update_anime_progress}; + +use crossterm::{ + event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode}, + execute, + terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, +}; +use std::{error::Error, io}; +use tui::{ + backend::{Backend, CrosstermBackend}, + layout::{Constraint, Direction, Layout}, + style::{Color, Modifier, Style}, + text::{Span, Spans, Text}, + widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph}, + Frame, Terminal, +}; +use unicode_width::UnicodeWidthStr; + +enum InputMode { + Normal, + Editing, +} + +struct StatefulList { + state: ListState, + items: Vec, +} + +impl StatefulList { + fn with_items(items: Vec) -> StatefulList { + StatefulList { + state: ListState::default(), + items, + } + } + + fn next(&mut self) { + let i = match self.state.selected() { + Some(i) => { + if i >= self.items.len() - 1 { + 0 + } else { + i + 1 + } + } + None => 0, + }; + self.state.select(Some(i)); + } + + fn previous(&mut self) { + let i = match self.state.selected() { + Some(i) => { + if i == 0 { + self.items.len() - 1 + } else { + i - 1 + } + } + None => 0, + }; + self.state.select(Some(i)); + } + + fn unselect(&mut self) { + self.state.select(None); + } + fn push(&mut self, item: T) { + self.items.push(item); + } + fn iter(&self) -> impl Iterator { + self.items.iter() + } +} + +struct App { + /// Current value of the input box + input: String, + /// Current input mode + input_mode: InputMode, + /// History of recorded messages + messages: StatefulList, + title: String, + ep: u64, +} + +impl<'a> App { + fn default() -> App { + App { + input: String::new(), + input_mode: InputMode::Normal, + messages: StatefulList::with_items(Vec::new()), + title: String::new(), + ep: 0, + } + } +} + +pub fn ui_anime() -> Result<(), Box> { + // setup terminal + enable_raw_mode()?; + let mut stdout = io::stdout(); + execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?; + let backend = CrosstermBackend::new(stdout); + let mut terminal = Terminal::new(backend)?; + + // create app and run it + let app = App::default(); + let res = run_app(&mut terminal, app); + + // restore terminal + disable_raw_mode()?; + execute!( + terminal.backend_mut(), + LeaveAlternateScreen, + DisableMouseCapture + )?; + terminal.show_cursor()?; + + if let Err(err) = res { + println!("{:?}", err) + } + + Ok(()) +} + +fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<()> { + let mut ep_select = false; + loop { + terminal.draw(|f| ui(f, &mut app))?; + + if let Event::Key(key) = event::read()? { + match app.input_mode { + InputMode::Normal => match key.code { + KeyCode::Char('e') => { + app.input_mode = InputMode::Editing; + } + KeyCode::Char('q') => { + return Ok(()); + } + KeyCode::Left => app.messages.unselect(), + KeyCode::Down => app.messages.next(), + KeyCode::Up => app.messages.previous(), + //if KeyCode::Enter => { + KeyCode::Enter => { + if ep_select == false { + let selected = app.messages.state.selected(); + app.title = app + .messages + .iter() + .nth(selected.unwrap()) + .unwrap() + .to_string(); + let ep_range = anime_ep_range(&app.title); + app.messages.items.clear(); + for ep in 1..ep_range { + app.messages.push(format!("Episode {}", ep)); + } + ep_select = true; + } else { + let selected = app.messages.state.selected(); + let ep = app.messages.iter().nth(selected.unwrap()).unwrap(); + let ep = ep.replace("Episode ", ""); + let ep = ep.parse::().unwrap(); + let link = anime_link(&app.title, ep); + open_video(link); + } + } + _ => {} + }, + InputMode::Editing => match key.code { + KeyCode::Enter => { + //push app.input into app.messages with '1 + let anime_list = anime_names(app.input.drain(..).collect()); + app.messages.items.clear(); + for anime in anime_list { + app.messages.push(anime); + } + } + KeyCode::Char(c) => { + app.input.push(c); + } + KeyCode::Backspace => { + app.input.pop(); + } + KeyCode::Esc => { + app.input_mode = InputMode::Normal; + } + _ => {} + }, + } + } + } +} + +fn ui(f: &mut Frame, app: &mut App) { + let chunks = Layout::default() + .direction(Direction::Vertical) + .margin(2) + .constraints( + [ + Constraint::Length(1), + Constraint::Length(3), + Constraint::Min(1), + ] + .as_ref(), + ) + .split(f.size()); + let block = Block::default() + .borders(Borders::ALL) + .title("kami") + .border_type(BorderType::Rounded); + f.render_widget(block, f.size()); + + let (msg, style) = match app.input_mode { + InputMode::Normal => ( + vec![ + Span::raw("Press "), + Span::styled("q", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(" to exit, "), + Span::styled("e", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(" to start editing."), + ], + Style::default().add_modifier(Modifier::RAPID_BLINK), + ), + InputMode::Editing => ( + vec![ + Span::raw("Press "), + Span::styled("Esc", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(" to stop editing, "), + Span::styled("Enter", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(" to record the message"), + ], + Style::default(), + ), + }; + let mut text = Text::from(Spans::from(msg)); + text.patch_style(style); + let help_message = Paragraph::new(text); + f.render_widget(help_message, chunks[0]); + + let input = Paragraph::new(app.input.as_ref()) + .style(match app.input_mode { + InputMode::Normal => Style::default(), + InputMode::Editing => Style::default().fg(Color::Yellow), + }) + .block(Block::default().borders(Borders::ALL).title("Input")); + f.render_widget(input, chunks[1]); + match app.input_mode { + InputMode::Normal => + // Hide the cursor. `Frame` does this by default, so we don't need to do anything here + {} + + InputMode::Editing => { + // Make the cursor visible and ask tui-rs to put it at the specified coordinates after rendering + f.set_cursor( + // Put cursor past the end of the input text + chunks[1].x + app.input.width() as u16 + 1, + // Move one line down, from the border to the input line + chunks[1].y + 1, + ) + } + } + + let messages: Vec = app + .messages + .iter() + .enumerate() + .map(|(i, m)| { + let content = vec![Spans::from(Span::raw(format!("{}: {}", i, m)))]; + ListItem::new(content) + }) + .collect(); + let messages = List::new(messages) + .block(Block::default().borders(Borders::ALL).title("Messages")) + .style(Style::default().fg(Color::White)) + .highlight_style( + Style::default() + .bg(Color::LightGreen) + .add_modifier(Modifier::BOLD), + ) + .highlight_symbol(">>"); + f.render_stateful_widget(messages, chunks[2], &mut app.messages.state); +} diff --git a/src/ui/mod.rs b/src/ui/mod.rs new file mode 100644 index 0000000..7bd1780 --- /dev/null +++ b/src/ui/mod.rs @@ -0,0 +1 @@ +pub mod anime_ui;