janek
/
mostr
1
0
Fork 1
Code Issues Pull Requests Releases Activity

feat: deferred state updates

This commit is contained in:
xeruf 2024-09-23 08:50:12 +02:00
parent 516acadd4a
commit d4bca1c26f
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -117,6 +117,7 @@ Append `@TIME` to any task creation or change command to record the action with
- `>[TEXT]` - complete active task and move up, with optional status description - `>[TEXT]` - complete active task and move up, with optional status description
- `<[TEXT]` - close active task and move up, with optional status description - `<[TEXT]` - close active task and move up, with optional status description
- `!TEXT` - set status for current task from text and move up; empty: Open - `!TEXT` - set status for current task from text and move up; empty: Open
- `!TIME: REASON` - defer current task to date
- TBI: `*[INT]` - set priority - can also be used in task creation, with any digit - TBI: `*[INT]` - set priority - can also be used in task creation, with any digit
- `,[TEXT]` - list notes or add text note (stateless task / task description) - `,[TEXT]` - list notes or add text note (stateless task / task description)
- TBI: `;[TEXT]` - list comments or comment on task - TBI: `;[TEXT]` - list comments or comment on task

51
src/main.rs
View File

@ -29,7 +29,7 @@ use xdg::BaseDirectories;
use crate::helpers::*; use crate::helpers::*;
use crate::kinds::{BASIC_KINDS, PROPERTY_COLUMNS, PROP_KINDS, TRACKING_KIND}; use crate::kinds::{BASIC_KINDS, PROPERTY_COLUMNS, PROP_KINDS, TRACKING_KIND};
use crate::task::{State, MARKER_DEPENDS}; use crate::task::{State, Task, TaskState, MARKER_DEPENDS};
use crate::tasks::{PropertyCollection, StateFilter, TasksRelay}; use crate::tasks::{PropertyCollection, StateFilter, TasksRelay};
mod helpers; mod helpers;
@ -262,7 +262,7 @@ async fn main() -> Result<()> {
or_warn!(client.set_metadata(meta).await, "Unable to set metadata"); or_warn!(client.set_metadata(meta).await, "Unable to set metadata");
} }
loop { 'repl: loop {
let result_received = timeout(Duration::from_secs(INACTVITY_DELAY), rx.recv()).await; let result_received = timeout(Duration::from_secs(INACTVITY_DELAY), rx.recv()).await;
match result_received { match result_received {
Ok(Some(MostrMessage::NewRelay(url))) => { Ok(Some(MostrMessage::NewRelay(url))) => {
@ -300,7 +300,7 @@ async fn main() -> Result<()> {
} }
Ok(None) => { Ok(None) => {
debug!("Finalizing nostr communication thread because communication channel was closed"); debug!("Finalizing nostr communication thread because communication channel was closed");
break; break 'repl;
} }
} }
} }
@ -325,7 +325,7 @@ async fn main() -> Result<()> {
} }
} }
loop { 'repl: loop {
println!(); println!();
let tasks = relays.get(&selected_relay).unwrap(); let tasks = relays.get(&selected_relay).unwrap();
let prompt = format!( let prompt = format!(
@ -370,7 +370,7 @@ async fn main() -> Result<()> {
debug!("Flushing Tasks because of empty command"); debug!("Flushing Tasks because of empty command");
tasks.flush(); tasks.flush();
or_warn!(tasks.print_tasks()); or_warn!(tasks.print_tasks());
continue; continue 'repl;
} }
Some('@') => {} Some('@') => {}
Some(_) => { Some(_) => {
@ -413,7 +413,7 @@ async fn main() -> Result<()> {
tasks.get_columns().add_or_remove(arg.to_string()); tasks.get_columns().add_or_remove(arg.to_string());
} else { } else {
println!("{}", PROPERTY_COLUMNS); println!("{}", PROPERTY_COLUMNS);
continue; continue 'repl;
} }
} }
@ -424,12 +424,12 @@ async fn main() -> Result<()> {
|| info!("With a task selected, use ,NOTE to attach NOTE and , to list all its notes"), || info!("With a task selected, use ,NOTE to attach NOTE and , to list all its notes"),
|task| println!("{}", task.description_events().map(|e| format!("{} {}", format_timestamp_local(&e.created_at), e.content)).join("\n")), |task| println!("{}", task.description_events().map(|e| format!("{} {}", format_timestamp_local(&e.created_at), e.content)).join("\n")),
); );
continue; continue 'repl;
} }
Some(arg) => { Some(arg) => {
if arg.len() < CHARACTER_THRESHOLD { if arg.len() < CHARACTER_THRESHOLD {
warn!("Note needs at least {CHARACTER_THRESHOLD} characters!"); warn!("Note needs at least {CHARACTER_THRESHOLD} characters!");
continue; continue 'repl;
} }
tasks.make_note(arg) tasks.make_note(arg)
} }
@ -437,12 +437,12 @@ async fn main() -> Result<()> {
Some('>') => { Some('>') => {
tasks.update_state(arg_default, State::Done); tasks.update_state(arg_default, State::Done);
tasks.move_up(); if tasks.custom_time.is_none() { tasks.move_up(); }
} }
Some('<') => { Some('<') => {
tasks.update_state(arg_default, State::Closed); tasks.update_state(arg_default, State::Closed);
tasks.move_up(); if tasks.custom_time.is_none() { tasks.move_up(); }
} }
Some('&') => { Some('&') => {
@ -455,7 +455,7 @@ async fn main() -> Result<()> {
_ => { _ => {
if !tasks.move_back_to(text) { if !tasks.move_back_to(text) {
warn!("Did not find a match in history for \"{text}\""); warn!("Did not find a match in history for \"{text}\"");
continue; continue 'repl;
} }
} }
} }
@ -489,7 +489,7 @@ async fn main() -> Result<()> {
} }
}; };
if !success { if !success {
continue; continue 'repl;
} }
} }
@ -559,9 +559,22 @@ async fn main() -> Result<()> {
tasks.set_state_for(id, right, state); tasks.set_state_for(id, right, state);
break 'block; break 'block;
} }
if let Some(time) = parse_hour(left, 20)
.map(|dt| dt.to_utc())
.or_else(|| parse_date(left)) {
let stamp = time.to_timestamp();
let state = tasks.get_by_id(&id).and_then(Task::state);
tasks.set_state_for(id, right, State::Pending);
tasks.custom_time = Some(stamp);
tasks.set_state_for(id,
&state.as_ref().map(TaskState::get_label).unwrap_or_default(),
state.map(|ts| ts.state).unwrap_or(State::Open));
break 'block;
}
} }
tasks.set_state_for_with(id, arg_default); tasks.set_state_for_with(id, arg_default);
} }
tasks.custom_time = None;
tasks.move_up(); tasks.move_up();
} }
} }
@ -577,7 +590,7 @@ async fn main() -> Result<()> {
if tasks.has_tag_filter() { if tasks.has_tag_filter() {
println!("Use # to remove tag filters and . to remove all filters.") println!("Use # to remove tag filters and . to remove all filters.")
} }
continue; continue 'repl;
} }
} }
@ -599,7 +612,7 @@ async fn main() -> Result<()> {
let (label, mut times) = tasks.times_tracked(); let (label, mut times) = tasks.times_tracked();
println!("{}\n{}", label.italic(), times.join("\n")); println!("{}\n{}", label.italic(), times.join("\n"));
} }
continue; continue 'repl;
} }
Some(')') => { Some(')') => {
@ -612,7 +625,7 @@ async fn main() -> Result<()> {
times.rev().take(15).collect_vec().iter().rev().join("\n")); times.rev().take(15).collect_vec().iter().rev().join("\n"));
} }
// So the error message is not covered up // So the error message is not covered up
continue; continue 'repl;
} }
} }
} }
@ -677,7 +690,7 @@ async fn main() -> Result<()> {
if let Some((url, tasks)) = relays.iter().find(|(key, _)| key.as_ref().is_some_and(|url| url.as_str().starts_with(&command))) { if let Some((url, tasks)) = relays.iter().find(|(key, _)| key.as_ref().is_some_and(|url| url.as_str().starts_with(&command))) {
selected_relay.clone_from(url); selected_relay.clone_from(url);
or_warn!(tasks.print_tasks()); or_warn!(tasks.print_tasks());
continue; continue 'repl;
} }
or_warn!(Url::parse(&command), "Failed to parse url {}", command).map(|url| { or_warn!(Url::parse(&command), "Failed to parse url {}", command).map(|url| {
match tx.try_send(MostrMessage::NewRelay(url.clone())) { match tx.try_send(MostrMessage::NewRelay(url.clone())) {
@ -689,7 +702,7 @@ async fn main() -> Result<()> {
} }
} }
}); });
continue; continue 'repl;
} else if command.contains('\n') { } else if command.contains('\n') {
command.split('\n').for_each(|line| { command.split('\n').for_each(|line| {
if !line.trim().is_empty() { if !line.trim().is_empty() {
@ -703,8 +716,8 @@ async fn main() -> Result<()> {
tasks.custom_time = None; tasks.custom_time = None;
or_warn!(tasks.print_tasks()); or_warn!(tasks.print_tasks());
} }
Err(ReadlineError::Eof) => break, Err(ReadlineError::Eof) => break 'repl,
Err(ReadlineError::Interrupted) => break, // TODO exit if prompt was empty, or clear Err(ReadlineError::Interrupted) => break 'repl, // TODO exit if prompt was empty, or clear
Err(e) => warn!("{}", e), Err(e) => warn!("{}", e),
} }
} }

5
src/tasks.rs
View File

@ -1052,7 +1052,10 @@ impl TasksRelay {
comment, comment,
id, id,
); );
info!("Task status {} set for \"{}\"", TaskState::get_label_for(&state, comment), self.get_task_title(&id)); info!("Task status {} set for \"{}\"{}",
TaskState::get_label_for(&state, comment),
self.get_task_title(&id),
self.custom_time.map(|ts| format!(" at {}", format_timestamp_relative(&ts))).unwrap_or_default());
self.submit(prop) self.submit(prop)
} }