kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-26 12:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename TTApp to TaskwarriorTuiApp

Browse source
This commit is contained in:
Dheepak Krishnamurthy 2021-03-25 16:44:17 -06:00
parent ef93b006dd
commit 31daa52e0d
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/app.rs
View file

@ -139,7 +139,7 @@ pub enum AppMode {
Calendar, Calendar,
} }
pub struct TTApp { pub struct TaskwarriorTuiApp {
pub should_quit: bool, pub should_quit: bool,
pub task_table_state: TableState, pub task_table_state: TableState,
pub context_table_state: TableState, pub context_table_state: TableState,
@ -169,7 +169,7 @@ pub struct TTApp {
pub terminal_height: u16, pub terminal_height: u16,
} }
impl TTApp { impl TaskwarriorTuiApp {
pub fn new() -> Result<Self, Box<dyn Error>> { pub fn new() -> Result<Self, Box<dyn Error>> {
let c = Config::default()?; let c = Config::default()?;
let mut kc = KeyConfig::default(); let mut kc = KeyConfig::default();
@ -1372,7 +1372,7 @@ impl TTApp {
for task_uuid in &task_uuids { for task_uuid in &task_uuids {
let mut command = "start"; let mut command = "start";
for tag in TTApp::task_virtual_tags(*task_uuid).unwrap().split(' ') { for tag in TaskwarriorTuiApp::task_virtual_tags(*task_uuid).unwrap().split(' ') {
if tag == "ACTIVE" { if tag == "ACTIVE" {
command = "stop" command = "stop"
} }
@ -2086,10 +2086,10 @@ mod tests {
#[test] #[test]
fn test_taskwarrior_tui() { fn test_taskwarrior_tui() {
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
assert!(app.task_by_index(0).is_none()); assert!(app.task_by_index(0).is_none());
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
assert!(app assert!(app
.task_by_uuid(Uuid::parse_str("3f43831b-88dc-45e2-bf0d-4aea6db634cc").unwrap()) .task_by_uuid(Uuid::parse_str("3f43831b-88dc-45e2-bf0d-4aea6db634cc").unwrap())
.is_none()); .is_none());
@ -2098,10 +2098,10 @@ mod tests {
setup(); setup();
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
assert!(app.task_by_index(0).is_some()); assert!(app.task_by_index(0).is_some());
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
assert!(app assert!(app
.task_by_uuid(Uuid::parse_str("3f43831b-88dc-45e2-bf0d-4aea6db634cc").unwrap()) .task_by_uuid(Uuid::parse_str("3f43831b-88dc-45e2-bf0d-4aea6db634cc").unwrap())
.is_some()); .is_some());
@ -2118,7 +2118,7 @@ mod tests {
fn test_task_tags() { fn test_task_tags() {
// testing tags // testing tags
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
let task = app.task_by_id(1).unwrap(); let task = app.task_by_id(1).unwrap();
let tags = vec!["PENDING".to_string(), "PRIORITY".to_string()]; let tags = vec!["PENDING".to_string(), "PRIORITY".to_string()];
@ -2127,7 +2127,7 @@ mod tests {
assert!(task.tags().unwrap().contains(&tag)); assert!(task.tags().unwrap().contains(&tag));
} }
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
let task = app.task_by_id(11).unwrap(); let task = app.task_by_id(11).unwrap();
let tags = vec!["finance", "UNBLOCKED", "PENDING", "TAGGED", "UDA"] let tags = vec!["finance", "UNBLOCKED", "PENDING", "TAGGED", "UDA"]
.iter() .iter()
@ -2139,7 +2139,7 @@ mod tests {
} }
fn test_task_style() { fn test_task_style() {
let app = TTApp::new().unwrap(); let app = TaskwarriorTuiApp::new().unwrap();
let task = app.task_by_id(1).unwrap(); let task = app.task_by_id(1).unwrap();
for r in vec![ for r in vec![
"active", "active",
@ -2169,7 +2169,7 @@ mod tests {
} }
fn test_task_context() { fn test_task_context() {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
@ -2205,7 +2205,7 @@ mod tests {
fn test_task_tomorrow() { fn test_task_tomorrow() {
let total_tasks: u64 = 26; let total_tasks: u64 = 26;
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2268,7 +2268,7 @@ mod tests {
.output() .output()
.unwrap(); .unwrap();
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2278,7 +2278,7 @@ mod tests {
fn test_task_earlier_today() { fn test_task_earlier_today() {
let total_tasks: u64 = 26; let total_tasks: u64 = 26;
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2330,7 +2330,7 @@ mod tests {
.output() .output()
.unwrap(); .unwrap();
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2342,7 +2342,7 @@ mod tests {
let total_tasks: u64 = 26; let total_tasks: u64 = 26;
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2401,7 +2401,7 @@ mod tests {
.output() .output()
.unwrap(); .unwrap();
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
assert!(app.get_context().is_ok()); assert!(app.get_context().is_ok());
assert!(app.update(true).is_ok()); assert!(app.update(true).is_ok());
assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize); assert_eq!(app.tasks.lock().unwrap().len(), total_tasks as usize);
@ -2410,7 +2410,7 @@ mod tests {
fn test_draw_empty_task_report() { fn test_draw_empty_task_report() {
let test_case = |expected: &Buffer| { let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
app.task_report_next(); app.task_report_next();
app.context_next(); app.context_next();
@ -2476,7 +2476,7 @@ mod tests {
fn test_draw_task_report() { fn test_draw_task_report() {
let test_case = |expected: &Buffer| { let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
app.task_report_next(); app.task_report_next();
app.context_next(); app.context_next();
@ -2633,7 +2633,7 @@ mod tests {
#[test] #[test]
fn test_draw_calendar() { fn test_draw_calendar() {
let test_case = |expected: &Buffer| { let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
app.task_report_next(); app.task_report_next();
app.context_next(); app.context_next();
@ -2718,7 +2718,7 @@ mod tests {
#[test] #[test]
fn test_draw_help_popup() { fn test_draw_help_popup() {
let test_case = |expected: &Buffer| { let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
app.mode = AppMode::TaskHelpPopup; app.mode = AppMode::TaskHelpPopup;
app.task_report_next(); app.task_report_next();
@ -2764,7 +2764,7 @@ mod tests {
fn test_draw_context_menu() { fn test_draw_context_menu() {
let test_case = |expected: &Buffer| { let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap(); let mut app = TaskwarriorTuiApp::new().unwrap();
app.mode = AppMode::TaskContextMenu; app.mode = AppMode::TaskContextMenu;
app.task_report_next(); app.task_report_next();

4
src/main.rs
View file

@ -21,7 +21,7 @@ use std::panic;
use std::time::Duration; use std::time::Duration;
use crate::util::Key; use crate::util::Key;
use app::{AppMode, TTApp}; use app::{AppMode, TaskwarriorTuiApp};
const APP_VERSION: &str = env!("CARGO_PKG_VERSION"); const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
const APP_NAME: &str = env!("CARGO_PKG_NAME"); const APP_NAME: &str = env!("CARGO_PKG_NAME");
@ -76,7 +76,7 @@ fn tui_main(_config: &str) -> Result<(), Box<dyn Error>> {
tick_rate: Duration::from_millis(250), tick_rate: Duration::from_millis(250),
}); });
let maybeapp = TTApp::new(); let maybeapp = TaskwarriorTuiApp::new();
match maybeapp { match maybeapp {
Ok(mut app) => { Ok(mut app) => {
loop { loop {