From f83a21dd95ed103c223ce831142c57e2106e4ad4 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Wed, 3 Nov 2021 05:48:35 -0600 Subject: [PATCH] =?UTF-8?q?refactor:=20Move=20action=20to=20own=20mod=20?= =?UTF-8?q?=F0=9F=93=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- src/action.rs | 16 ++++++++++++++++ src/app.rs | 18 +----------------- src/main.rs | 29 +++++++++++++++-------------- src/pane/context.rs | 3 ++- src/pane/mod.rs | 3 ++- src/pane/project.rs | 3 ++- 7 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 src/action.rs diff --git a/Cargo.lock b/Cargo.lock index a49581e..60f2693 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1401,7 +1401,7 @@ dependencies = [ [[package]] name = "taskwarrior-tui" -version = "0.14.6" +version = "0.14.7" dependencies = [ "anyhow", "async-std", diff --git a/src/action.rs b/src/action.rs new file mode 100644 index 0000000..2f0135d --- /dev/null +++ b/src/action.rs @@ -0,0 +1,16 @@ +#[derive(PartialEq, Debug)] +pub enum Action { + Report, + Filter, + Add, + Annotate, + Subprocess, + Log, + Modify, + HelpPopup, + Error, + ContextMenu, + Jump, + DeletePrompt, + DonePrompt, +} diff --git a/src/app.rs b/src/app.rs index 8f66a53..866c360 100644 --- a/src/app.rs +++ b/src/app.rs @@ -68,7 +68,7 @@ use regex::Regex; use lazy_static::lazy_static; -use crate::app::Action::Report; +use crate::action::Action; use crate::pane::context::{ContextDetails, ContextsState}; use crate::pane::project::ProjectsState; use crate::pane::Pane; @@ -152,22 +152,6 @@ pub enum Mode { Projects, Calendar, } -#[derive(PartialEq, Debug)] -pub enum Action { - Report, - Filter, - Add, - Annotate, - Subprocess, - Log, - Modify, - HelpPopup, - Error, - ContextMenu, - Jump, - DeletePrompt, - DonePrompt, -} pub struct TaskwarriorTui { pub should_quit: bool, diff --git a/src/main.rs b/src/main.rs index dd282f8..7a790f0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,20 @@ #![allow(unused_imports)] #![allow(unused_variables)] +mod action; +mod app; +mod calendar; +mod cli; +mod completion; +mod config; +mod event; +mod help; +mod history; +mod keyconfig; +mod pane; +mod table; +mod task_report; + use std::env; use std::error::Error; use std::io::{self, Write}; @@ -23,23 +37,10 @@ use tui::{backend::CrosstermBackend, Terminal}; use app::{Mode, TaskwarriorTui}; -use crate::app::Action; +use crate::action::Action; use crate::event::{Event, EventConfig, Events, Key}; use crate::keyconfig::KeyConfig; -mod app; -mod calendar; -mod cli; -mod completion; -mod config; -mod event; -mod help; -mod history; -mod keyconfig; -mod pane; -mod table; -mod task_report; - /// # Panics /// Will panic if could not obtain terminal pub fn setup_terminal() -> Terminal> { diff --git a/src/pane/context.rs b/src/pane/context.rs index 9d3982b..a985544 100644 --- a/src/pane/context.rs +++ b/src/pane/context.rs @@ -18,7 +18,8 @@ use tui::{ widgets::{Block, BorderType, Borders, Clear, Paragraph, StatefulWidget, Widget}, }; -use crate::app::{Action, Mode, TaskwarriorTui}; +use crate::action::Action; +use crate::app::{Mode, TaskwarriorTui}; use crate::event::Key; use crate::pane::Pane; use crate::table::TableState; diff --git a/src/pane/mod.rs b/src/pane/mod.rs index 3007048..e81a930 100644 --- a/src/pane/mod.rs +++ b/src/pane/mod.rs @@ -1,6 +1,7 @@ use anyhow::Result; -use crate::app::{Action, Mode, TaskwarriorTui}; +use crate::action::Action; +use crate::app::{Mode, TaskwarriorTui}; use crate::event::Key; use clap::App; use std::ops::Index; diff --git a/src/pane/project.rs b/src/pane/project.rs index 62e994c..7637335 100644 --- a/src/pane/project.rs +++ b/src/pane/project.rs @@ -18,7 +18,8 @@ use tui::{ widgets::{Block, Widget}, }; -use crate::app::{Action, Mode, TaskwarriorTui}; +use crate::action::Action; +use crate::app::{Mode, TaskwarriorTui}; use crate::event::Key; use crate::pane::Pane; use crate::table::TableState;