Compare commits
2 commits
fe0b59ef65
...
b26d64646c
Author | SHA1 | Date | |
---|---|---|---|
|
b26d64646c | ||
|
7ecfa6e810 |
3 changed files with 33 additions and 15 deletions
|
@ -417,8 +417,8 @@ async fn main() -> Result<()> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(arg) => {
|
Some(arg) => {
|
||||||
if arg.len() < CHARACTER_THRESHOLD {
|
if arg.trim().len() < 2 {
|
||||||
warn!("Note needs at least {CHARACTER_THRESHOLD} characters!");
|
warn!("Needs at least 2 characters!");
|
||||||
continue 'repl;
|
continue 'repl;
|
||||||
}
|
}
|
||||||
tasks.make_note(arg);
|
tasks.make_note(arg);
|
||||||
|
|
37
src/task.rs
37
src/task.rs
|
@ -135,16 +135,15 @@ impl Task {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn last_state_update(&self) -> Timestamp {
|
pub fn last_state_update(&self) -> Timestamp {
|
||||||
self.state().map(|s| s.time).unwrap_or(self.event.created_at)
|
self.state().map(|s| s.time).unwrap_or(self.event.created_at)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn state(&self) -> Option<TaskState> {
|
pub fn state_at(&self, time: Timestamp) -> Option<TaskState> {
|
||||||
let now = now();
|
|
||||||
// TODO do not iterate constructed state objects
|
// TODO do not iterate constructed state objects
|
||||||
let state = self.states().take_while_inclusive(|ts| ts.time > now);
|
let state = self.states().take_while_inclusive(|ts| ts.time > time);
|
||||||
state.last().map(|ts| {
|
state.last().map(|ts| {
|
||||||
if ts.time <= now {
|
if ts.time <= time {
|
||||||
ts
|
ts
|
||||||
} else {
|
} else {
|
||||||
self.default_state()
|
self.default_state()
|
||||||
|
@ -152,6 +151,12 @@ impl Task {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns the current state if this is a task rather than an activity
|
||||||
|
pub fn state(&self) -> Option<TaskState> {
|
||||||
|
let now = now();
|
||||||
|
self.state_at(now)
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn pure_state(&self) -> State {
|
pub(crate) fn pure_state(&self) -> State {
|
||||||
self.state().map_or(State::Open, |s| s.state)
|
self.state().map_or(State::Open, |s| s.state)
|
||||||
}
|
}
|
||||||
|
@ -232,6 +237,7 @@ impl Task {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
|
||||||
pub(crate) struct TaskState {
|
pub(crate) struct TaskState {
|
||||||
pub(crate) state: State,
|
pub(crate) state: State,
|
||||||
name: Option<String>,
|
name: Option<String>,
|
||||||
|
@ -267,7 +273,7 @@ impl Display for TaskState {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Ord, PartialOrd, Eq)]
|
#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
|
||||||
pub(crate) enum State {
|
pub(crate) enum State {
|
||||||
/// Actionable
|
/// Actionable
|
||||||
Open = 1630,
|
Open = 1630,
|
||||||
|
@ -356,20 +362,33 @@ mod tasks_test {
|
||||||
.sign_with_keys(&keys).unwrap());
|
.sign_with_keys(&keys).unwrap());
|
||||||
assert_eq!(task.pure_state(), State::Open);
|
assert_eq!(task.pure_state(), State::Open);
|
||||||
assert_eq!(task.list_hashtags().count(), 1);
|
assert_eq!(task.list_hashtags().count(), 1);
|
||||||
|
|
||||||
|
let now = Timestamp::now();
|
||||||
task.props.insert(
|
task.props.insert(
|
||||||
EventBuilder::new(State::Done.into(), "")
|
EventBuilder::new(State::Done.into(), "")
|
||||||
|
.custom_created_at(now)
|
||||||
.sign_with_keys(&keys).unwrap());
|
.sign_with_keys(&keys).unwrap());
|
||||||
assert_eq!(task.pure_state(), State::Done);
|
assert_eq!(task.pure_state(), State::Done);
|
||||||
task.props.insert(
|
task.props.insert(
|
||||||
EventBuilder::new(State::Open.into(), "").tags([Tag::hashtag("tag2")])
|
EventBuilder::new(State::Open.into(), "Ready").tags([Tag::hashtag("tag2")])
|
||||||
.custom_created_at(Timestamp::now() - 2)
|
.custom_created_at(now - 2)
|
||||||
.sign_with_keys(&keys).unwrap());
|
.sign_with_keys(&keys).unwrap());
|
||||||
assert_eq!(task.pure_state(), State::Done);
|
assert_eq!(task.pure_state(), State::Done);
|
||||||
assert_eq!(task.list_hashtags().count(), 2);
|
assert_eq!(task.list_hashtags().count(), 2);
|
||||||
task.props.insert(
|
task.props.insert(
|
||||||
EventBuilder::new(State::Closed.into(), "")
|
EventBuilder::new(State::Closed.into(), "")
|
||||||
.custom_created_at(Timestamp::now() + 1)
|
.custom_created_at(now + 9)
|
||||||
.sign_with_keys(&keys).unwrap());
|
.sign_with_keys(&keys).unwrap());
|
||||||
assert_eq!(task.pure_state(), State::Closed);
|
assert_eq!(task.pure_state(), State::Closed);
|
||||||
|
assert_eq!(task.state_at(now), Some(TaskState {
|
||||||
|
state: State::Done,
|
||||||
|
name: None,
|
||||||
|
time: now,
|
||||||
|
}));
|
||||||
|
assert_eq!(task.state_at(now - 1), Some(TaskState {
|
||||||
|
state: State::Open,
|
||||||
|
name: Some("Ready".to_string()),
|
||||||
|
time: now - 2,
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1316,9 +1316,8 @@ impl TasksRelay {
|
||||||
let (name, tags) = extract_tags(note.trim());
|
let (name, tags) = extract_tags(note.trim());
|
||||||
let format = format!("\"{name}\" with tags [{}]", join_tags(&tags));
|
let format = format!("\"{name}\" with tags [{}]", join_tags(&tags));
|
||||||
let mut prop =
|
let mut prop =
|
||||||
EventBuilder::new(Kind::TextNote, name).tags(tags);
|
EventBuilder::new(Kind::TextNote, name)
|
||||||
//.filter(|id| self.get_by_id(id).is_some_and(|t| t.is_task()))
|
.tags(tags);
|
||||||
//.map(|id|
|
|
||||||
let marker =
|
let marker =
|
||||||
if self.get_current_task().is_some_and(|t| t.is_task()) {
|
if self.get_current_task().is_some_and(|t| t.is_task()) {
|
||||||
MARKER_PROPERTY
|
MARKER_PROPERTY
|
||||||
|
|
Loading…
Add table
Reference in a new issue