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

Compare commits

base: janek:6932e1f257213d6ef73f12320911b122690c32af
Branches Tags
janek:main
janek:taskprogress-recursive
..
compare: janek:a2505e94fbcfe8e9004a49d6799cb9aa105b6c30
Branches Tags
janek:main
janek:taskprogress-recursive

No commits in common. "6932e1f257213d6ef73f12320911b122690c32af" and "a2505e94fbcfe8e9004a49d6799cb9aa105b6c30" have entirely different histories.
6932e1f257 ... a2505e94fb

9 changed files with 283 additions and 380 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,4 +3,5 @@
relays relays
keys keys
*.html *.html
*.rs /src/bin
/src/test

97
Cargo.lock generated
View File

@ -154,15 +154,15 @@ dependencies = [
[[package]] [[package]]
name = "async-wsocket" name = "async-wsocket"
version = "0.5.2" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3445f8f330db8e5f3be7912f170f32e43fec90d995c71ced1ec3b8394b4a873c" checksum = "5c38341e6ee670913fb9dc3aba40c22d616261da4dc0928326d3168ebf576fb0"
dependencies = [ dependencies = [
"async-utility", "async-utility",
"futures-util", "futures-util",
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-rustls 0.26.0", "tokio-rustls",
"tokio-socks", "tokio-socks",
"tokio-tungstenite", "tokio-tungstenite",
"url", "url",
@ -183,9 +183,9 @@ dependencies = [
[[package]] [[package]]
name = "atomic-destructor" name = "atomic-destructor"
version = "0.2.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d919cb60ba95c87ba42777e9e246c4e8d658057299b437b7512531ce0a09a23" checksum = "4653a42bf04120a1d4e92452e006b4e3af4ab4afff8fb4af0f1bbb98418adf3e"
dependencies = [ dependencies = [
"tracing", "tracing",
] ]
@ -755,10 +755,10 @@ dependencies = [
"http", "http",
"hyper", "hyper",
"hyper-util", "hyper-util",
"rustls 0.22.4", "rustls",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls 0.25.0", "tokio-rustls",
"tower-service", "tower-service",
] ]
@ -977,9 +977,9 @@ checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe"
[[package]] [[package]]
name = "nostr" name = "nostr"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f08db214560a34bf7c4c1fea09a8461b9412bae58ba06e99ce3177d89fa1e0a6" checksum = "a27223888faca0c4ba9b97c2b7dc776e9a33d5f54e3558887471cf17798b5fbf"
dependencies = [ dependencies = [
"aes", "aes",
"base64 0.21.7", "base64 0.21.7",
@ -1007,9 +1007,9 @@ dependencies = [
[[package]] [[package]]
name = "nostr-database" name = "nostr-database"
version = "0.33.1" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50eebf5020d70891e3c229128de5fc73af632b651d02742383b314d3d0c7e953" checksum = "f726b8c0904a838f64b51a931a1bf39e341f5584a5e04f06310fbfb847e2e924"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lru", "lru",
@ -1021,9 +1021,9 @@ dependencies = [
[[package]] [[package]]
name = "nostr-relay-pool" name = "nostr-relay-pool"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa5502a3df456790ca16d90cc688a677117d57ab56b079dcfa091390ac9f202" checksum = "52f0ccf9e81aa747abdfa130007651248b37c3699d37029bad701e68902257ce"
dependencies = [ dependencies = [
"async-utility", "async-utility",
"async-wsocket", "async-wsocket",
@ -1037,12 +1037,11 @@ dependencies = [
[[package]] [[package]]
name = "nostr-sdk" name = "nostr-sdk"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b427dceefbbb49a9dd98abb8c4e40d25fdd467e99821aaad88615252bdb915bd" checksum = "d1ffedac7ab488e0dfea52804d0c43fafc7e3eefc62d97726d3927a1390db05b"
dependencies = [ dependencies = [
"async-utility", "async-utility",
"atomic-destructor",
"lnurl-pay", "lnurl-pay",
"nostr", "nostr",
"nostr-database", "nostr-database",
@ -1057,9 +1056,9 @@ dependencies = [
[[package]] [[package]]
name = "nostr-signer" name = "nostr-signer"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "665268b316f41cd8fa791be54b6c7935c5a239461708c380a699d6677be9af38" checksum = "22e568670664cf5cc14a794ae32dfc04bde385d63ff0f5b1c3745dd3ea69f73a"
dependencies = [ dependencies = [
"async-utility", "async-utility",
"nostr", "nostr",
@ -1071,9 +1070,9 @@ dependencies = [
[[package]] [[package]]
name = "nostr-zapper" name = "nostr-zapper"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69922e74f8eab1f9d287008c0c06acdec87277a2d8f44bd9d38e003422aea0ab" checksum = "420a7c6458d5c1dc502b3d36fb9f8598837743a737b84adb4ef8ea36b98c5e07"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"nostr", "nostr",
@ -1101,9 +1100,9 @@ dependencies = [
[[package]] [[package]]
name = "nwc" name = "nwc"
version = "0.33.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2e04b3edb5e9572e95b62842430625f1718e8a4a3596a30aeb04e6734764ea" checksum = "e236611ea96d3545138f7b2152f2e4571e3c93436ddc91d1c458f366e5c6430f"
dependencies = [ dependencies = [
"async-utility", "async-utility",
"nostr", "nostr",
@ -1320,7 +1319,7 @@ dependencies = [
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"rustls 0.22.4", "rustls",
"rustls-pemfile", "rustls-pemfile",
"rustls-pki-types", "rustls-pki-types",
"serde", "serde",
@ -1328,7 +1327,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper",
"tokio", "tokio",
"tokio-rustls 0.25.0", "tokio-rustls",
"tokio-socks", "tokio-socks",
"tower-service", "tower-service",
"url", "url",
@ -1383,20 +1382,6 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "rustls"
version = "0.23.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b"
dependencies = [
"once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
"subtle",
"zeroize",
]
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "2.1.2" version = "2.1.2"
@ -1474,9 +1459,9 @@ dependencies = [
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.23" version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
[[package]] [[package]]
name = "send_wrapper" name = "send_wrapper"
@ -1673,18 +1658,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [ dependencies = [
"rustls 0.22.4", "rustls",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls 0.23.7",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
] ]
@ -1703,16 +1677,16 @@ dependencies = [
[[package]] [[package]]
name = "tokio-tungstenite" name = "tokio-tungstenite"
version = "0.23.1" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"log", "log",
"rustls 0.23.7", "rustls",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls 0.26.0", "tokio-rustls",
"tungstenite", "tungstenite",
"webpki-roots", "webpki-roots",
] ]
@ -1785,9 +1759,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "tungstenite" name = "tungstenite"
version = "0.23.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"bytes", "bytes",
@ -1796,10 +1770,11 @@ dependencies = [
"httparse", "httparse",
"log", "log",
"rand", "rand",
"rustls 0.23.7", "rustls",
"rustls-pki-types", "rustls-pki-types",
"sha1", "sha1",
"thiserror", "thiserror",
"url",
"utf-8", "utf-8",
] ]
@ -1959,9 +1934,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]] [[package]]
name = "wasm-ws" name = "wasm-ws"
version = "0.2.1" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "688c5806d1b06b4f3d90d015e23364dc5d3af412ee64abba6dde8fdc01637e33" checksum = "f5b3a482e27ff54809c0848629d9033179705c5ea2f58e26cf45dc77c34c4984"
dependencies = [ dependencies = [
"async_io_stream", "async_io_stream",
"futures", "futures",

2
Cargo.toml
View File

@ -18,6 +18,6 @@ log = "0.4.21"
chrono = "0.4.38" chrono = "0.4.38"
colog = "1.3.0" colog = "1.3.0"
colored = "2.1.0" colored = "2.1.0"
nostr-sdk = "0.33" nostr-sdk = "0.30"
tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] } tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
once_cell = "1.19.0" once_cell = "1.19.0"

2
README.md
View File

@ -99,7 +99,7 @@ when the application is terminated regularly.
Dots can be repeated to move to parent tasks. Dots can be repeated to move to parent tasks.
- `:[IND][COL]` - add property column COL at IND or end, if it already exists remove property column COL or IND (1-indexed) - `:[IND][COL]` - add property column COL at IND or end, if it already exists remove property column COL or IND
- `*[TIME]` - add timetracking with the specified offset - `*[TIME]` - add timetracking with the specified offset
- `>[TEXT]` - complete active task and move to parent, with optional state description - `>[TEXT]` - complete active task and move to parent, with optional state description
- `<[TEXT]` - close active task and move to parent, with optional state description - `<[TEXT]` - close active task and move to parent, with optional state description

28
src/helpers.rs
View File

@ -1,28 +0,0 @@
use std::fmt::Display;
use std::io::{stdin, stdout, Write};
use log::{debug, error, info, trace, warn};
pub fn some_non_empty(str: &str) -> Option<String> {
if str.is_empty() { None } else { Some(str.to_owned()) }
}
pub fn or_print<T, U: Display>(result: Result<T, U>) -> Option<T> {
match result {
Ok(value) => Some(value),
Err(error) => {
warn!("{}", error);
None
}
}
}
pub fn prompt(prompt: &str) -> Option<String> {
print!("{} ", prompt);
stdout().flush().unwrap();
match stdin().lines().next() {
Some(Ok(line)) => Some(line),
_ => None,
}
}

38
src/kinds.rs
View File

@ -1,14 +1,12 @@
use itertools::Itertools; use itertools::Itertools;
use log::info; use log::info;
use nostr_sdk::{Alphabet, EventBuilder, EventId, Kind, Tag, TagStandard}; use nostr_sdk::{Alphabet, EventBuilder, EventId, GenericTagValue, Kind, Tag};
pub const TASK_KIND: u16 = 1621; pub const TASK_KIND: u64 = 1621;
pub const TRACKING_KIND: u16 = 1650; pub const TRACKING_KIND: u64 = 1650;
pub(crate) fn build_tracking<I>(id: I) -> EventBuilder pub(crate) fn build_tracking<I>(id: I) -> EventBuilder
where where I: IntoIterator<Item=EventId> {
I: IntoIterator<Item=EventId>,
{
EventBuilder::new( EventBuilder::new(
Kind::from(TRACKING_KIND), Kind::from(TRACKING_KIND),
"", "",
@ -22,21 +20,19 @@ pub(crate) fn build_task(name: &str, tags: Vec<Tag>) -> EventBuilder {
} }
fn format_tag(tag: &Tag) -> String { fn format_tag(tag: &Tag) -> String {
match tag.as_standardized() { tag.content().map(|c| {
Some(TagStandard::Event { match c {
event_id, GenericTagValue::PublicKey(key) => format!("Key: {}", key.to_string()[..8].to_string()),
.. GenericTagValue::EventId(id) => format!("Parent: {}", id.to_string()[..8].to_string()),
}) => format!("Parent: {}", event_id.to_string()[..8].to_string()), GenericTagValue::String(str) => {
Some(TagStandard::PublicKey { if is_hashtag(tag) {
public_key, format!("#{str}")
.. } else {
}) => format!("Key: {}", public_key.to_string()[..8].to_string()), str
Some(TagStandard::Hashtag(content)) => format!("#{content}"), }
_ => tag.content().map_or_else( }
|| format!("Kind {}", tag.kind()), }
|content| content.to_string() }).unwrap_or_else(|| format!("Kind {}", tag.kind()))
)
}
} }
pub(crate) fn is_hashtag(tag: &Tag) -> bool { pub(crate) fn is_hashtag(tag: &Tag) -> bool {

75
src/main.rs
View File

@ -16,12 +16,10 @@ use log::{debug, error, info, trace, warn};
use nostr_sdk::prelude::*; use nostr_sdk::prelude::*;
use xdg::BaseDirectories; use xdg::BaseDirectories;
use crate::helpers::*;
use crate::kinds::TRACKING_KIND; use crate::kinds::TRACKING_KIND;
use crate::task::State; use crate::task::State;
use crate::tasks::Tasks; use crate::tasks::Tasks;
mod helpers;
mod task; mod task;
mod tasks; mod tasks;
mod kinds; mod kinds;
@ -37,20 +35,22 @@ struct EventSender {
impl EventSender { impl EventSender {
fn submit(&self, event_builder: EventBuilder) -> Result<Event> { fn submit(&self, event_builder: EventBuilder) -> Result<Event> {
{ {
// Always flush if oldest event older than a minute or newer than now // Flush if oldest event older than a minute
let borrow = self.queue.borrow(); let borrow = self.queue.borrow();
let min = Timestamp::now().sub(60u64); if let Some(event) = borrow.first() {
if borrow.iter().any(|e| e.created_at < min || e.created_at > Timestamp::now()) { let old = event.created_at < Timestamp::now().sub(60u64);
drop(borrow); drop(borrow);
debug!("Flushing event queue because it is older than a minute"); if old {
self.force_flush(); debug!("Flushing event queue because it is older than a minute");
self.force_flush();
}
} }
} }
let mut queue = self.queue.borrow_mut(); let mut queue = self.queue.borrow_mut();
Ok(event_builder.to_event(&self.keys).inspect(|event| { Ok(event_builder.to_event(&self.keys).inspect(|event| {
if event.kind.as_u16() == TRACKING_KIND { if event.kind.as_u64() == TRACKING_KIND {
queue.retain(|e| { queue.retain(|e| {
e.kind.as_u16() != TRACKING_KIND e.kind.as_u64() != TRACKING_KIND
}); });
} }
queue.push(event.clone()); queue.push(event.clone());
@ -63,7 +63,7 @@ impl EventSender {
} }
/// Sends all pending events if there is a non-tracking event /// Sends all pending events if there is a non-tracking event
fn flush(&self) { fn flush(&self) {
if self.queue.borrow().iter().any(|event| event.kind.as_u16() != TRACKING_KIND) { if self.queue.borrow().iter().any(|event| event.kind.as_u64() != TRACKING_KIND) {
self.force_flush() self.force_flush()
} }
} }
@ -81,6 +81,25 @@ impl Drop for EventSender {
} }
} }
fn or_print<T, U: Display>(result: Result<T, U>) -> Option<T> {
match result {
Ok(value) => Some(value),
Err(error) => {
warn!("{}", error);
None
}
}
}
fn prompt(prompt: &str) -> Option<String> {
print!("{} ", prompt);
stdout().flush().unwrap();
match stdin().lines().next() {
Some(Ok(line)) => Some(line),
_ => None,
}
}
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
colog::init(); colog::init();
@ -168,8 +187,8 @@ async fn main() {
queue: Default::default(), queue: Default::default(),
}); });
let sub_id = client.subscribe(vec![Filter::new()], None).await; let sub_id: SubscriptionId = client.subscribe(vec![Filter::new()], None).await;
info!("Subscribed with {:?}", sub_id); info!("Subscribed with {}", sub_id);
let mut notifications = client.notifications(); let mut notifications = client.notifications();
/*println!("Finding existing events"); /*println!("Finding existing events");
@ -252,14 +271,18 @@ async fn main() {
Some(':') => match iter.next().and_then(|s| s.to_digit(10)) { Some(':') => match iter.next().and_then(|s| s.to_digit(10)) {
Some(digit) => { Some(digit) => {
let index = (digit as usize).saturating_sub(1); let index = digit as usize;
let remaining = iter.collect::<String>().trim().to_string(); let remaining = iter.collect::<String>().trim().to_string();
if remaining.is_empty() { if remaining.is_empty() {
tasks.remove_column(index); tasks.properties.remove(index);
continue; continue;
} }
let value = input[2..].trim().to_string(); let value = input[2..].trim().to_string();
tasks.add_or_remove_property_column_at_index(value, index); if tasks.properties.get(index) == Some(&value) {
tasks.properties.remove(index);
} else {
tasks.properties.insert(index, value);
}
} }
None => { None => {
if arg.is_empty() { if arg.is_empty() {
@ -280,7 +303,15 @@ async fn main() {
- `subtasks` - how many direct subtasks are complete"); - `subtasks` - how many direct subtasks are complete");
continue; continue;
} }
tasks.add_or_remove_property_column(arg); let pos = tasks.properties.iter().position(|s| s == arg);
match pos {
None => {
tasks.properties.push(arg.to_string());
}
Some(i) => {
tasks.properties.remove(i);
}
}
} }
}, },
@ -301,7 +332,7 @@ async fn main() {
} }
Some('?') => { Some('?') => {
tasks.set_state_filter(some_non_empty(arg).filter(|s| !s.is_empty())); tasks.set_state_filter(Some(arg.to_string()).filter(|s| !s.is_empty()));
} }
Some('!') => match tasks.get_position() { Some('!') => match tasks.get_position() {
@ -319,17 +350,15 @@ async fn main() {
Some('#') | Some('+') => { Some('#') | Some('+') => {
tasks.add_tag(arg.to_string()); tasks.add_tag(arg.to_string());
info!("Added tag filter for #{arg}")
} }
Some('-') => { Some('-') => {
tasks.remove_tag(arg.to_string()); tasks.remove_tag(arg.to_string());
info!("Removed tag filter for #{arg}")
} }
Some('*') => { Some('*') => {
if let Ok(num) = arg.parse::<i64>() { if let Ok(num) = arg.parse::<i64>() {
tasks.track_at(Timestamp::from(Timestamp::now().as_u64().saturating_add_signed(num))); tasks.track_at(Timestamp::now() + num);
} else if let Ok(date) = DateTime::parse_from_rfc3339(arg) { } else if let Ok(date) = DateTime::parse_from_rfc3339(arg) {
tasks.track_at(Timestamp::from(date.to_utc().timestamp() as u64)); tasks.track_at(Timestamp::from(date.to_utc().timestamp() as u64));
} else { } else {
@ -351,7 +380,7 @@ async fn main() {
} }
if let Ok(depth) = slice.parse::<i8>() { if let Ok(depth) = slice.parse::<i8>() {
tasks.move_to(pos); tasks.move_to(pos);
tasks.set_depth(depth); tasks.depth = depth;
} else { } else {
tasks.filter_or_create(slice).map(|id| tasks.move_to(Some(id))); tasks.filter_or_create(slice).map(|id| tasks.move_to(Some(id)));
} }
@ -371,7 +400,7 @@ async fn main() {
} }
if let Ok(depth) = slice.parse::<i8>() { if let Ok(depth) = slice.parse::<i8>() {
tasks.move_to(pos); tasks.move_to(pos);
tasks.set_depth(depth); tasks.depth = depth;
} else { } else {
let filtered = tasks let filtered = tasks
.children_of(pos) .children_of(pos)
@ -409,7 +438,7 @@ async fn main() {
fn print_event(event: &Event) { fn print_event(event: &Event) {
debug!( debug!(
"At {} found {} kind {} \"{}\" {:?}", "At {} found {} kind {} '{}' {:?}",
event.created_at, event.id, event.kind, event.content, event.tags event.created_at, event.id, event.kind, event.content, event.tags
); );
} }

19
src/task.rs
View File

@ -6,9 +6,8 @@ use std::ops::Div;
use itertools::Either::{Left, Right}; use itertools::Either::{Left, Right};
use itertools::Itertools; use itertools::Itertools;
use log::{debug, error, info, trace, warn}; use log::{debug, error, info, trace, warn};
use nostr_sdk::{Alphabet, Event, EventBuilder, EventId, Kind, Tag, TagStandard, Timestamp}; use nostr_sdk::{Alphabet, Event, EventBuilder, EventId, Kind, Tag, Timestamp};
use crate::helpers::some_non_empty;
use crate::kinds::is_hashtag; use crate::kinds::is_hashtag;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -23,8 +22,8 @@ pub(crate) struct Task {
impl Task { impl Task {
pub(crate) fn new(event: Event) -> Task { pub(crate) fn new(event: Event) -> Task {
let (parents, tags) = event.tags.iter().partition_map(|tag| match tag.as_standardized() { let (parents, tags) = event.tags.iter().partition_map(|tag| match tag {
Some(TagStandard::Event { event_id, .. }) => return Left(event_id), Tag::Event { event_id, .. } => return Left(event_id),
_ => Right(tag.clone()), _ => Right(tag.clone()),
}); });
Task { Task {
@ -63,7 +62,7 @@ impl Task {
fn states(&self) -> impl Iterator<Item=TaskState> + '_ { fn states(&self) -> impl Iterator<Item=TaskState> + '_ {
self.props.iter().filter_map(|event| { self.props.iter().filter_map(|event| {
event.kind.try_into().ok().map(|s| TaskState { event.kind.try_into().ok().map(|s| TaskState {
name: some_non_empty(&event.content), name: Some(event.content.clone()).filter(|c| !c.is_empty()),
state: s, state: s,
time: event.created_at.clone(), time: event.created_at.clone(),
}) })
@ -118,7 +117,7 @@ impl Task {
"{:?}", "{:?}",
self.props self.props
.iter() .iter()
.map(|e| format!("{} kind {} \"{}\"", e.created_at, e.kind, e.content)) .map(|e| format!("{} kind {} '{}'", e.created_at, e.kind, e.content))
.collect::<Vec<String>>() .collect::<Vec<String>>()
)), )),
"descriptions" => Some(format!( "descriptions" => Some(format!(
@ -139,14 +138,12 @@ pub(crate) struct TaskState {
pub(crate) time: Timestamp, pub(crate) time: Timestamp,
} }
impl TaskState { impl TaskState {
pub(crate) fn get_label_for(state: &State, comment: &str) -> String {
some_non_empty(comment).unwrap_or_else(|| state.to_string())
}
pub(crate) fn get_label(&self) -> String { pub(crate) fn get_label(&self) -> String {
self.name.clone().unwrap_or_else(|| self.state.to_string()) self.name.clone().unwrap_or_else(|| self.state.to_string())
} }
pub(crate) fn matches_label(&self, label: &str) -> bool { pub(crate) fn matches_label(&self, label: &str) -> bool {
self.name.as_ref().is_some_and(|n| n.eq_ignore_ascii_case(label)) self.state == State::Active
|| self.name.as_ref().is_some_and(|n| n.eq_ignore_ascii_case(label))
|| self.state.to_string().eq_ignore_ascii_case(label) || self.state.to_string().eq_ignore_ascii_case(label)
} }
} }
@ -193,7 +190,7 @@ impl State {
} }
} }
pub(crate) fn kind(&self) -> u16 { pub(crate) fn kind(&self) -> u64 {
match self { match self {
State::Open => 1630, State::Open => 1630,
State::Done => 1631, State::Done => 1631,

409
src/tasks.rs
View File

@ -8,12 +8,12 @@ use chrono::LocalResult::Single;
use colored::Colorize; use colored::Colorize;
use itertools::Itertools; use itertools::Itertools;
use log::{debug, error, info, trace, warn}; use log::{debug, error, info, trace, warn};
use nostr_sdk::{Event, EventBuilder, EventId, Kind, PublicKey, Tag, TagStandard, Timestamp}; use nostr_sdk::{Event, EventBuilder, EventId, GenericTagValue, Kind, PublicKey, Tag, Timestamp};
use TagStandard::Hashtag; use nostr_sdk::Tag::Hashtag;
use crate::EventSender; use crate::EventSender;
use crate::kinds::*; use crate::kinds::*;
use crate::task::{State, Task, TaskState}; use crate::task::{State, Task};
type TaskMap = HashMap<EventId, Task>; type TaskMap = HashMap<EventId, Task>;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -23,11 +23,11 @@ pub(crate) struct Tasks {
/// History of active tasks by PubKey /// History of active tasks by PubKey
history: HashMap<PublicKey, BTreeSet<Event>>, history: HashMap<PublicKey, BTreeSet<Event>>,
/// The task properties currently visible /// The task properties currently visible
properties: Vec<String>, pub(crate) properties: Vec<String>,
/// Negative: Only Leaf nodes /// Negative: Only Leaf nodes
/// Zero: Only Active node /// Zero: Only Active node
/// Positive: Go down the respective level /// Positive: Go down the respective level
depth: i8, pub(crate) depth: i8,
/// Currently active task /// Currently active task
position: Option<EventId>, position: Option<EventId>,
@ -62,7 +62,9 @@ impl Tasks {
sender, sender,
} }
} }
}
impl Tasks {
// Accessors // Accessors
#[inline] #[inline]
@ -94,8 +96,26 @@ impl Tasks {
} }
/// Total time tracked on this task by the current user. /// Total time tracked on this task by the current user.
pub(crate) fn time_tracked(&self, id: EventId) -> u64 { pub(crate) fn time_tracked(&self, id: &EventId) -> u64 {
Self::time_tracked_for(self.history.get(&self.sender.pubkey()).into_iter().flatten(), &vec![id]) 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. /// Total time tracked on this task and its subtasks by all users.
@ -105,33 +125,23 @@ impl Tasks {
let children = self.get_subtasks(id); let children = self.get_subtasks(id);
for user in self.history.values() { for user in self.history.values() {
total += Self::time_tracked_for(user, &children); let mut start: Option<Timestamp> = None;
} for event in user {
total match event.tags.first() {
} Some(Tag::Event {
event_id,
fn time_tracked_for<'a, E>(events: E, ids: &Vec<EventId>) -> u64 ..
where }) if children.contains(event_id) => {
E: IntoIterator<Item=&'a Event>, start = start.or(Some(event.created_at))
{ }
let mut total = 0; _ => if let Some(stamp) = start {
let mut start: Option<Timestamp> = None; total += (event.created_at - stamp).as_u64();
for event in events { }
match event.tags.first().and_then(|tag| tag.as_standardized()) {
Some(TagStandard::Event {
event_id,
..
}) if ids.contains(event_id) => {
start = start.or(Some(event.created_at))
}
_ => if let Some(stamp) = start {
total += (event.created_at - stamp).as_u64();
start = None;
} }
} }
} if let Some(start) = start {
if let Some(start) = start { total += (Timestamp::now() - start).as_u64();
total += (Timestamp::now() - start).as_u64(); }
} }
total total
} }
@ -181,7 +191,7 @@ impl Tasks {
.unwrap_or(String::new()) .unwrap_or(String::new())
} }
fn traverse_up_from(&self, id: Option<EventId>) -> ParentIterator { pub(crate) fn traverse_up_from(&self, id: Option<EventId>) -> ParentIterator {
ParentIterator { ParentIterator {
tasks: &self.tasks, tasks: &self.tasks,
current: id, current: id,
@ -236,7 +246,7 @@ impl Tasks {
pub(crate) fn referenced_tasks<F: Fn(&mut Task)>(&mut self, event: &Event, f: F) { pub(crate) fn referenced_tasks<F: Fn(&mut Task)>(&mut self, event: &Event, f: F) {
for tag in event.tags.iter() { for tag in event.tags.iter() {
if let Some(TagStandard::Event { event_id, .. }) = tag.as_standardized() { if let Tag::Event { event_id, .. } = tag {
self.tasks.get_mut(event_id).map(|t| f(t)); self.tasks.get_mut(event_id).map(|t| f(t));
} }
} }
@ -291,7 +301,7 @@ impl Tasks {
lock, lock,
"{} since {} (total tracked time {}m)", "{} since {} (total tracked time {}m)",
state.get_label(), state.get_label(),
match Local.timestamp_opt(state.time.as_u64() as i64, 0) { match Local.timestamp_opt(state.time.as_i64(), 0) {
Single(time) => { Single(time) => {
let date = time.date_naive(); let date = time.date_naive();
let prefix = match Local::now() let prefix = match Local::now()
@ -308,7 +318,7 @@ impl Tasks {
} }
_ => state.time.to_human_datetime(), _ => state.time.to_human_datetime(),
}, },
self.time_tracked(*t.get_id()) / 60 self.time_tracked(t.get_id()) / 60
)?; )?;
writeln!(lock, "{}", t.descriptions().join("\n"))?; writeln!(lock, "{}", t.descriptions().join("\n"))?;
} }
@ -342,7 +352,7 @@ impl Tasks {
.map_or(String::new(), |p| format!("{:2.0}%", p * 100.0)), .map_or(String::new(), |p| format!("{:2.0}%", p * 100.0)),
"path" => self.get_task_path(Some(task.event.id)), "path" => self.get_task_path(Some(task.event.id)),
"rpath" => self.relative_path(task.event.id), "rpath" => self.relative_path(task.event.id),
"time" => display_time("MMMm", self.time_tracked(*task.get_id())), "time" => display_time("MMMm", self.time_tracked(task.get_id())),
"rtime" => display_time("HH:MMm", self.total_time_tracked(*task.get_id())), "rtime" => display_time("HH:MMm", self.total_time_tracked(*task.get_id())),
prop => task.get(prop).unwrap_or(String::new()), prop => task.get(prop).unwrap_or(String::new()),
}) })
@ -362,7 +372,7 @@ impl Tasks {
pub(crate) fn add_tag(&mut self, tag: String) { pub(crate) fn add_tag(&mut self, tag: String) {
self.view.clear(); self.view.clear();
self.tags.insert(Hashtag(tag).into()); self.tags.insert(Hashtag(tag));
} }
pub(crate) fn remove_tag(&mut self, tag: String) { pub(crate) fn remove_tag(&mut self, tag: String) {
@ -395,7 +405,7 @@ impl Tasks {
for task in tasks { for task in tasks {
let lowercase = task.event.content.to_ascii_lowercase(); let lowercase = task.event.content.to_ascii_lowercase();
if lowercase == lowercase_arg { if lowercase == lowercase_arg {
return vec![task.event.id]; return vec![task.event.id]
} else if task.event.content.starts_with(arg) { } else if task.event.content.starts_with(arg) {
filtered.push(task.event.id) filtered.push(task.event.id)
} else if lowercase.starts_with(&lowercase_arg) { } else if lowercase.starts_with(&lowercase_arg) {
@ -403,9 +413,9 @@ impl Tasks {
} }
} }
if filtered.len() == 0 { if filtered.len() == 0 {
return filtered_more; return filtered_more
} }
return filtered; return filtered
} }
/// Finds out what to do with the given string. /// Finds out what to do with the given string.
@ -440,7 +450,7 @@ impl Tasks {
} }
self.submit(build_tracking(id)); self.submit(build_tracking(id));
if !id.and_then(|id| self.tasks.get(&id)).is_some_and(|t| t.parent_id() == self.position.as_ref()) { if !id.and_then(|id| self.tasks.get(&id)).is_some_and(|t| t.parent_id() == self.position.as_ref()) {
debug!("Flushing Tasks because of move beyond child"); debug!("Flushing Tasks because of move");
self.flush(); self.flush();
} }
self.position = id; self.position = id;
@ -459,7 +469,7 @@ impl Tasks {
&mut s &mut s
.1 .1
.split_ascii_whitespace() .split_ascii_whitespace()
.map(|t| Hashtag(t.to_string()).into()) .map(|t| Hashtag(t.to_string()))
.collect(), .collect(),
); );
build_task(s.0, tags) build_task(s.0, tags)
@ -485,26 +495,16 @@ impl Tasks {
) )
} }
fn get_task_title(&self, id: &EventId) -> String { fn get_task_title(&self, id: &EventId) -> String {
self.tasks.get(id).map_or(id.to_string(), |t| t.get_title()) self.tasks.get(id).map_or(id.to_string(), |t| t.get_title())
} }
pub(crate) fn track_at(&mut self, time: Timestamp) -> EventId { pub(crate) fn track_at(&mut self, time: Timestamp) -> EventId {
info!("Tracking \"{:?}\" from {}", self.position.map(|id| self.get_task_title(&id)), time.to_human_datetime()); info!("Tracking \"{:?}\" from {}", self.position.map(|id| self.get_task_title(&id)), time.to_human_datetime());
let pos = self.get_position(); self.submit(
let tracking = build_tracking(pos); build_tracking(self.get_position())
self.get_own_history().map(|events| { .custom_created_at(time)
if let Some(event) = events.pop_last() { )
if event.kind.as_u16() == TRACKING_KIND &&
(pos == None && event.tags.is_empty()) ||
event.tags.iter().all(|t| t.content().map(|str| str.to_string()) == pos.map(|id| id.to_string())) {
// Replace last for easier calculation
} else {
events.insert(event);
}
}
});
self.submit(tracking.custom_created_at(time))
} }
fn submit(&mut self, builder: EventBuilder) -> EventId { fn submit(&mut self, builder: EventBuilder) -> EventId {
@ -515,7 +515,7 @@ impl Tasks {
} }
pub(crate) fn add(&mut self, event: Event) { pub(crate) fn add(&mut self, event: Event) {
match event.kind.as_u16() { match event.kind.as_u64() {
TASK_KIND => self.add_task(event), TASK_KIND => self.add_task(event),
TRACKING_KIND => TRACKING_KIND =>
match self.history.get_mut(&event.pubkey) { match self.history.get_mut(&event.pubkey) {
@ -531,7 +531,7 @@ impl Tasks {
t.children.insert(event.id); t.children.insert(event.id);
}); });
if self.tasks.contains_key(&event.id) { if self.tasks.contains_key(&event.id) {
warn!("Did not insert duplicate event {}", event.id); debug!("Did not insert duplicate event {}", event.id);
} else { } else {
self.tasks.insert(event.id, Task::new(event)); self.tasks.insert(event.id, Task::new(event));
} }
@ -543,17 +543,10 @@ impl Tasks {
}); });
} }
fn get_own_history(&mut self) -> Option<&mut BTreeSet<Event>> {
self.history.get_mut(&self.sender.pubkey())
}
pub(crate) fn undo(&mut self) { pub(crate) fn undo(&mut self) {
let mut count = 0;
self.sender.clear().into_iter().rev().for_each(|event| { self.sender.clear().into_iter().rev().for_each(|event| {
count += 1;
self.remove(&event) self.remove(&event)
}); });
info!("Reverted last {count} actions!")
} }
fn remove(&mut self, event: &Event) { fn remove(&mut self, event: &Event) {
@ -563,7 +556,7 @@ impl Tasks {
} }
} }
self.tasks.remove(&event.id); self.tasks.remove(&event.id);
self.get_own_history().map(|t| t.remove(event)); self.history.get_mut(&self.sender.pubkey()).map(|t| t.remove(event));
self.referenced_tasks(event, |t| { t.props.remove(event); }); self.referenced_tasks(event, |t| { t.props.remove(event); });
} }
@ -573,7 +566,6 @@ impl Tasks {
comment, comment,
id, id,
); );
info!("Task status {} set for \"{}\"", TaskState::get_label_for(&state, comment), self.get_task_title(&id));
self.submit(prop) self.submit(prop)
} }
@ -584,47 +576,13 @@ impl Tasks {
pub(crate) fn make_note(&mut self, note: &str) { pub(crate) fn make_note(&mut self, note: &str) {
match self.position { match self.position {
None => warn!("Cannot add note \"{}\" without active task", note), None => warn!("Cannot add note '{}' without active task", note),
Some(id) => { Some(id) => {
let prop = self.build_prop(Kind::TextNote, note, id); let prop = self.build_prop(Kind::TextNote, note, id);
self.submit(prop); self.submit(prop);
} }
} }
} }
// Properties
pub(crate) fn set_depth(&mut self, depth: i8) {
self.depth = depth;
info!("Changed view depth to {depth}");
}
pub(crate) fn remove_column(&mut self, index: usize) {
let col = self.properties.remove(index);
info!("Removed property column \"{col}\"");
}
pub(crate) fn add_or_remove_property_column(&mut self, property: &str) {
match self.properties.iter().position(|s| s == property) {
None => {
self.properties.push(property.to_string());
info!("Added property column \"{property}\"");
}
Some(index) => {
self.properties.remove(index);
}
}
}
pub(crate) fn add_or_remove_property_column_at_index(&mut self, property: String, index: usize) {
if self.properties.get(index) == Some(&property) {
self.properties.remove(index);
} else {
info!("Added property column \"{property}\" at position {}", index + 1);
self.properties.insert(index, property);
}
}
} }
/// Formats the given seconds according to the given format. /// Formats the given seconds according to the given format.
@ -638,7 +596,7 @@ fn display_time(format: &str, secs: u64) -> String {
.map_or(String::new(), |mins| format .map_or(String::new(), |mins| format
.replace("MMM", &format!("{:3}", mins)) .replace("MMM", &format!("{:3}", mins))
.replace("HH", &format!("{:02}", mins.div(60))) .replace("HH", &format!("{:02}", mins.div(60)))
.replace("MM", &format!("{:02}", mins.rem(60))), .replace("MM", &format!("{:02}", mins.rem(60)))
) )
} }
@ -683,136 +641,111 @@ impl<'a> Iterator for ParentIterator<'a> {
} }
} }
#[cfg(test)] fn stub_tasks() -> Tasks {
mod tasks_test { use std::sync::mpsc;
use super::*; use nostr_sdk::Keys;
fn stub_tasks() -> Tasks { let (tx, _rx) = mpsc::channel();
use std::sync::mpsc; Tasks::from(EventSender {
use nostr_sdk::Keys; tx,
keys: Keys::generate(),
let (tx, _rx) = mpsc::channel(); queue: Default::default(),
Tasks::from(EventSender { })
tx, }
keys: Keys::generate(),
queue: Default::default(), #[test]
}) fn test_depth() {
} let mut tasks = stub_tasks();
#[test] let t1 = tasks.make_task("t1");
fn test_tracking() { let task1 = tasks.get_by_id(&t1).unwrap();
let mut tasks = stub_tasks(); assert_eq!(tasks.depth, 1);
assert_eq!(task1.pure_state(), State::Open);
//let task = tasks.make_task("task"); debug!("{:?}", tasks);
tasks.track_at(Timestamp::from(0)); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.history.len(), 1); tasks.depth = 0;
let zero = EventId::all_zeros(); assert_eq!(tasks.current_tasks().len(), 0);
tasks.move_to(Some(zero)); tasks.move_to(Some(t1));
let now: Timestamp = Timestamp::now() - 2u64; tasks.depth = 2;
tasks.track_at(Timestamp::from(1)); assert_eq!(tasks.current_tasks().len(), 0);
assert!(tasks.time_tracked(zero) > now.as_u64()); let t2 = tasks.make_task("t2");
assert_eq!(tasks.current_tasks().len(), 1);
tasks.move_to(None); assert_eq!(tasks.get_task_path(Some(t2)), "t1>t2");
tasks.track_at(Timestamp::from(2)); assert_eq!(tasks.relative_path(t2), "t2");
assert_eq!(tasks.get_own_history().unwrap().len(), 3); let t3 = tasks.make_task("t3");
assert_eq!(tasks.time_tracked(zero), 1); assert_eq!(tasks.current_tasks().len(), 2);
}
tasks.move_to(Some(t2));
#[test] assert_eq!(tasks.current_tasks().len(), 0);
fn test_depth() { let t4 = tasks.make_task("t4");
let mut tasks = stub_tasks(); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.get_task_path(Some(t4)), "t1>t2>t4");
let t1 = tasks.make_task("t1"); assert_eq!(tasks.relative_path(t4), "t4");
let task1 = tasks.get_by_id(&t1).unwrap(); tasks.depth = 2;
assert_eq!(tasks.depth, 1); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(task1.pure_state(), State::Open); tasks.depth = -1;
debug!("{:?}", tasks); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.current_tasks().len(), 1);
tasks.depth = 0; tasks.move_to(Some(t1));
assert_eq!(tasks.current_tasks().len(), 0); assert_eq!(tasks.relative_path(t4), "t2>t4");
assert_eq!(tasks.current_tasks().len(), 2);
tasks.move_to(Some(t1)); tasks.depth = 2;
tasks.depth = 2; assert_eq!(tasks.current_tasks().len(), 3);
assert_eq!(tasks.current_tasks().len(), 0); tasks.set_filter(vec![t2]);
let t2 = tasks.make_task("t2"); assert_eq!(tasks.current_tasks().len(), 2);
assert_eq!(tasks.current_tasks().len(), 1); tasks.depth = 1;
assert_eq!(tasks.get_task_path(Some(t2)), "t1>t2"); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.relative_path(t2), "t2"); tasks.depth = -1;
let t3 = tasks.make_task("t3"); assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.current_tasks().len(), 2); tasks.set_filter(vec![t2, t3]);
assert_eq!(tasks.current_tasks().len(), 2);
tasks.move_to(Some(t2)); tasks.depth = 2;
assert_eq!(tasks.current_tasks().len(), 0); assert_eq!(tasks.current_tasks().len(), 3);
let t4 = tasks.make_task("t4"); tasks.depth = 1;
assert_eq!(tasks.current_tasks().len(), 1); assert_eq!(tasks.current_tasks().len(), 2);
assert_eq!(tasks.get_task_path(Some(t4)), "t1>t2>t4");
assert_eq!(tasks.relative_path(t4), "t4"); tasks.move_to(None);
tasks.depth = 2; assert_eq!(tasks.current_tasks().len(), 1);
assert_eq!(tasks.current_tasks().len(), 1); tasks.depth = 2;
tasks.depth = -1; assert_eq!(tasks.current_tasks().len(), 3);
assert_eq!(tasks.current_tasks().len(), 1); tasks.depth = 3;
assert_eq!(tasks.current_tasks().len(), 4);
tasks.move_to(Some(t1)); tasks.depth = 9;
assert_eq!(tasks.relative_path(t4), "t2>t4"); assert_eq!(tasks.current_tasks().len(), 4);
assert_eq!(tasks.current_tasks().len(), 2); tasks.depth = -1;
tasks.depth = 2; assert_eq!(tasks.current_tasks().len(), 2);
assert_eq!(tasks.current_tasks().len(), 3); }
tasks.set_filter(vec![t2]);
assert_eq!(tasks.current_tasks().len(), 2); #[test]
tasks.depth = 1; fn test_empty_task_title_fallback_to_id() {
assert_eq!(tasks.current_tasks().len(), 1); let mut tasks = stub_tasks();
tasks.depth = -1;
assert_eq!(tasks.current_tasks().len(), 1); let empty = tasks.make_task("");
tasks.set_filter(vec![t2, t3]); let empty_task = tasks.get_by_id(&empty).unwrap();
assert_eq!(tasks.current_tasks().len(), 2); let empty_id = empty_task.event.id.to_string();
tasks.depth = 2; assert_eq!(empty_task.get_title(), empty_id);
assert_eq!(tasks.current_tasks().len(), 3); assert_eq!(tasks.get_task_path(Some(empty)), empty_id);
tasks.depth = 1; }
assert_eq!(tasks.current_tasks().len(), 2);
#[test]
tasks.move_to(None); fn test_unknown_task() {
assert_eq!(tasks.current_tasks().len(), 1); let mut tasks = stub_tasks();
tasks.depth = 2;
assert_eq!(tasks.current_tasks().len(), 3); let zero = EventId::all_zeros();
tasks.depth = 3; assert_eq!(tasks.get_task_path(Some(zero)), zero.to_string());
assert_eq!(tasks.current_tasks().len(), 4); tasks.move_to(Some(zero));
tasks.depth = 9; let dangling = tasks.make_task("test");
assert_eq!(tasks.current_tasks().len(), 4); assert_eq!(
tasks.depth = -1; tasks.get_task_path(Some(dangling)),
assert_eq!(tasks.current_tasks().len(), 2); "0000000000000000000000000000000000000000000000000000000000000000>test"
} );
assert_eq!(tasks.relative_path(dangling), "test");
#[test]
fn test_empty_task_title_fallback_to_id() { use itertools::Itertools;
let mut tasks = stub_tasks(); assert_eq!("test toast".split(' ').collect_vec().len(), 3);
assert_eq!(
let empty = tasks.make_task(""); "test toast".split_ascii_whitespace().collect_vec().len(),
let empty_task = tasks.get_by_id(&empty).unwrap(); 2
let empty_id = empty_task.event.id.to_string(); );
assert_eq!(empty_task.get_title(), empty_id);
assert_eq!(tasks.get_task_path(Some(empty)), empty_id);
}
#[test]
fn test_unknown_task() {
let mut tasks = stub_tasks();
let zero = EventId::all_zeros();
assert_eq!(tasks.get_task_path(Some(zero)), zero.to_string());
tasks.move_to(Some(zero));
let dangling = tasks.make_task("test");
assert_eq!(
tasks.get_task_path(Some(dangling)),
"0000000000000000000000000000000000000000000000000000000000000000>test"
);
assert_eq!(tasks.relative_path(dangling), "test");
use itertools::Itertools;
assert_eq!("test toast".split(' ').collect_vec().len(), 3);
assert_eq!(
"test toast".split_ascii_whitespace().collect_vec().len(),
2
);
}
} }