mirror of
https://github.com/kdheepak/taskwarrior-tui.git
synced 2025-08-26 03:07:18 +02:00
Refactor task_report.rs
This commit is contained in:
Dheepak Krishnamurthy
parent
6fc4f8a325
commit
03b5cdb7ca
3 changed files with 234 additions and 227 deletions
230
src/app.rs
230
src/app.rs
|
|
@ -1,7 +1,10 @@
|
|||
use crate::calendar::Calendar;
|
||||
use crate::task_report::TaskReportTable;
|
||||
use crate::help::Help;
|
||||
use crate::config::TConfig;
|
||||
use crate::table::{Row, Table, TableState};
|
||||
use crate::util::Events;
|
||||
use crate::util::Key;
|
||||
|
||||
use std::cmp::Ordering;
|
||||
use std::convert::TryInto;
|
||||
|
|
@ -35,9 +38,6 @@ use rustyline::At;
|
|||
use rustyline::Editor;
|
||||
use rustyline::Word;
|
||||
|
||||
use crate::util::Events;
|
||||
use crate::util::Key;
|
||||
|
||||
use std::io::{self};
|
||||
use tui::{backend::CrosstermBackend, Terminal};
|
||||
|
||||
|
|
@ -81,34 +81,6 @@ pub fn get_date_state(reference: &Date) -> DateState {
|
|||
DateState::AfterToday
|
||||
}
|
||||
|
||||
pub fn vague_format_date_time(from_dt: NaiveDateTime, to_dt: NaiveDateTime) -> String {
|
||||
let mut seconds = (to_dt - from_dt).num_seconds();
|
||||
let minus: &str;
|
||||
|
||||
if seconds < 0 {
|
||||
seconds *= -1;
|
||||
minus = "-";
|
||||
} else {
|
||||
minus = "";
|
||||
}
|
||||
|
||||
if seconds >= 60 * 60 * 24 * 365 {
|
||||
return format!("{}{}y", minus, seconds / 86400 / 365);
|
||||
} else if seconds >= 60 * 60 * 24 * 90 {
|
||||
return format!("{}{}mo", minus, seconds / 60 / 60 / 24 / 30);
|
||||
} else if seconds >= 60 * 60 * 24 * 14 {
|
||||
return format!("{}{}w", minus, seconds / 60 / 60 / 24 / 7);
|
||||
} else if seconds >= 60 * 60 * 24 {
|
||||
return format!("{}{}d", minus, seconds / 60 / 60 / 24);
|
||||
} else if seconds >= 60 * 60 {
|
||||
return format!("{}{}h", minus, seconds / 60 / 60);
|
||||
} else if seconds >= 60 {
|
||||
return format!("{}{}min", minus, seconds / 60);
|
||||
} else {
|
||||
return format!("{}{}s", minus, seconds);
|
||||
}
|
||||
}
|
||||
|
||||
fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
|
||||
let popup_layout = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
|
|
@ -148,202 +120,6 @@ pub enum AppMode {
|
|||
Calendar,
|
||||
}
|
||||
|
||||
pub struct TaskReportTable {
|
||||
pub labels: Vec<String>,
|
||||
pub columns: Vec<String>,
|
||||
pub tasks: Vec<Vec<String>>,
|
||||
virtual_tags: Vec<String>,
|
||||
}
|
||||
|
||||
impl TaskReportTable {
|
||||
pub fn new() -> Result<Self, Box<dyn Error>> {
|
||||
let virtual_tags = vec![
|
||||
"PROJECT",
|
||||
"BLOCKED",
|
||||
"UNBLOCKED",
|
||||
"BLOCKING",
|
||||
"DUE",
|
||||
"DUETODAY",
|
||||
"TODAY",
|
||||
"OVERDUE",
|
||||
"WEEK",
|
||||
"MONTH",
|
||||
"QUARTER",
|
||||
"YEAR",
|
||||
"ACTIVE",
|
||||
"SCHEDULED",
|
||||
"PARENT",
|
||||
"CHILD",
|
||||
"UNTIL",
|
||||
"WAITING",
|
||||
"ANNOTATED",
|
||||
"READY",
|
||||
"YESTERDAY",
|
||||
"TOMORROW",
|
||||
"TAGGED",
|
||||
"PENDING",
|
||||
"COMPLETED",
|
||||
"DELETED",
|
||||
"UDA",
|
||||
"ORPHAN",
|
||||
"PRIORITY",
|
||||
"PROJECT",
|
||||
"LATEST",
|
||||
];
|
||||
let mut task_report_table = Self {
|
||||
labels: vec![],
|
||||
columns: vec![],
|
||||
tasks: vec![vec![]],
|
||||
virtual_tags: virtual_tags.iter().map(|s| s.to_string()).collect::<Vec<_>>(),
|
||||
};
|
||||
task_report_table.export_headers()?;
|
||||
Ok(task_report_table)
|
||||
}
|
||||
|
||||
pub fn export_headers(&mut self) -> Result<(), Box<dyn Error>> {
|
||||
self.columns = vec![];
|
||||
self.labels = vec![];
|
||||
|
||||
let output = Command::new("task").arg("show").arg("report.next.columns").output()?;
|
||||
let data = String::from_utf8(output.stdout)?;
|
||||
|
||||
for line in data.split('\n') {
|
||||
if line.starts_with("report.next.columns") {
|
||||
let column_names = line.split(' ').collect::<Vec<_>>()[1];
|
||||
for column in column_names.split(',') {
|
||||
self.columns.push(column.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let output = Command::new("task").arg("show").arg("report.next.labels").output()?;
|
||||
let data = String::from_utf8(output.stdout)?;
|
||||
|
||||
for line in data.split('\n') {
|
||||
if line.starts_with("report.next.labels") {
|
||||
let label_names = line.split(' ').collect::<Vec<_>>()[1];
|
||||
for label in label_names.split(',') {
|
||||
self.labels.push(label.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn generate_table(&mut self, tasks: &[Task]) {
|
||||
self.tasks = vec![];
|
||||
|
||||
// get all tasks as their string representation
|
||||
for task in tasks {
|
||||
let mut item = vec![];
|
||||
for name in &self.columns {
|
||||
let s = self.get_string_attribute(name, &task);
|
||||
item.push(s);
|
||||
}
|
||||
self.tasks.push(item)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn simplify_table(&mut self) -> (Vec<Vec<String>>, Vec<String>) {
|
||||
// find which columns are empty
|
||||
let null_columns_len;
|
||||
if !self.tasks.is_empty() {
|
||||
null_columns_len = self.tasks[0].len();
|
||||
} else {
|
||||
return (vec![], vec![]);
|
||||
}
|
||||
|
||||
let mut null_columns = vec![0; null_columns_len];
|
||||
for task in &self.tasks {
|
||||
for (i, s) in task.iter().enumerate() {
|
||||
null_columns[i] += s.len();
|
||||
}
|
||||
}
|
||||
|
||||
// filter out columns where everything is empty
|
||||
let mut tasks = vec![];
|
||||
for task in &self.tasks {
|
||||
let t = task.clone();
|
||||
let t: Vec<String> = t
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|&(i, _)| null_columns[i] != 0)
|
||||
.map(|(_, e)| e.to_owned())
|
||||
.collect();
|
||||
tasks.push(t);
|
||||
}
|
||||
|
||||
// filter out header where all columns are empty
|
||||
let headers: Vec<String> = self
|
||||
.labels
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|&(i, _)| null_columns[i] != 0)
|
||||
.map(|(_, e)| e.to_owned())
|
||||
.collect();
|
||||
|
||||
(tasks, headers)
|
||||
}
|
||||
|
||||
pub fn get_string_attribute(&self, attribute: &str, task: &Task) -> String {
|
||||
match attribute {
|
||||
"id" => task.id().unwrap_or_default().to_string(),
|
||||
"due.relative" => match task.due() {
|
||||
Some(v) => vague_format_date_time(Local::now().naive_utc(), NaiveDateTime::new(v.date(), v.time())),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"entry.age" => vague_format_date_time(
|
||||
NaiveDateTime::new(task.entry().date(), task.entry().time()),
|
||||
Local::now().naive_utc(),
|
||||
),
|
||||
"start.age" => match task.start() {
|
||||
Some(v) => vague_format_date_time(NaiveDateTime::new(v.date(), v.time()), Local::now().naive_utc()),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"project" => match task.project() {
|
||||
Some(p) => p.to_string(),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"depends.count" => match task.depends() {
|
||||
Some(v) => {
|
||||
if v.is_empty() {
|
||||
"".to_string()
|
||||
} else {
|
||||
format!("{}", v.len())
|
||||
}
|
||||
}
|
||||
None => "".to_string(),
|
||||
},
|
||||
"tags.count" => match task.tags() {
|
||||
Some(v) => {
|
||||
let t = v.iter().filter(|t| !self.virtual_tags.contains(t)).cloned().count();
|
||||
if t == 0 {
|
||||
"".to_string()
|
||||
} else {
|
||||
t.to_string()
|
||||
}
|
||||
}
|
||||
None => "".to_string(),
|
||||
},
|
||||
"tags" => match task.tags() {
|
||||
Some(v) => v
|
||||
.iter()
|
||||
.filter(|t| !self.virtual_tags.contains(t))
|
||||
.cloned()
|
||||
.collect::<Vec<_>>()
|
||||
.join(","),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"description.count" => task.description().to_string(),
|
||||
"description" => task.description().to_string(),
|
||||
"urgency" => match &task.urgency() {
|
||||
Some(f) => format!("{:.2}", *f),
|
||||
None => "0.00".to_string(),
|
||||
},
|
||||
_ => "".to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct TTApp {
|
||||
pub should_quit: bool,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
mod app;
|
||||
mod calendar;
|
||||
mod task_report;
|
||||
mod help;
|
||||
mod config;
|
||||
mod table;
|
||||
|
|
|
|||
230
src/task_report.rs
Normal file
230
src/task_report.rs
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
use chrono::{Datelike, Local, NaiveDate, NaiveDateTime, TimeZone};
|
||||
use task_hookrs::task::Task;
|
||||
use std::process::Command;
|
||||
use std::error::Error;
|
||||
|
||||
pub fn vague_format_date_time(from_dt: NaiveDateTime, to_dt: NaiveDateTime) -> String {
|
||||
let mut seconds = (to_dt - from_dt).num_seconds();
|
||||
let minus: &str;
|
||||
|
||||
if seconds < 0 {
|
||||
seconds *= -1;
|
||||
minus = "-";
|
||||
} else {
|
||||
minus = "";
|
||||
}
|
||||
|
||||
if seconds >= 60 * 60 * 24 * 365 {
|
||||
return format!("{}{}y", minus, seconds / 86400 / 365);
|
||||
} else if seconds >= 60 * 60 * 24 * 90 {
|
||||
return format!("{}{}mo", minus, seconds / 60 / 60 / 24 / 30);
|
||||
} else if seconds >= 60 * 60 * 24 * 14 {
|
||||
return format!("{}{}w", minus, seconds / 60 / 60 / 24 / 7);
|
||||
} else if seconds >= 60 * 60 * 24 {
|
||||
return format!("{}{}d", minus, seconds / 60 / 60 / 24);
|
||||
} else if seconds >= 60 * 60 {
|
||||
return format!("{}{}h", minus, seconds / 60 / 60);
|
||||
} else if seconds >= 60 {
|
||||
return format!("{}{}min", minus, seconds / 60);
|
||||
} else {
|
||||
return format!("{}{}s", minus, seconds);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub struct TaskReportTable {
|
||||
pub labels: Vec<String>,
|
||||
pub columns: Vec<String>,
|
||||
pub tasks: Vec<Vec<String>>,
|
||||
pub virtual_tags: Vec<String>,
|
||||
}
|
||||
|
||||
impl TaskReportTable {
|
||||
pub fn new() -> Result<Self, Box<dyn Error>> {
|
||||
let virtual_tags = vec![
|
||||
"PROJECT",
|
||||
"BLOCKED",
|
||||
"UNBLOCKED",
|
||||
"BLOCKING",
|
||||
"DUE",
|
||||
"DUETODAY",
|
||||
"TODAY",
|
||||
"OVERDUE",
|
||||
"WEEK",
|
||||
"MONTH",
|
||||
"QUARTER",
|
||||
"YEAR",
|
||||
"ACTIVE",
|
||||
"SCHEDULED",
|
||||
"PARENT",
|
||||
"CHILD",
|
||||
"UNTIL",
|
||||
"WAITING",
|
||||
"ANNOTATED",
|
||||
"READY",
|
||||
"YESTERDAY",
|
||||
"TOMORROW",
|
||||
"TAGGED",
|
||||
"PENDING",
|
||||
"COMPLETED",
|
||||
"DELETED",
|
||||
"UDA",
|
||||
"ORPHAN",
|
||||
"PRIORITY",
|
||||
"PROJECT",
|
||||
"LATEST",
|
||||
];
|
||||
let mut task_report_table = Self {
|
||||
labels: vec![],
|
||||
columns: vec![],
|
||||
tasks: vec![vec![]],
|
||||
virtual_tags: virtual_tags.iter().map(|s| s.to_string()).collect::<Vec<_>>(),
|
||||
};
|
||||
task_report_table.export_headers()?;
|
||||
Ok(task_report_table)
|
||||
}
|
||||
|
||||
pub fn export_headers(&mut self) -> Result<(), Box<dyn Error>> {
|
||||
self.columns = vec![];
|
||||
self.labels = vec![];
|
||||
|
||||
let output = Command::new("task").arg("show").arg("report.next.columns").output()?;
|
||||
let data = String::from_utf8(output.stdout)?;
|
||||
|
||||
for line in data.split('\n') {
|
||||
if line.starts_with("report.next.columns") {
|
||||
let column_names = line.split(' ').collect::<Vec<_>>()[1];
|
||||
for column in column_names.split(',') {
|
||||
self.columns.push(column.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let output = Command::new("task").arg("show").arg("report.next.labels").output()?;
|
||||
let data = String::from_utf8(output.stdout)?;
|
||||
|
||||
for line in data.split('\n') {
|
||||
if line.starts_with("report.next.labels") {
|
||||
let label_names = line.split(' ').collect::<Vec<_>>()[1];
|
||||
for label in label_names.split(',') {
|
||||
self.labels.push(label.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn generate_table(&mut self, tasks: &[Task]) {
|
||||
self.tasks = vec![];
|
||||
|
||||
// get all tasks as their string representation
|
||||
for task in tasks {
|
||||
let mut item = vec![];
|
||||
for name in &self.columns {
|
||||
let s = self.get_string_attribute(name, &task);
|
||||
item.push(s);
|
||||
}
|
||||
self.tasks.push(item)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn simplify_table(&mut self) -> (Vec<Vec<String>>, Vec<String>) {
|
||||
// find which columns are empty
|
||||
let null_columns_len;
|
||||
if !self.tasks.is_empty() {
|
||||
null_columns_len = self.tasks[0].len();
|
||||
} else {
|
||||
return (vec![], vec![]);
|
||||
}
|
||||
|
||||
let mut null_columns = vec![0; null_columns_len];
|
||||
for task in &self.tasks {
|
||||
for (i, s) in task.iter().enumerate() {
|
||||
null_columns[i] += s.len();
|
||||
}
|
||||
}
|
||||
|
||||
// filter out columns where everything is empty
|
||||
let mut tasks = vec![];
|
||||
for task in &self.tasks {
|
||||
let t = task.clone();
|
||||
let t: Vec<String> = t
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|&(i, _)| null_columns[i] != 0)
|
||||
.map(|(_, e)| e.to_owned())
|
||||
.collect();
|
||||
tasks.push(t);
|
||||
}
|
||||
|
||||
// filter out header where all columns are empty
|
||||
let headers: Vec<String> = self
|
||||
.labels
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|&(i, _)| null_columns[i] != 0)
|
||||
.map(|(_, e)| e.to_owned())
|
||||
.collect();
|
||||
|
||||
(tasks, headers)
|
||||
}
|
||||
|
||||
pub fn get_string_attribute(&self, attribute: &str, task: &Task) -> String {
|
||||
match attribute {
|
||||
"id" => task.id().unwrap_or_default().to_string(),
|
||||
"due.relative" => match task.due() {
|
||||
Some(v) => vague_format_date_time(Local::now().naive_utc(), NaiveDateTime::new(v.date(), v.time())),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"entry.age" => vague_format_date_time(
|
||||
NaiveDateTime::new(task.entry().date(), task.entry().time()),
|
||||
Local::now().naive_utc(),
|
||||
),
|
||||
"start.age" => match task.start() {
|
||||
Some(v) => vague_format_date_time(NaiveDateTime::new(v.date(), v.time()), Local::now().naive_utc()),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"project" => match task.project() {
|
||||
Some(p) => p.to_string(),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"depends.count" => match task.depends() {
|
||||
Some(v) => {
|
||||
if v.is_empty() {
|
||||
"".to_string()
|
||||
} else {
|
||||
format!("{}", v.len())
|
||||
}
|
||||
}
|
||||
None => "".to_string(),
|
||||
},
|
||||
"tags.count" => match task.tags() {
|
||||
Some(v) => {
|
||||
let t = v.iter().filter(|t| !self.virtual_tags.contains(t)).cloned().count();
|
||||
if t == 0 {
|
||||
"".to_string()
|
||||
} else {
|
||||
t.to_string()
|
||||
}
|
||||
}
|
||||
None => "".to_string(),
|
||||
},
|
||||
"tags" => match task.tags() {
|
||||
Some(v) => v
|
||||
.iter()
|
||||
.filter(|t| !self.virtual_tags.contains(t))
|
||||
.cloned()
|
||||
.collect::<Vec<_>>()
|
||||
.join(","),
|
||||
None => "".to_string(),
|
||||
},
|
||||
"description.count" => task.description().to_string(),
|
||||
"description" => task.description().to_string(),
|
||||
"urgency" => match &task.urgency() {
|
||||
Some(f) => format!("{:.2}", *f),
|
||||
None => "0.00".to_string(),
|
||||
},
|
||||
_ => "".to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue