2024-07-25 22:40:35 +03:00
|
|
|
use std::collections::{BTreeSet, HashMap};
|
2024-07-30 08:23:32 +03:00
|
|
|
use std::io::{Error, stdout, Write};
|
2024-07-31 20:05:52 +03:00
|
|
|
use std::iter::once;
|
|
|
|
use std::ops::{Div, Rem};
|
2024-07-19 01:15:11 +03:00
|
|
|
|
2024-07-30 09:02:56 +03:00
|
|
|
use chrono::{Local, TimeZone};
|
2024-07-30 09:00:39 +03:00
|
|
|
use chrono::LocalResult::Single;
|
|
|
|
use colored::Colorize;
|
2024-07-30 08:23:32 +03:00
|
|
|
use itertools::Itertools;
|
2024-07-29 21:06:23 +03:00
|
|
|
use log::{debug, error, info, trace, warn};
|
2024-07-31 20:05:52 +03:00
|
|
|
use nostr_sdk::{Event, EventBuilder, EventId, Kind, PublicKey, Tag, Timestamp};
|
2024-07-25 22:40:35 +03:00
|
|
|
use nostr_sdk::Tag::Hashtag;
|
2024-07-19 21:06:03 +03:00
|
|
|
|
2024-07-31 20:05:52 +03:00
|
|
|
use crate::{EventSender, TASK_KIND, TRACKING_KIND};
|
2024-07-19 21:06:03 +03:00
|
|
|
use crate::task::{State, Task};
|
|
|
|
|
2024-07-19 01:15:11 +03:00
|
|
|
type TaskMap = HashMap<EventId, Task>;
|
2024-07-26 21:45:29 +03:00
|
|
|
#[derive(Debug, Clone)]
|
2024-07-19 01:15:11 +03:00
|
|
|
pub(crate) struct Tasks {
|
2024-07-19 09:35:03 +03:00
|
|
|
/// The Tasks
|
2024-07-24 21:11:36 +03:00
|
|
|
tasks: TaskMap,
|
2024-07-31 20:05:52 +03:00
|
|
|
/// History of active tasks by PubKey
|
|
|
|
history: HashMap<PublicKey, BTreeSet<Event>>,
|
2024-07-19 09:35:03 +03:00
|
|
|
/// The task properties currently visible
|
2024-07-19 01:15:11 +03:00
|
|
|
pub(crate) properties: Vec<String>,
|
2024-07-25 00:26:29 +03:00
|
|
|
/// Negative: Only Leaf nodes
|
|
|
|
/// Zero: Only Active node
|
|
|
|
/// Positive: Go down the respective level
|
|
|
|
pub(crate) depth: i8,
|
2024-07-24 21:11:36 +03:00
|
|
|
|
2024-07-25 22:40:35 +03:00
|
|
|
/// Currently active task
|
2024-07-19 01:15:11 +03:00
|
|
|
position: Option<EventId>,
|
2024-07-25 22:40:35 +03:00
|
|
|
/// Currently active tags
|
|
|
|
tags: BTreeSet<Tag>,
|
2024-07-26 21:45:29 +03:00
|
|
|
/// Current active state
|
|
|
|
state: Option<String>,
|
2024-07-19 09:35:03 +03:00
|
|
|
/// A filtered view of the current tasks
|
|
|
|
view: Vec<EventId>,
|
2024-07-24 21:11:36 +03:00
|
|
|
|
2024-07-25 10:55:29 +03:00
|
|
|
sender: EventSender,
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
|
2024-07-24 16:03:34 +03:00
|
|
|
impl Tasks {
|
|
|
|
pub(crate) fn from(sender: EventSender) -> Self {
|
2024-07-19 01:15:11 +03:00
|
|
|
Tasks {
|
|
|
|
tasks: Default::default(),
|
2024-07-31 20:05:52 +03:00
|
|
|
history: Default::default(),
|
2024-07-26 21:50:55 +03:00
|
|
|
properties: vec![
|
|
|
|
"state".into(),
|
2024-07-30 17:11:43 +03:00
|
|
|
"progress".into(),
|
2024-07-28 11:37:36 +03:00
|
|
|
"rtime".into(),
|
2024-07-30 09:37:12 +03:00
|
|
|
"hashtags".into(),
|
2024-07-26 21:50:55 +03:00
|
|
|
"rpath".into(),
|
|
|
|
"desc".into(),
|
|
|
|
],
|
2024-07-19 01:15:11 +03:00
|
|
|
position: None,
|
2024-07-19 09:35:03 +03:00
|
|
|
view: Default::default(),
|
2024-07-25 22:40:35 +03:00
|
|
|
tags: Default::default(),
|
2024-07-26 21:45:29 +03:00
|
|
|
state: Some(State::Open.to_string()),
|
2024-07-25 00:26:29 +03:00
|
|
|
depth: 1,
|
2024-07-25 10:55:29 +03:00
|
|
|
sender,
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Tasks {
|
2024-07-25 22:10:01 +03:00
|
|
|
// Accessors
|
|
|
|
|
2024-07-30 17:13:29 +03:00
|
|
|
#[inline]
|
2024-07-26 21:45:29 +03:00
|
|
|
pub(crate) fn get_by_id(&self, id: &EventId) -> Option<&Task> {
|
|
|
|
self.tasks.get(id)
|
|
|
|
}
|
|
|
|
|
2024-07-30 17:13:29 +03:00
|
|
|
#[inline]
|
2024-07-19 01:15:11 +03:00
|
|
|
pub(crate) fn get_position(&self) -> Option<EventId> {
|
|
|
|
self.position
|
|
|
|
}
|
2024-07-19 21:06:03 +03:00
|
|
|
|
2024-07-31 20:05:52 +03:00
|
|
|
/// Ids of all subtasks found for id, including itself
|
|
|
|
fn get_subtasks(&self, id: EventId) -> Vec<EventId> {
|
|
|
|
let mut children = Vec::with_capacity(32);
|
|
|
|
let mut index = 0;
|
|
|
|
|
|
|
|
children.push(id);
|
|
|
|
while index < children.len() {
|
|
|
|
self.tasks.get(&children[index]).map(|t| {
|
|
|
|
children.reserve(t.children.len());
|
|
|
|
for child in t.children.iter() {
|
|
|
|
children.push(child.clone());
|
|
|
|
}
|
|
|
|
});
|
|
|
|
index += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
children
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Total time tracked on this task by the current user.
|
|
|
|
pub(crate) fn time_tracked(&self, id: &EventId) -> u64 {
|
|
|
|
let mut total = 0;
|
|
|
|
let mut start: Option<Timestamp> = None;
|
|
|
|
for event in self.history.get(&self.sender.pubkey()).into_iter().flatten() {
|
|
|
|
match event.tags.first() {
|
|
|
|
Some(Tag::Event {
|
|
|
|
event_id,
|
|
|
|
..
|
|
|
|
}) if event_id == id => {
|
|
|
|
start = start.or(Some(event.created_at))
|
|
|
|
}
|
|
|
|
_ => if let Some(stamp) = start {
|
|
|
|
total += (event.created_at - stamp).as_u64();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if let Some(start) = start {
|
|
|
|
total += (Timestamp::now() - start).as_u64();
|
|
|
|
}
|
|
|
|
total
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Total time tracked on this task and its subtasks by all users.
|
|
|
|
/// TODO needs testing!
|
|
|
|
fn total_time_tracked(&self, id: EventId) -> u64 {
|
|
|
|
let mut total = 0;
|
|
|
|
|
|
|
|
let children = self.get_subtasks(id);
|
|
|
|
for user in self.history.values() {
|
|
|
|
let mut start: Option<Timestamp> = None;
|
|
|
|
for event in user {
|
|
|
|
match event.tags.first() {
|
|
|
|
Some(Tag::Event {
|
|
|
|
event_id,
|
|
|
|
..
|
|
|
|
}) if children.contains(event_id) => {
|
|
|
|
start = start.or(Some(event.created_at))
|
|
|
|
}
|
|
|
|
_ => if let Some(stamp) = start {
|
|
|
|
total += (event.created_at - stamp).as_u64();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if let Some(start) = start {
|
|
|
|
total += (Timestamp::now() - start).as_u64();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total
|
2024-07-19 09:44:12 +03:00
|
|
|
}
|
2024-07-19 21:06:03 +03:00
|
|
|
|
2024-07-30 17:11:43 +03:00
|
|
|
fn total_progress(&self, id: &EventId) -> Option<f32> {
|
2024-07-30 17:13:29 +03:00
|
|
|
self.get_by_id(id).and_then(|t| match t.pure_state() {
|
2024-07-30 17:11:43 +03:00
|
|
|
State::Closed => None,
|
|
|
|
State::Done => Some(1.0),
|
|
|
|
_ => {
|
|
|
|
let count = t.children.len() as f32;
|
|
|
|
Some(
|
|
|
|
t.children
|
|
|
|
.iter()
|
|
|
|
.filter_map(|e| self.total_progress(e).map(|p| p / count))
|
|
|
|
.sum(),
|
|
|
|
)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
// Parents
|
|
|
|
|
2024-07-26 21:45:29 +03:00
|
|
|
pub(crate) fn get_parent(&self, id: Option<EventId>) -> Option<EventId> {
|
2024-07-30 17:13:29 +03:00
|
|
|
id.and_then(|id| self.get_by_id(&id))
|
2024-07-25 22:10:01 +03:00
|
|
|
.and_then(|t| t.parent_id())
|
|
|
|
}
|
|
|
|
|
2024-07-26 21:45:29 +03:00
|
|
|
pub(crate) fn get_prompt_suffix(&self) -> String {
|
|
|
|
self.tags
|
|
|
|
.iter()
|
|
|
|
.map(|t| format!(" #{}", t.content().unwrap()))
|
|
|
|
.chain(self.state.as_ref().map(|s| format!(" ?{s}")).into_iter())
|
|
|
|
.collect::<Vec<String>>()
|
|
|
|
.join("")
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn get_task_path(&self, id: Option<EventId>) -> String {
|
2024-07-29 21:27:50 +03:00
|
|
|
join_tasks(self.traverse_up_from(id), true)
|
2024-07-29 13:32:47 +03:00
|
|
|
.filter(|s| !s.is_empty())
|
|
|
|
.or_else(|| id.map(|id| id.to_string()))
|
|
|
|
.unwrap_or(String::new())
|
2024-07-25 22:10:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn traverse_up_from(&self, id: Option<EventId>) -> ParentIterator {
|
|
|
|
ParentIterator {
|
|
|
|
tasks: &self.tasks,
|
|
|
|
current: id,
|
|
|
|
prev: None,
|
|
|
|
}
|
2024-07-19 09:35:03 +03:00
|
|
|
}
|
2024-07-25 10:55:29 +03:00
|
|
|
|
2024-07-29 21:27:50 +03:00
|
|
|
fn relative_path(&self, id: EventId) -> String {
|
|
|
|
join_tasks(
|
|
|
|
self.traverse_up_from(Some(id))
|
|
|
|
.take_while(|t| Some(t.event.id) != self.position),
|
|
|
|
false,
|
2024-07-31 20:08:33 +03:00
|
|
|
).unwrap_or(id.to_string())
|
2024-07-29 21:27:50 +03:00
|
|
|
}
|
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
// Helpers
|
|
|
|
|
2024-07-31 20:08:33 +03:00
|
|
|
fn resolve_tasks<'a>(&self, iter: impl IntoIterator<Item=&'a EventId>) -> Vec<&Task> {
|
2024-07-25 00:26:29 +03:00
|
|
|
self.resolve_tasks_rec(iter, self.depth)
|
|
|
|
}
|
|
|
|
|
2024-07-25 10:55:29 +03:00
|
|
|
fn resolve_tasks_rec<'a>(
|
|
|
|
&self,
|
2024-07-31 20:08:33 +03:00
|
|
|
iter: impl IntoIterator<Item=&'a EventId>,
|
2024-07-25 10:55:29 +03:00
|
|
|
depth: i8,
|
|
|
|
) -> Vec<&Task> {
|
|
|
|
iter.into_iter()
|
2024-07-30 17:13:29 +03:00
|
|
|
.filter_map(|id| self.get_by_id(&id))
|
2024-07-25 10:55:29 +03:00
|
|
|
.flat_map(|task| {
|
|
|
|
let new_depth = depth - 1;
|
|
|
|
if new_depth < 0 {
|
|
|
|
let tasks = self
|
|
|
|
.resolve_tasks_rec(task.children.iter(), new_depth)
|
|
|
|
.into_iter()
|
|
|
|
.collect::<Vec<&Task>>();
|
|
|
|
if tasks.is_empty() {
|
|
|
|
vec![task]
|
|
|
|
} else {
|
|
|
|
tasks
|
|
|
|
}
|
|
|
|
} else if new_depth > 0 {
|
|
|
|
self.resolve_tasks_rec(task.children.iter(), new_depth)
|
|
|
|
.into_iter()
|
|
|
|
.chain(once(task))
|
|
|
|
.collect()
|
2024-07-25 00:26:29 +03:00
|
|
|
} else {
|
2024-07-25 10:55:29 +03:00
|
|
|
vec![task]
|
2024-07-25 00:26:29 +03:00
|
|
|
}
|
2024-07-25 10:55:29 +03:00
|
|
|
})
|
|
|
|
.collect()
|
2024-07-24 21:11:36 +03:00
|
|
|
}
|
2024-07-25 00:26:29 +03:00
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
pub(crate) fn referenced_tasks<F: Fn(&mut Task)>(&mut self, event: &Event, f: F) {
|
|
|
|
for tag in event.tags.iter() {
|
|
|
|
if let Tag::Event { event_id, .. } = tag {
|
|
|
|
self.tasks.get_mut(event_id).map(|t| f(t));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-07-30 17:13:29 +03:00
|
|
|
#[inline]
|
2024-07-30 08:23:32 +03:00
|
|
|
fn current_task(&self) -> Option<&Task> {
|
2024-07-30 17:13:29 +03:00
|
|
|
self.position.and_then(|id| self.get_by_id(&id))
|
2024-07-30 08:23:32 +03:00
|
|
|
}
|
|
|
|
|
2024-07-19 09:35:03 +03:00
|
|
|
pub(crate) fn current_tasks(&self) -> Vec<&Task> {
|
2024-07-25 00:26:29 +03:00
|
|
|
if self.depth == 0 {
|
2024-07-30 08:23:32 +03:00
|
|
|
return self.current_task().into_iter().collect();
|
2024-07-25 00:26:29 +03:00
|
|
|
}
|
2024-07-24 21:11:36 +03:00
|
|
|
let res: Vec<&Task> = self.resolve_tasks(self.view.iter());
|
2024-07-19 09:35:03 +03:00
|
|
|
if res.len() > 0 {
|
2024-07-26 21:45:29 +03:00
|
|
|
// Currently ignores filter when it matches nothing
|
2024-07-19 09:35:03 +03:00
|
|
|
return res;
|
|
|
|
}
|
2024-07-26 21:45:29 +03:00
|
|
|
self.resolve_tasks(
|
|
|
|
self.tasks
|
|
|
|
.values()
|
|
|
|
.filter(|t| t.parent_id() == self.position)
|
|
|
|
.map(|t| t.get_id()),
|
2024-07-31 20:08:33 +03:00
|
|
|
).into_iter()
|
|
|
|
.filter(|t| {
|
|
|
|
self.state.as_ref().map_or(true, |state| {
|
|
|
|
t.state().is_some_and(|t| t.matches_label(state))
|
|
|
|
}) && (self.tags.is_empty()
|
|
|
|
|| t.tags.as_ref().map_or(false, |tags| {
|
2024-07-26 21:45:29 +03:00
|
|
|
let mut iter = tags.iter();
|
|
|
|
self.tags.iter().all(|tag| iter.any(|t| t == tag))
|
|
|
|
}))
|
2024-07-31 20:08:33 +03:00
|
|
|
})
|
|
|
|
.collect()
|
2024-07-19 09:35:03 +03:00
|
|
|
}
|
2024-07-19 01:15:11 +03:00
|
|
|
|
2024-07-30 08:23:32 +03:00
|
|
|
pub(crate) fn print_tasks(&self) -> Result<(), Error> {
|
|
|
|
let mut lock = stdout().lock();
|
|
|
|
if let Some(t) = self.current_task() {
|
|
|
|
if let Some(state) = t.state() {
|
|
|
|
writeln!(
|
|
|
|
lock,
|
2024-07-30 09:00:39 +03:00
|
|
|
"{} since {} (total tracked time {}m)",
|
2024-07-30 08:23:32 +03:00
|
|
|
state.get_label(),
|
2024-07-30 09:00:39 +03:00
|
|
|
match Local.timestamp_opt(state.time.as_i64(), 0) {
|
|
|
|
Single(time) => {
|
|
|
|
let date = time.date_naive();
|
2024-07-30 09:02:56 +03:00
|
|
|
let prefix = match Local::now()
|
|
|
|
.date_naive()
|
|
|
|
.signed_duration_since(date)
|
|
|
|
.num_days()
|
|
|
|
{
|
2024-07-30 09:00:39 +03:00
|
|
|
0 => "".into(),
|
|
|
|
1 => "yesterday ".into(),
|
|
|
|
2..=6 => date.format("%a ").to_string(),
|
|
|
|
_ => date.format("%y-%m-%d ").to_string(),
|
|
|
|
};
|
|
|
|
format!("{}{}", prefix, time.format("%H:%M"))
|
|
|
|
}
|
|
|
|
_ => state.time.to_human_datetime(),
|
|
|
|
},
|
2024-07-31 20:05:52 +03:00
|
|
|
self.time_tracked(t.get_id()) / 60
|
2024-07-30 08:23:32 +03:00
|
|
|
)?;
|
|
|
|
}
|
|
|
|
writeln!(lock, "{}", t.descriptions().join("\n"))?;
|
|
|
|
}
|
2024-07-30 09:00:39 +03:00
|
|
|
// TODO proper columns
|
|
|
|
writeln!(lock, "{}", self.properties.join("\t").bold())?;
|
2024-07-19 09:35:03 +03:00
|
|
|
for task in self.current_tasks() {
|
2024-07-30 08:23:32 +03:00
|
|
|
writeln!(
|
|
|
|
lock,
|
2024-07-19 09:35:03 +03:00
|
|
|
"{}",
|
|
|
|
self.properties
|
|
|
|
.iter()
|
|
|
|
.map(|p| match p.as_str() {
|
2024-07-30 17:11:43 +03:00
|
|
|
"subtasks" => {
|
|
|
|
let mut total = 0;
|
|
|
|
let mut done = 0;
|
|
|
|
for subtask in task.children.iter().filter_map(|id| self.get_by_id(id))
|
|
|
|
{
|
|
|
|
let state = subtask.pure_state();
|
|
|
|
total += &(state != State::Closed).into();
|
|
|
|
done += &(state == State::Done).into();
|
|
|
|
}
|
|
|
|
if total > 0 {
|
|
|
|
format!("{done}/{total}")
|
|
|
|
} else {
|
|
|
|
"".to_string()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"progress" => self
|
2024-07-31 20:06:16 +03:00
|
|
|
.total_progress(task.get_id())
|
|
|
|
.map_or(String::new(), |p| format!("{:2.0}%", p * 100.0)),
|
2024-07-26 21:45:29 +03:00
|
|
|
"path" => self.get_task_path(Some(task.event.id)),
|
2024-07-29 21:27:50 +03:00
|
|
|
"rpath" => self.relative_path(task.event.id),
|
2024-07-31 20:05:52 +03:00
|
|
|
"time" => display_time("MMMm", self.time_tracked(task.get_id())),
|
|
|
|
"rtime" => display_time("HH:MMm", self.total_time_tracked(*task.get_id())),
|
2024-07-19 09:35:03 +03:00
|
|
|
prop => task.get(prop).unwrap_or(String::new()),
|
|
|
|
})
|
|
|
|
.collect::<Vec<String>>()
|
2024-07-29 16:20:43 +03:00
|
|
|
.join(" \t")
|
2024-07-30 08:23:32 +03:00
|
|
|
)?;
|
2024-07-19 09:35:03 +03:00
|
|
|
}
|
2024-07-30 08:23:32 +03:00
|
|
|
writeln!(lock)?;
|
|
|
|
Ok(())
|
2024-07-19 09:35:03 +03:00
|
|
|
}
|
2024-07-19 21:06:03 +03:00
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
// Movement and Selection
|
|
|
|
|
|
|
|
pub(crate) fn set_filter(&mut self, view: Vec<EventId>) {
|
2024-07-26 21:45:29 +03:00
|
|
|
self.view = view;
|
2024-07-25 22:10:01 +03:00
|
|
|
}
|
|
|
|
|
2024-07-25 22:40:35 +03:00
|
|
|
pub(crate) fn add_tag(&mut self, tag: String) {
|
|
|
|
self.view.clear();
|
|
|
|
self.tags.insert(Hashtag(tag));
|
|
|
|
}
|
|
|
|
|
2024-07-26 21:45:29 +03:00
|
|
|
pub(crate) fn set_state_filter(&mut self, state: Option<String>) {
|
|
|
|
self.view.clear();
|
|
|
|
self.state = state;
|
|
|
|
}
|
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
pub(crate) fn move_up(&mut self) {
|
2024-07-30 08:23:32 +03:00
|
|
|
self.move_to(self.current_task().and_then(|t| t.parent_id()))
|
2024-07-24 16:03:34 +03:00
|
|
|
}
|
|
|
|
|
2024-07-25 22:10:01 +03:00
|
|
|
pub(crate) fn move_to(&mut self, id: Option<EventId>) {
|
|
|
|
self.view.clear();
|
2024-07-31 20:08:33 +03:00
|
|
|
self.tags.clear(); // TODO unsure if this is needed, needs alternative way to clear
|
2024-07-25 22:10:01 +03:00
|
|
|
if id == self.position {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
self.position = id;
|
2024-07-31 20:05:52 +03:00
|
|
|
self.sender.submit(
|
|
|
|
EventBuilder::new(
|
|
|
|
Kind::from(TRACKING_KIND),
|
|
|
|
"",
|
|
|
|
id.iter().map(|id| Tag::event(id.clone())),
|
|
|
|
)
|
|
|
|
).map(|e| {
|
|
|
|
self.add(e);
|
2024-07-25 22:10:01 +03:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// Updates
|
|
|
|
|
2024-07-29 16:20:43 +03:00
|
|
|
/// Expects sanitized input
|
2024-07-24 16:03:34 +03:00
|
|
|
pub(crate) fn build_task(&self, input: &str) -> EventBuilder {
|
2024-07-25 22:40:35 +03:00
|
|
|
let mut tags: Vec<Tag> = self.tags.iter().cloned().collect();
|
2024-07-19 01:15:11 +03:00
|
|
|
self.position.inspect(|p| tags.push(Tag::event(*p)));
|
|
|
|
return match input.split_once(": ") {
|
2024-07-24 16:03:34 +03:00
|
|
|
None => EventBuilder::new(Kind::from(TASK_KIND), input, tags),
|
2024-07-19 01:15:11 +03:00
|
|
|
Some(s) => {
|
2024-07-30 09:02:56 +03:00
|
|
|
tags.append(
|
|
|
|
&mut s
|
|
|
|
.1
|
|
|
|
.split_ascii_whitespace()
|
|
|
|
.map(|t| Hashtag(t.to_string()))
|
|
|
|
.collect(),
|
|
|
|
);
|
2024-07-24 16:03:34 +03:00
|
|
|
EventBuilder::new(Kind::from(TASK_KIND), s.0, tags)
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2024-07-29 16:20:43 +03:00
|
|
|
/// Sanitizes input
|
2024-07-25 22:10:01 +03:00
|
|
|
pub(crate) fn make_task(&mut self, input: &str) -> Option<EventId> {
|
2024-07-29 16:20:43 +03:00
|
|
|
self.sender.submit(self.build_task(input.trim())).map(|e| {
|
2024-07-25 22:10:01 +03:00
|
|
|
let id = e.id;
|
|
|
|
self.add_task(e);
|
2024-07-26 21:45:29 +03:00
|
|
|
let state = self.state.clone().unwrap_or("Open".to_string());
|
|
|
|
self.set_state_for(&id, &state);
|
2024-07-25 22:10:01 +03:00
|
|
|
id
|
|
|
|
})
|
2024-07-19 16:49:23 +03:00
|
|
|
}
|
|
|
|
|
2024-07-19 21:04:21 +03:00
|
|
|
pub(crate) fn add(&mut self, event: Event) {
|
2024-07-31 20:05:52 +03:00
|
|
|
match event.kind.as_u64() {
|
|
|
|
TASK_KIND => self.add_task(event),
|
|
|
|
TRACKING_KIND =>
|
|
|
|
match self.history.get_mut(&event.pubkey) {
|
|
|
|
Some(c) => { c.insert(event); }
|
|
|
|
None => { self.history.insert(event.pubkey, BTreeSet::from([event])); }
|
|
|
|
},
|
|
|
|
_ => self.add_prop(&event),
|
2024-07-19 21:04:21 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-07-19 16:49:23 +03:00
|
|
|
pub(crate) fn add_task(&mut self, event: Event) {
|
2024-07-25 10:55:29 +03:00
|
|
|
self.referenced_tasks(&event, |t| {
|
|
|
|
t.children.insert(event.id);
|
|
|
|
});
|
2024-07-24 16:03:34 +03:00
|
|
|
if self.tasks.contains_key(&event.id) {
|
2024-07-29 21:06:23 +03:00
|
|
|
debug!("Did not insert duplicate event {}", event.id);
|
2024-07-24 16:03:34 +03:00
|
|
|
} else {
|
|
|
|
self.tasks.insert(event.id, Task::new(event));
|
|
|
|
}
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
2024-07-25 10:55:29 +03:00
|
|
|
|
2024-07-31 20:05:52 +03:00
|
|
|
fn add_prop(&mut self, event: &Event) {
|
2024-07-25 10:55:29 +03:00
|
|
|
self.referenced_tasks(&event, |t| {
|
|
|
|
t.props.insert(event.clone());
|
|
|
|
});
|
2024-07-19 21:04:21 +03:00
|
|
|
}
|
2024-07-19 01:15:11 +03:00
|
|
|
|
2024-07-29 11:15:13 +03:00
|
|
|
pub(crate) fn set_state_for(&mut self, id: &EventId, comment: &str) -> Option<Event> {
|
2024-07-26 21:45:29 +03:00
|
|
|
let t = self.tasks.get_mut(id);
|
|
|
|
t.and_then(|task| {
|
|
|
|
task.set_state(
|
|
|
|
&self.sender,
|
|
|
|
match comment {
|
|
|
|
"Closed" => State::Closed,
|
|
|
|
"Done" => State::Done,
|
|
|
|
_ => State::Open,
|
|
|
|
},
|
|
|
|
comment,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2024-07-23 13:45:25 +03:00
|
|
|
pub(crate) fn update_state_for<F>(&mut self, id: &EventId, comment: &str, f: F) -> Option<Event>
|
2024-07-19 01:15:11 +03:00
|
|
|
where
|
|
|
|
F: FnOnce(&Task) -> Option<State>,
|
|
|
|
{
|
2024-07-26 21:45:29 +03:00
|
|
|
self.tasks
|
|
|
|
.get_mut(id)
|
|
|
|
.and_then(|task| f(task).and_then(|state| task.set_state(&self.sender, state, comment)))
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
|
2024-07-23 13:45:25 +03:00
|
|
|
pub(crate) fn update_state<F>(&mut self, comment: &str, f: F) -> Option<Event>
|
2024-07-19 01:15:11 +03:00
|
|
|
where
|
|
|
|
F: FnOnce(&Task) -> Option<State>,
|
|
|
|
{
|
2024-07-25 10:50:53 +03:00
|
|
|
self.position
|
|
|
|
.and_then(|id| self.update_state_for(&id, comment, f))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn add_note(&mut self, note: &str) {
|
|
|
|
match self.position {
|
2024-07-29 21:06:23 +03:00
|
|
|
None => warn!("Cannot add note '{}' without active task", note),
|
2024-07-25 10:50:53 +03:00
|
|
|
Some(id) => {
|
|
|
|
self.sender
|
|
|
|
.submit(EventBuilder::text_note(note, vec![]))
|
|
|
|
.map(|e| {
|
|
|
|
self.tasks.get_mut(&id).map(|t| {
|
|
|
|
t.props.insert(e.clone());
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-07-31 20:05:52 +03:00
|
|
|
fn display_time(format: &str, secs: u64) -> String {
|
|
|
|
Some(secs / 60)
|
|
|
|
.filter(|t| t > &0)
|
|
|
|
.map_or(String::new(), |mins| format
|
|
|
|
.replace("HH", &format!("{:02}", mins.div(60)))
|
|
|
|
.replace("MM", &format!("{:02}", mins.rem(60)))
|
|
|
|
.replace("MMM", &format!("{:3}", mins)),
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2024-07-30 09:02:56 +03:00
|
|
|
pub(crate) fn join_tasks<'a>(
|
2024-07-31 20:05:52 +03:00
|
|
|
iter: impl Iterator<Item=&'a Task>,
|
2024-07-30 09:02:56 +03:00
|
|
|
include_last_id: bool,
|
|
|
|
) -> Option<String> {
|
2024-07-29 13:32:47 +03:00
|
|
|
let tasks: Vec<&Task> = iter.collect();
|
|
|
|
tasks
|
|
|
|
.iter()
|
|
|
|
.map(|t| t.get_title())
|
2024-07-30 09:02:56 +03:00
|
|
|
.chain(if include_last_id {
|
|
|
|
tasks
|
|
|
|
.last()
|
|
|
|
.and_then(|t| t.parent_id())
|
|
|
|
.map(|id| id.to_string())
|
|
|
|
.into_iter()
|
|
|
|
} else {
|
|
|
|
None.into_iter()
|
|
|
|
})
|
2024-07-25 10:55:29 +03:00
|
|
|
.fold(None, |acc, val| {
|
|
|
|
Some(acc.map_or_else(|| val.clone(), |cur| format!("{}>{}", val, cur)))
|
|
|
|
})
|
2024-07-25 00:52:03 +03:00
|
|
|
}
|
|
|
|
|
2024-07-19 01:15:11 +03:00
|
|
|
struct ParentIterator<'a> {
|
|
|
|
tasks: &'a TaskMap,
|
|
|
|
current: Option<EventId>,
|
2024-07-19 16:49:23 +03:00
|
|
|
/// Inexpensive helper to assert correctness
|
|
|
|
prev: Option<EventId>,
|
2024-07-19 01:15:11 +03:00
|
|
|
}
|
|
|
|
impl<'a> Iterator for ParentIterator<'a> {
|
|
|
|
type Item = &'a Task;
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
self.current.and_then(|id| self.tasks.get(&id)).map(|t| {
|
2024-07-19 16:49:23 +03:00
|
|
|
self.prev.map(|id| assert!(t.children.contains(&id)));
|
|
|
|
self.prev = self.current;
|
2024-07-19 01:15:11 +03:00
|
|
|
self.current = t.parent_id();
|
|
|
|
t
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2024-07-25 00:26:29 +03:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_depth() {
|
2024-07-25 10:55:29 +03:00
|
|
|
use std::sync::mpsc;
|
2024-07-31 20:05:52 +03:00
|
|
|
use nostr_sdk::Keys;
|
2024-07-25 10:55:29 +03:00
|
|
|
|
2024-07-26 21:45:29 +03:00
|
|
|
let (tx, _rx) = mpsc::channel();
|
2024-07-25 00:26:29 +03:00
|
|
|
let mut tasks = Tasks::from(EventSender {
|
|
|
|
tx,
|
|
|
|
keys: Keys::generate(),
|
|
|
|
});
|
2024-07-29 13:32:47 +03:00
|
|
|
|
2024-07-25 00:26:29 +03:00
|
|
|
let t1 = tasks.make_task("t1");
|
2024-07-26 21:45:29 +03:00
|
|
|
let task1 = tasks.get_by_id(&t1.unwrap()).unwrap();
|
2024-07-25 00:26:29 +03:00
|
|
|
assert_eq!(tasks.depth, 1);
|
2024-07-26 21:45:29 +03:00
|
|
|
assert_eq!(task1.state().unwrap().get_label(), "Open");
|
2024-07-29 21:06:23 +03:00
|
|
|
debug!("{:?}", tasks);
|
2024-07-25 00:26:29 +03:00
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
tasks.depth = 0;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 0);
|
2024-07-25 10:55:29 +03:00
|
|
|
|
2024-07-25 00:26:29 +03:00
|
|
|
tasks.move_to(t1);
|
|
|
|
tasks.depth = 2;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 0);
|
|
|
|
let t2 = tasks.make_task("t2");
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
2024-07-29 21:27:50 +03:00
|
|
|
assert_eq!(tasks.get_task_path(t2), "t1>t2");
|
|
|
|
assert_eq!(tasks.relative_path(t2.unwrap()), "t2");
|
2024-07-25 00:26:29 +03:00
|
|
|
let t3 = tasks.make_task("t3");
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
2024-07-25 10:55:29 +03:00
|
|
|
|
2024-07-25 00:26:29 +03:00
|
|
|
tasks.move_to(t2);
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 0);
|
|
|
|
let t4 = tasks.make_task("t4");
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
2024-07-29 21:27:50 +03:00
|
|
|
assert_eq!(tasks.get_task_path(t4), "t1>t2>t4");
|
|
|
|
assert_eq!(tasks.relative_path(t4.unwrap()), "t4");
|
2024-07-25 00:26:29 +03:00
|
|
|
tasks.depth = 2;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
tasks.depth = -1;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
|
|
|
|
tasks.move_to(t1);
|
2024-07-29 21:27:50 +03:00
|
|
|
assert_eq!(tasks.relative_path(t4.unwrap()), "t2>t4");
|
2024-07-25 00:26:29 +03:00
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
|
|
|
tasks.depth = 2;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 3);
|
|
|
|
tasks.set_filter(vec![t2.unwrap()]);
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
|
|
|
tasks.depth = 1;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
tasks.depth = -1;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
tasks.set_filter(vec![t2.unwrap(), t3.unwrap()]);
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
|
|
|
tasks.depth = 2;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 3);
|
|
|
|
tasks.depth = 1;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
|
|
|
|
|
|
|
tasks.move_to(None);
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 1);
|
|
|
|
tasks.depth = 2;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 3);
|
|
|
|
tasks.depth = 3;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 4);
|
|
|
|
tasks.depth = 9;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 4);
|
|
|
|
tasks.depth = -1;
|
|
|
|
assert_eq!(tasks.current_tasks().len(), 2);
|
2024-07-29 13:32:47 +03:00
|
|
|
|
|
|
|
let empty = tasks.make_task("");
|
|
|
|
let empty_task = tasks.get_by_id(&empty.unwrap()).unwrap();
|
|
|
|
let empty_id = empty_task.event.id.to_string();
|
|
|
|
assert_eq!(empty_task.get_title(), empty_id);
|
|
|
|
assert_eq!(tasks.get_task_path(empty), empty_id);
|
2024-07-29 16:20:43 +03:00
|
|
|
|
2024-07-29 13:32:47 +03:00
|
|
|
let zero = EventId::all_zeros();
|
|
|
|
assert_eq!(tasks.get_task_path(Some(zero)), zero.to_string());
|
2024-07-29 21:27:50 +03:00
|
|
|
tasks.move_to(Some(zero));
|
|
|
|
let dangling = tasks.make_task("test");
|
2024-07-30 09:02:56 +03:00
|
|
|
assert_eq!(
|
|
|
|
tasks.get_task_path(dangling),
|
|
|
|
"0000000000000000000000000000000000000000000000000000000000000000>test"
|
|
|
|
);
|
2024-07-29 21:27:50 +03:00
|
|
|
assert_eq!(tasks.relative_path(dangling.unwrap()), "test");
|
2024-07-29 16:20:43 +03:00
|
|
|
|
|
|
|
use itertools::Itertools;
|
|
|
|
assert_eq!("test toast".split(' ').collect_vec().len(), 3);
|
2024-07-30 09:02:56 +03:00
|
|
|
assert_eq!(
|
|
|
|
"test toast".split_ascii_whitespace().collect_vec().len(),
|
|
|
|
2
|
|
|
|
);
|
2024-07-25 10:55:29 +03:00
|
|
|
}
|