Xithrius/twitch-tui
1
1
Fork 0
mirror of https://github.com/Xithrius/twitch-tui.git synced 2024-10-04 09:07:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced keyboard bindings for debug/following

Browse Source
This commit is contained in:
Xithrius 2023-07-24 23:07:52 -07:00
parent 6989f8a6fa
commit 20a6500632
No known key found for this signature in database
GPG Key ID: DF6738B80C155B71
5 changed files with 107 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/handlers/app.rs
View File

@ -125,7 +125,7 @@ impl App {
}
if self.components.following.is_focused() {
let rect = centered_rect(60, 60, 10, size);
let rect = centered_rect(60, 60, 20, size);
self.components.following.draw(f, rect, None);
} else if self.components.debug.is_focused() {
@ -142,6 +142,11 @@ impl App {
pub fn event(&mut self, event: &Event) -> Option<TerminalAction> {
if let Event::Input(key) = event {
if self.components.debug.is_focused() {
self.components.debug.event(event);
} else if self.components.following.is_focused() {
self.components.following.event(event);
} else {
match key {
// Global keybinds
Key::Ctrl('d') => {
@ -159,6 +164,7 @@ impl App {
}
}
}
}
None
}

6
src/twitch/oauth.rs
View File

@ -75,7 +75,7 @@ pub async fn get_channel_id(client: &Client, channel: &str) -> Result<i32> {
.parse()?)
}
#[derive(Deserialize, Debug, Clone)]
#[derive(Deserialize, Debug, Clone, Default)]
#[allow(dead_code)]
pub struct FollowingUser {
broadcaster_id: String,
@ -84,13 +84,13 @@ pub struct FollowingUser {
followed_at: String,
}
#[derive(Deserialize, Debug, Clone)]
#[derive(Deserialize, Debug, Clone, Default)]
#[allow(dead_code)]
struct Pagination {
cursor: String,
}
#[derive(Deserialize, Debug, Clone)]
#[derive(Deserialize, Debug, Clone, Default)]
#[allow(dead_code)]
pub struct FollowingList {
total: u64,

5
src/ui/components/chat.rs
View File

@ -284,10 +284,7 @@ impl Component for ChatWidget {
Block::default()
.borders(Borders::ALL)
.border_type(self.config.borrow().frontend.border_type.clone().into())
.title(chat_title), // .style(match self.theme {
// Theme::Light => BORDER_NAME_LIGHT,
// _ => BORDER_NAME_DARK,
// }),
.title(chat_title),
)
.style(Style::default().fg(Color::White));

21
src/ui/components/debug.rs
View File

@ -8,9 +8,9 @@ use tui::{
use crate::{
emotes::Emotes,
handlers::config::SharedCompleteConfig,
handlers::{config::SharedCompleteConfig, user_input::events::{Key, Event}},
ui::components::Component,
utils::text::{title_line, TitleStyle},
utils::text::{title_line, TitleStyle}, terminal::TerminalAction,
};
#[derive(Debug, Clone)]
@ -60,4 +60,21 @@ impl Component for DebugWidget {
f.render_widget(Clear, area);
f.render_widget(table, area);
}
fn event(&mut self, event: &Event) -> Option<TerminalAction> {
if let Event::Input(key) = event {
match key {
Key::Char('q') => return Some(TerminalAction::Quit),
Key::Esc => {
self.toggle_focus();
return Some(TerminalAction::BackOneLayer)
},
Key::Ctrl('p') => panic!("Manual panic triggered by user."),
_ => {}
}
}
None
}
}

92
src/ui/components/following.rs
View File

@ -2,15 +2,19 @@ use tui::{
backend::Backend,
layout::{Constraint, Rect},
style::{Color, Modifier, Style},
widgets::{Block, Borders, Clear, Row, Table},
widgets::{Block, Borders, Clear, Row, Table, TableState},
Frame,
};
use crate::{
emotes::Emotes,
handlers::config::SharedCompleteConfig,
handlers::{
config::SharedCompleteConfig,
user_input::events::{Event, Key},
},
terminal::TerminalAction,
twitch::oauth::{get_channel_id, get_twitch_client, get_user_following, FollowingList},
ui::components::Component,
ui::{components::Component, statics::NAME_MAX_CHARACTERS},
utils::text::{title_line, TitleStyle},
};
@ -18,7 +22,8 @@ use crate::{
pub struct FollowingWidget {
config: SharedCompleteConfig,
focused: bool,
following: Option<FollowingList>,
following: FollowingList,
state: TableState,
}
impl FollowingWidget {
@ -26,32 +31,42 @@ impl FollowingWidget {
Self {
config,
focused: false,
following: None,
following: FollowingList::default(),
state: TableState::default(),
}
}
// pub fn get_following(&mut self) {
// let oauth_token = self.config.borrow().twitch.token.clone();
// let app_user = self.config.borrow().twitch.username.clone();
fn next(&mut self) {
let i = match self.state.selected() {
Some(i) => {
if i >= self.following.data.len() - 1 {
0
} else {
i + 1
}
}
None => 0,
};
self.state.select(Some(i));
}
// let output = tokio::task::spawn_blocking(move || {
// let rt = tokio::runtime::Runtime::new().unwrap();
fn previous(&mut self) {
let i = match self.state.selected() {
Some(i) => {
if i == 0 {
self.following.data.len() - 1
} else {
i - 1
}
}
None => 0,
};
self.state.select(Some(i));
}
// rt.block_on(async {
// let client = get_twitch_client(oauth_token).await.unwrap();
// let user_id = get_channel_id(&client, &app_user).await.unwrap();
// Some(get_user_following(&client, user_id).await)
// })
// });
// mem::drop(output.and_then(|x| async move {
// self.following = x;
// Ok(())
// }));
// }
fn unselect(&mut self) {
self.state.select(None);
}
pub async fn get_following(&mut self) {
let oauth_token = self.config.borrow().twitch.token.clone();
@ -61,7 +76,7 @@ impl FollowingWidget {
let user_id = get_channel_id(&client, &app_user).await.unwrap();
self.following = Some(get_user_following(&client, user_id).await);
self.following = get_user_following(&client, user_id).await;
}
pub const fn is_focused(&self) -> bool {
@ -77,14 +92,14 @@ impl Component for FollowingWidget {
fn draw<B: Backend>(&mut self, f: &mut Frame<B>, area: Rect, _emotes: Option<&mut Emotes>) {
let mut rows = vec![];
if let Some(followed_channels) = self.following.clone() {
for channel in followed_channels.data {
for channel in self.following.clone().data {
rows.push(Row::new(vec![channel.broadcaster_name.clone()]));
}
}
let title_binding = [TitleStyle::Single("Following")];
let constraint_binding = [Constraint::Length(NAME_MAX_CHARACTERS as u16)];
let table = Table::new(rows)
.block(
Block::default()
@ -95,9 +110,26 @@ impl Component for FollowingWidget {
.borders(Borders::ALL)
.border_type(self.config.borrow().frontend.border_type.clone().into()),
)
.widths(&[Constraint::Length(10), Constraint::Length(10)]);
.widths(&constraint_binding);
f.render_widget(Clear, area);
f.render_widget(table, area);
}
fn event(&mut self, event: &Event) -> Option<TerminalAction> {
if let Event::Input(key) = event {
match key {
Key::Char('q') => return Some(TerminalAction::Quit),
Key::Esc => {
self.toggle_focus();
return Some(TerminalAction::BackOneLayer);
}
Key::Ctrl('p') => panic!("Manual panic triggered by user."),
_ => {}
}
}
None
}
}