From 41778accdcd30c9ae9a658271706cea0cb4c6801 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 15 Jun 2023 19:21:01 +0700 Subject: [PATCH] Random clean up --- src/app.rs | 2 -- src/db.rs | 18 ++++++++---------- src/input.rs | 48 ++++++++++++------------------------------------ src/ui.rs | 5 ++--- 4 files changed, 22 insertions(+), 51 deletions(-) diff --git a/src/app.rs b/src/app.rs index ebee09b..c28209c 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,6 +1,4 @@ use anyhow::Error; -// use indexmap::IndexMap; -// use int_enum::IntEnum; use rusqlite::Connection; use serde::{Deserialize, Serialize}; use std::cmp::min; diff --git a/src/db.rs b/src/db.rs index 71fb9eb..6d36ab4 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,7 +1,7 @@ -use anyhow::Error; -use std::ops::{Deref, DerefMut}; use crate::{Column, Task}; +use anyhow::Error; use rusqlite::{params, Connection, Result}; +use std::ops::{Deref, DerefMut}; pub struct DBConn(Connection); @@ -113,8 +113,8 @@ impl DBConn { /// /// Panics if something goes wrong with the SQL pub fn update_task_text(&self, task: &Task) -> Result<()> { - let mut stmt = self - .prepare("update task set title = ?2, description = ?3 where id = ?1")?; + let mut stmt = + self.prepare("update task set title = ?2, description = ?3 where id = ?1")?; stmt.execute((&task.id, &task.title, &task.description))?; Ok(()) } @@ -178,8 +178,8 @@ impl DBConn { /// /// Panics if something goes wrong with the SQL pub fn set_selected_column(&self, column_id: usize) -> Result<(), Error> { - let mut stmt = self - .prepare("insert or replace into app_state(key, value) values (?1, ?2)")?; + let mut stmt = + self.prepare("insert or replace into app_state(key, value) values (?1, ?2)")?; stmt.execute((&"selected_column", column_id.to_string()))?; Ok(()) } @@ -188,8 +188,7 @@ impl DBConn { /// /// Panics if something goes wrong with the SQL pub fn get_selected_column(&self) -> Result { - let mut stmt = self - .prepare("select value from app_state where key = ?1")?; + let mut stmt = self.prepare("select value from app_state where key = ?1")?; stmt.query_row(["selected_column"], |row| { let value: String = row.get::(0).unwrap(); Ok(value.parse::().unwrap()) @@ -209,8 +208,7 @@ impl DBConn { /// /// Panics if something goes wrong with the SQL pub fn get_selected_task_for_column(&self, column_id: i32) -> Result { - let mut stmt = self - .prepare("select selected_task from kb_column where key = ?1")?; + let mut stmt = self.prepare("select selected_task from kb_column where key = ?1")?; stmt.query_row([column_id], |row| row.get(0)) } } diff --git a/src/input.rs b/src/input.rs index dabba5a..7802d84 100644 --- a/src/input.rs +++ b/src/input.rs @@ -40,9 +40,7 @@ pub fn handle_task_edit(state: &mut State<'_>, key: event::KeyEvent) -> Result<( TaskEditFocus::CancelBtn => match key.code { KeyCode::Tab => task.focus = TaskEditFocus::Title, KeyCode::BackTab => task.focus = TaskEditFocus::ConfirmBtn, - KeyCode::Enter => { - clear_task = true; - } + KeyCode::Enter => clear_task = true, _ => (), }, } @@ -56,41 +54,19 @@ pub fn handle_task_edit(state: &mut State<'_>, key: event::KeyEvent) -> Result<( pub fn handle_main(state: &mut State<'_>, key: event::KeyEvent) -> Result<(), anyhow::Error> { match key.code { KeyCode::Char('q') => state.quit = true, - KeyCode::Char('h') | KeyCode::Left => { - state.select_previous_column()?; - } - KeyCode::Char('j') | KeyCode::Down => { - state.select_next_task()?; - } - KeyCode::Char('k') | KeyCode::Up => { - state.select_previous_task()?; - } - KeyCode::Char('l') | KeyCode::Right => { - state.select_next_column()?; - } - KeyCode::Char('g') => { - state.select_first_task()?; - } - KeyCode::Char('G') => { - state.select_last_task()?; - } - KeyCode::Char('H') => { - state.move_task_previous_column()?; - } - KeyCode::Char('L') => { - state.move_task_next_column()?; - } - KeyCode::Char('J') => { - state.move_task_down()?; - } - KeyCode::Char('K') => { - state.move_task_up()?; - } + KeyCode::Char('h') | KeyCode::Left => state.select_previous_column()?, + KeyCode::Char('j') | KeyCode::Down => state.select_next_task()?, + KeyCode::Char('k') | KeyCode::Up => state.select_previous_task()?, + KeyCode::Char('l') | KeyCode::Right => state.select_next_column()?, + KeyCode::Char('g') => state.select_first_task()?, + KeyCode::Char('G') => state.select_last_task()?, + KeyCode::Char('H') => state.move_task_previous_column()?, + KeyCode::Char('L') => state.move_task_next_column()?, + KeyCode::Char('J') => state.move_task_down()?, + KeyCode::Char('K') => state.move_task_up()?, KeyCode::Char('n') => state.task_edit_state = Some(TaskState::default()), KeyCode::Char('e') => state.task_edit_state = state.get_task_state_from_current(), - KeyCode::Char('D') => { - state.delete_task()?; - } + KeyCode::Char('D') => state.delete_task()?, _ => {} } Ok(()) diff --git a/src/ui.rs b/src/ui.rs index 535644c..d21dd08 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -44,9 +44,8 @@ fn draw_tasks(f: &mut Frame<'_, B>, area: Rect, state: &State<'_>) { style = style.add_modifier(Modifier::REVERSED); }; let mut s = Span::raw(column.name.as_str()); - s.style = - Style::default().add_modifier(Modifier::BOLD | Modifier::ITALIC | Modifier::UNDERLINED); - // .fg(Color::White); + let mods = Modifier::BOLD | Modifier::ITALIC | Modifier::UNDERLINED; + s.style = Style::default().add_modifier(mods); let block = Block::default().title(s).borders(Borders::ALL); let inner_area = block.inner(columns[i]); let inner_block = Block::default().style(style);