mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
refactor argparse::args into submodules
This commit is contained in:
Dustin J. Mitchell
Dustin J. Mitchell
parent
1aae7e059d
commit
288f29d9d5
7 changed files with 392 additions and 346 deletions
|
|
@ -1,346 +0,0 @@
|
||||||
//! Parsers for argument lists -- arrays of strings
|
|
||||||
use super::ArgList;
|
|
||||||
use super::NOW;
|
|
||||||
use chrono::prelude::*;
|
|
||||||
use nom::bytes::complete::tag as nomtag;
|
|
||||||
use nom::{
|
|
||||||
branch::*,
|
|
||||||
character::complete::*,
|
|
||||||
combinator::*,
|
|
||||||
error::{Error, ErrorKind},
|
|
||||||
multi::*,
|
|
||||||
sequence::*,
|
|
||||||
Err, IResult,
|
|
||||||
};
|
|
||||||
use std::convert::TryFrom;
|
|
||||||
use taskchampion::{Status, Tag, Uuid};
|
|
||||||
|
|
||||||
/// A task identifier, as given in a filter command-line expression
|
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
|
||||||
pub(crate) enum TaskId {
|
|
||||||
/// A small integer identifying a working-set task
|
|
||||||
WorkingSetId(usize),
|
|
||||||
|
|
||||||
/// A full Uuid specifically identifying a task
|
|
||||||
Uuid(Uuid),
|
|
||||||
|
|
||||||
/// A prefix of a Uuid
|
|
||||||
PartialUuid(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes any argument
|
|
||||||
pub(super) fn any(input: &str) -> IResult<&str, &str> {
|
|
||||||
rest(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a report name
|
|
||||||
pub(super) fn report_name(input: &str) -> IResult<&str, &str> {
|
|
||||||
all_consuming(recognize(pair(alpha1, alphanumeric0)))(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a literal string
|
|
||||||
pub(super) fn literal(literal: &'static str) -> impl Fn(&str) -> IResult<&str, &str> {
|
|
||||||
move |input: &str| all_consuming(nomtag(literal))(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a colon-prefixed pair
|
|
||||||
pub(super) fn colon_prefixed(prefix: &'static str) -> impl Fn(&str) -> IResult<&str, &str> {
|
|
||||||
fn to_suffix<'a>(input: (&'a str, char, &'a str)) -> Result<&'a str, ()> {
|
|
||||||
Ok(input.2)
|
|
||||||
}
|
|
||||||
move |input: &str| {
|
|
||||||
map_res(
|
|
||||||
all_consuming(tuple((nomtag(prefix), char(':'), any))),
|
|
||||||
to_suffix,
|
|
||||||
)(input)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes `status:{pending,completed,deleted}`
|
|
||||||
pub(super) fn status_colon(input: &str) -> IResult<&str, Status> {
|
|
||||||
fn to_status(input: &str) -> Result<Status, ()> {
|
|
||||||
match input {
|
|
||||||
"pending" => Ok(Status::Pending),
|
|
||||||
"completed" => Ok(Status::Completed),
|
|
||||||
"deleted" => Ok(Status::Deleted),
|
|
||||||
_ => Err(()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
map_res(colon_prefixed("status"), to_status)(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes timestamps
|
|
||||||
pub(super) fn timestamp(input: &str) -> IResult<&str, DateTime<Utc>> {
|
|
||||||
// TODO: full relative date language supported by TW
|
|
||||||
fn nn_d_to_timestamp(input: &str) -> Result<DateTime<Utc>, ()> {
|
|
||||||
// TODO: don't unwrap
|
|
||||||
Ok(*NOW + chrono::Duration::days(input.parse().unwrap()))
|
|
||||||
}
|
|
||||||
map_res(terminated(digit1, char('d')), nn_d_to_timestamp)(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes `wait:` to None and `wait:<ts>` to `Some(ts)`
|
|
||||||
pub(super) fn wait_colon(input: &str) -> IResult<&str, Option<DateTime<Utc>>> {
|
|
||||||
fn to_wait(input: DateTime<Utc>) -> Result<Option<DateTime<Utc>>, ()> {
|
|
||||||
Ok(Some(input))
|
|
||||||
}
|
|
||||||
fn to_none(_: &str) -> Result<Option<DateTime<Utc>>, ()> {
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
preceded(
|
|
||||||
nomtag("wait:"),
|
|
||||||
alt((map_res(timestamp, to_wait), map_res(nomtag(""), to_none))),
|
|
||||||
)(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a comma-separated list of TaskIds
|
|
||||||
pub(super) fn id_list(input: &str) -> IResult<&str, Vec<TaskId>> {
|
|
||||||
fn hex_n(n: usize) -> impl Fn(&str) -> IResult<&str, &str> {
|
|
||||||
move |input: &str| recognize(many_m_n(n, n, one_of(&b"0123456789abcdefABCDEF"[..])))(input)
|
|
||||||
}
|
|
||||||
fn uuid(input: &str) -> Result<TaskId, ()> {
|
|
||||||
Ok(TaskId::Uuid(Uuid::parse_str(input).map_err(|_| ())?))
|
|
||||||
}
|
|
||||||
fn partial_uuid(input: &str) -> Result<TaskId, ()> {
|
|
||||||
Ok(TaskId::PartialUuid(input.to_owned()))
|
|
||||||
}
|
|
||||||
fn working_set_id(input: &str) -> Result<TaskId, ()> {
|
|
||||||
Ok(TaskId::WorkingSetId(input.parse().map_err(|_| ())?))
|
|
||||||
}
|
|
||||||
all_consuming(separated_list1(
|
|
||||||
char(','),
|
|
||||||
alt((
|
|
||||||
map_res(
|
|
||||||
recognize(tuple((
|
|
||||||
hex_n(8),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
char('-'),
|
|
||||||
hex_n(12),
|
|
||||||
))),
|
|
||||||
uuid,
|
|
||||||
),
|
|
||||||
map_res(
|
|
||||||
recognize(tuple((
|
|
||||||
hex_n(8),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
char('-'),
|
|
||||||
hex_n(4),
|
|
||||||
))),
|
|
||||||
partial_uuid,
|
|
||||||
),
|
|
||||||
map_res(
|
|
||||||
recognize(tuple((hex_n(8), char('-'), hex_n(4), char('-'), hex_n(4)))),
|
|
||||||
partial_uuid,
|
|
||||||
),
|
|
||||||
map_res(
|
|
||||||
recognize(tuple((hex_n(8), char('-'), hex_n(4)))),
|
|
||||||
partial_uuid,
|
|
||||||
),
|
|
||||||
map_res(hex_n(8), partial_uuid),
|
|
||||||
// note that an 8-decimal-digit value will be treated as a UUID
|
|
||||||
map_res(digit1, working_set_id),
|
|
||||||
)),
|
|
||||||
))(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a tag prefixed with `+` and returns the tag value
|
|
||||||
pub(super) fn plus_tag(input: &str) -> IResult<&str, &str> {
|
|
||||||
fn to_tag(input: (char, &str)) -> Result<&str, ()> {
|
|
||||||
Ok(input.1)
|
|
||||||
}
|
|
||||||
map_res(
|
|
||||||
all_consuming(tuple((
|
|
||||||
char('+'),
|
|
||||||
recognize(verify(rest, |s: &str| Tag::try_from(s).is_ok())),
|
|
||||||
))),
|
|
||||||
to_tag,
|
|
||||||
)(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recognizes a tag prefixed with `-` and returns the tag value
|
|
||||||
pub(super) fn minus_tag(input: &str) -> IResult<&str, &str> {
|
|
||||||
fn to_tag(input: (char, &str)) -> Result<&str, ()> {
|
|
||||||
Ok(input.1)
|
|
||||||
}
|
|
||||||
map_res(
|
|
||||||
all_consuming(tuple((
|
|
||||||
char('-'),
|
|
||||||
recognize(verify(rest, |s: &str| Tag::try_from(s).is_ok())),
|
|
||||||
))),
|
|
||||||
to_tag,
|
|
||||||
)(input)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Consume a single argument from an argument list that matches the given string parser (one
|
|
||||||
/// of the other functions in this module). The given parser must consume the entire input.
|
|
||||||
pub(super) fn arg_matching<'a, O, F>(f: F) -> impl Fn(ArgList<'a>) -> IResult<ArgList, O>
|
|
||||||
where
|
|
||||||
F: Fn(&'a str) -> IResult<&'a str, O>,
|
|
||||||
{
|
|
||||||
move |input: ArgList<'a>| {
|
|
||||||
if let Some(arg) = input.get(0) {
|
|
||||||
return match f(arg) {
|
|
||||||
Ok(("", rv)) => Ok((&input[1..], rv)),
|
|
||||||
// single-arg parsers must consume the entire arg
|
|
||||||
Ok((unconsumed, _)) => panic!("unconsumed argument input {}", unconsumed),
|
|
||||||
// single-arg parsers are all complete parsers
|
|
||||||
Err(Err::Incomplete(_)) => unreachable!(),
|
|
||||||
// for error and failure, rewrite to an error at this position in the arugment list
|
|
||||||
Err(Err::Error(Error { input: _, code })) => Err(Err::Error(Error { input, code })),
|
|
||||||
Err(Err::Failure(Error { input: _, code })) => {
|
|
||||||
Err(Err::Failure(Error { input, code }))
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(Err::Error(Error {
|
|
||||||
input,
|
|
||||||
// since we're using nom's built-in Error, our choices here are limited, but tihs
|
|
||||||
// occurs when there's no argument where one is expected, so Eof seems appropriate
|
|
||||||
code: ErrorKind::Eof,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_arg_matching() {
|
|
||||||
assert_eq!(
|
|
||||||
arg_matching(plus_tag)(argv!["+foo", "bar"]).unwrap(),
|
|
||||||
(argv!["bar"], "foo")
|
|
||||||
);
|
|
||||||
assert!(arg_matching(plus_tag)(argv!["foo", "bar"]).is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_colon_prefixed() {
|
|
||||||
assert_eq!(colon_prefixed("foo")("foo:abc").unwrap().1, "abc");
|
|
||||||
assert_eq!(colon_prefixed("foo")("foo:").unwrap().1, "");
|
|
||||||
assert!(colon_prefixed("foo")("foo").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_status_colon() {
|
|
||||||
assert_eq!(status_colon("status:pending").unwrap().1, Status::Pending);
|
|
||||||
assert_eq!(
|
|
||||||
status_colon("status:completed").unwrap().1,
|
|
||||||
Status::Completed
|
|
||||||
);
|
|
||||||
assert_eq!(status_colon("status:deleted").unwrap().1, Status::Deleted);
|
|
||||||
assert!(status_colon("status:foo").is_err());
|
|
||||||
assert!(status_colon("status:complete").is_err());
|
|
||||||
assert!(status_colon("status").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_plus_tag() {
|
|
||||||
assert_eq!(plus_tag("+abc").unwrap().1, "abc");
|
|
||||||
assert_eq!(plus_tag("+abc123").unwrap().1, "abc123");
|
|
||||||
assert!(plus_tag("-abc123").is_err());
|
|
||||||
assert!(plus_tag("+abc123 ").is_err());
|
|
||||||
assert!(plus_tag(" +abc123").is_err());
|
|
||||||
assert!(plus_tag("+1abc").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_minus_tag() {
|
|
||||||
assert_eq!(minus_tag("-abc").unwrap().1, "abc");
|
|
||||||
assert_eq!(minus_tag("-abc123").unwrap().1, "abc123");
|
|
||||||
assert!(minus_tag("+abc123").is_err());
|
|
||||||
assert!(minus_tag("-abc123 ").is_err());
|
|
||||||
assert!(minus_tag(" -abc123").is_err());
|
|
||||||
assert!(minus_tag("-1abc").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_wait() {
|
|
||||||
assert_eq!(wait_colon("wait:").unwrap(), ("", None));
|
|
||||||
|
|
||||||
let one_day = *NOW + chrono::Duration::days(1);
|
|
||||||
assert_eq!(wait_colon("wait:1d").unwrap(), ("", Some(one_day)));
|
|
||||||
|
|
||||||
let one_day = *NOW + chrono::Duration::days(1);
|
|
||||||
assert_eq!(wait_colon("wait:1d2").unwrap(), ("2", Some(one_day)));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_literal() {
|
|
||||||
assert_eq!(literal("list")("list").unwrap().1, "list");
|
|
||||||
assert!(literal("list")("listicle").is_err());
|
|
||||||
assert!(literal("list")(" list ").is_err());
|
|
||||||
assert!(literal("list")("LiSt").is_err());
|
|
||||||
assert!(literal("list")("denylist").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_id_list_single() {
|
|
||||||
assert_eq!(id_list("123").unwrap().1, vec![TaskId::WorkingSetId(123)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_id_list_uuids() {
|
|
||||||
assert_eq!(
|
|
||||||
id_list("12341234").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("12341234"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("1234abcd").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("1234abcd"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("abcd1234").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("abcd1234"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("abcd1234-1234").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("abcd1234-1234"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("abcd1234-1234-2345").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("abcd1234-1234-2345"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("abcd1234-1234-2345-3456").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("abcd1234-1234-2345-3456"))]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
id_list("abcd1234-1234-2345-3456-0123456789ab").unwrap().1,
|
|
||||||
vec![TaskId::Uuid(
|
|
||||||
Uuid::parse_str("abcd1234-1234-2345-3456-0123456789ab").unwrap()
|
|
||||||
)]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_id_list_invalid_partial_uuids() {
|
|
||||||
assert!(id_list("abcd123").is_err());
|
|
||||||
assert!(id_list("abcd12345").is_err());
|
|
||||||
assert!(id_list("abcd1234-").is_err());
|
|
||||||
assert!(id_list("abcd1234-123").is_err());
|
|
||||||
assert!(id_list("abcd1234-1234-").is_err());
|
|
||||||
assert!(id_list("abcd1234-12345-").is_err());
|
|
||||||
assert!(id_list("abcd1234-1234-2345-3456-0123456789ab-").is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_id_list_uuids_mixed() {
|
|
||||||
assert_eq!(id_list("abcd1234,abcd1234-1234,abcd1234-1234-2345,abcd1234-1234-2345-3456,abcd1234-1234-2345-3456-0123456789ab").unwrap().1,
|
|
||||||
vec![TaskId::PartialUuid(s!("abcd1234")),
|
|
||||||
TaskId::PartialUuid(s!("abcd1234-1234")),
|
|
||||||
TaskId::PartialUuid(s!("abcd1234-1234-2345")),
|
|
||||||
TaskId::PartialUuid(s!("abcd1234-1234-2345-3456")),
|
|
||||||
TaskId::Uuid(Uuid::parse_str("abcd1234-1234-2345-3456-0123456789ab").unwrap()),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
51
cli/src/argparse/args/arg_matching.rs
Normal file
51
cli/src/argparse/args/arg_matching.rs
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
use crate::argparse::ArgList;
|
||||||
|
use nom::{
|
||||||
|
error::{Error, ErrorKind},
|
||||||
|
Err, IResult,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Consume a single argument from an argument list that matches the given string parser (one
|
||||||
|
/// of the other functions in this module). The given parser must consume the entire input.
|
||||||
|
pub(crate) fn arg_matching<'a, O, F>(f: F) -> impl Fn(ArgList<'a>) -> IResult<ArgList, O>
|
||||||
|
where
|
||||||
|
F: Fn(&'a str) -> IResult<&'a str, O>,
|
||||||
|
{
|
||||||
|
move |input: ArgList<'a>| {
|
||||||
|
if let Some(arg) = input.get(0) {
|
||||||
|
return match f(arg) {
|
||||||
|
Ok(("", rv)) => Ok((&input[1..], rv)),
|
||||||
|
// single-arg parsers must consume the entire arg
|
||||||
|
Ok((unconsumed, _)) => panic!("unconsumed argument input {}", unconsumed),
|
||||||
|
// single-arg parsers are all complete parsers
|
||||||
|
Err(Err::Incomplete(_)) => unreachable!(),
|
||||||
|
// for error and failure, rewrite to an error at this position in the arugment list
|
||||||
|
Err(Err::Error(Error { input: _, code })) => Err(Err::Error(Error { input, code })),
|
||||||
|
Err(Err::Failure(Error { input: _, code })) => {
|
||||||
|
Err(Err::Failure(Error { input, code }))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(Err::Error(Error {
|
||||||
|
input,
|
||||||
|
// since we're using nom's built-in Error, our choices here are limited, but tihs
|
||||||
|
// occurs when there's no argument where one is expected, so Eof seems appropriate
|
||||||
|
code: ErrorKind::Eof,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::super::*;
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_arg_matching() {
|
||||||
|
assert_eq!(
|
||||||
|
arg_matching(plus_tag)(argv!["+foo", "bar"]).unwrap(),
|
||||||
|
(argv!["bar"], "foo")
|
||||||
|
);
|
||||||
|
assert!(arg_matching(plus_tag)(argv!["foo", "bar"]).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
92
cli/src/argparse/args/colon.rs
Normal file
92
cli/src/argparse/args/colon.rs
Normal file
|
|
@ -0,0 +1,92 @@
|
||||||
|
use super::any;
|
||||||
|
use crate::argparse::NOW;
|
||||||
|
use chrono::prelude::*;
|
||||||
|
use nom::bytes::complete::tag as nomtag;
|
||||||
|
use nom::{branch::*, character::complete::*, combinator::*, sequence::*, IResult};
|
||||||
|
use taskchampion::Status;
|
||||||
|
|
||||||
|
/// Recognizes a colon-prefixed pair
|
||||||
|
fn colon_prefixed(prefix: &'static str) -> impl Fn(&str) -> IResult<&str, &str> {
|
||||||
|
fn to_suffix<'a>(input: (&'a str, char, &'a str)) -> Result<&'a str, ()> {
|
||||||
|
Ok(input.2)
|
||||||
|
}
|
||||||
|
move |input: &str| {
|
||||||
|
map_res(
|
||||||
|
all_consuming(tuple((nomtag(prefix), char(':'), any))),
|
||||||
|
to_suffix,
|
||||||
|
)(input)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes `status:{pending,completed,deleted}`
|
||||||
|
pub(crate) fn status_colon(input: &str) -> IResult<&str, Status> {
|
||||||
|
fn to_status(input: &str) -> Result<Status, ()> {
|
||||||
|
match input {
|
||||||
|
"pending" => Ok(Status::Pending),
|
||||||
|
"completed" => Ok(Status::Completed),
|
||||||
|
"deleted" => Ok(Status::Deleted),
|
||||||
|
_ => Err(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
map_res(colon_prefixed("status"), to_status)(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes timestamps
|
||||||
|
pub(crate) fn timestamp(input: &str) -> IResult<&str, DateTime<Utc>> {
|
||||||
|
// TODO: full relative date language supported by TW
|
||||||
|
fn nn_d_to_timestamp(input: &str) -> Result<DateTime<Utc>, ()> {
|
||||||
|
// TODO: don't unwrap
|
||||||
|
Ok(*NOW + chrono::Duration::days(input.parse().unwrap()))
|
||||||
|
}
|
||||||
|
map_res(terminated(digit1, char('d')), nn_d_to_timestamp)(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes `wait:` to None and `wait:<ts>` to `Some(ts)`
|
||||||
|
pub(crate) fn wait_colon(input: &str) -> IResult<&str, Option<DateTime<Utc>>> {
|
||||||
|
fn to_wait(input: DateTime<Utc>) -> Result<Option<DateTime<Utc>>, ()> {
|
||||||
|
Ok(Some(input))
|
||||||
|
}
|
||||||
|
fn to_none(_: &str) -> Result<Option<DateTime<Utc>>, ()> {
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
preceded(
|
||||||
|
nomtag("wait:"),
|
||||||
|
alt((map_res(timestamp, to_wait), map_res(nomtag(""), to_none))),
|
||||||
|
)(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_colon_prefixed() {
|
||||||
|
assert_eq!(colon_prefixed("foo")("foo:abc").unwrap().1, "abc");
|
||||||
|
assert_eq!(colon_prefixed("foo")("foo:").unwrap().1, "");
|
||||||
|
assert!(colon_prefixed("foo")("foo").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_status_colon() {
|
||||||
|
assert_eq!(status_colon("status:pending").unwrap().1, Status::Pending);
|
||||||
|
assert_eq!(
|
||||||
|
status_colon("status:completed").unwrap().1,
|
||||||
|
Status::Completed
|
||||||
|
);
|
||||||
|
assert_eq!(status_colon("status:deleted").unwrap().1, Status::Deleted);
|
||||||
|
assert!(status_colon("status:foo").is_err());
|
||||||
|
assert!(status_colon("status:complete").is_err());
|
||||||
|
assert!(status_colon("status").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_wait() {
|
||||||
|
assert_eq!(wait_colon("wait:").unwrap(), ("", None));
|
||||||
|
|
||||||
|
let one_day = *NOW + chrono::Duration::days(1);
|
||||||
|
assert_eq!(wait_colon("wait:1d").unwrap(), ("", Some(one_day)));
|
||||||
|
|
||||||
|
let one_day = *NOW + chrono::Duration::days(1);
|
||||||
|
assert_eq!(wait_colon("wait:1d2").unwrap(), ("2", Some(one_day)));
|
||||||
|
}
|
||||||
|
}
|
||||||
139
cli/src/argparse/args/idlist.rs
Normal file
139
cli/src/argparse/args/idlist.rs
Normal file
|
|
@ -0,0 +1,139 @@
|
||||||
|
use nom::{branch::*, character::complete::*, combinator::*, multi::*, sequence::*, IResult};
|
||||||
|
use taskchampion::Uuid;
|
||||||
|
|
||||||
|
/// A task identifier, as given in a filter command-line expression
|
||||||
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
|
pub(crate) enum TaskId {
|
||||||
|
/// A small integer identifying a working-set task
|
||||||
|
WorkingSetId(usize),
|
||||||
|
|
||||||
|
/// A full Uuid specifically identifying a task
|
||||||
|
Uuid(Uuid),
|
||||||
|
|
||||||
|
/// A prefix of a Uuid
|
||||||
|
PartialUuid(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes a comma-separated list of TaskIds
|
||||||
|
pub(crate) fn id_list(input: &str) -> IResult<&str, Vec<TaskId>> {
|
||||||
|
fn hex_n(n: usize) -> impl Fn(&str) -> IResult<&str, &str> {
|
||||||
|
move |input: &str| recognize(many_m_n(n, n, one_of(&b"0123456789abcdefABCDEF"[..])))(input)
|
||||||
|
}
|
||||||
|
fn uuid(input: &str) -> Result<TaskId, ()> {
|
||||||
|
Ok(TaskId::Uuid(Uuid::parse_str(input).map_err(|_| ())?))
|
||||||
|
}
|
||||||
|
fn partial_uuid(input: &str) -> Result<TaskId, ()> {
|
||||||
|
Ok(TaskId::PartialUuid(input.to_owned()))
|
||||||
|
}
|
||||||
|
fn working_set_id(input: &str) -> Result<TaskId, ()> {
|
||||||
|
Ok(TaskId::WorkingSetId(input.parse().map_err(|_| ())?))
|
||||||
|
}
|
||||||
|
all_consuming(separated_list1(
|
||||||
|
char(','),
|
||||||
|
alt((
|
||||||
|
map_res(
|
||||||
|
recognize(tuple((
|
||||||
|
hex_n(8),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
char('-'),
|
||||||
|
hex_n(12),
|
||||||
|
))),
|
||||||
|
uuid,
|
||||||
|
),
|
||||||
|
map_res(
|
||||||
|
recognize(tuple((
|
||||||
|
hex_n(8),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
char('-'),
|
||||||
|
hex_n(4),
|
||||||
|
))),
|
||||||
|
partial_uuid,
|
||||||
|
),
|
||||||
|
map_res(
|
||||||
|
recognize(tuple((hex_n(8), char('-'), hex_n(4), char('-'), hex_n(4)))),
|
||||||
|
partial_uuid,
|
||||||
|
),
|
||||||
|
map_res(
|
||||||
|
recognize(tuple((hex_n(8), char('-'), hex_n(4)))),
|
||||||
|
partial_uuid,
|
||||||
|
),
|
||||||
|
map_res(hex_n(8), partial_uuid),
|
||||||
|
// note that an 8-decimal-digit value will be treated as a UUID
|
||||||
|
map_res(digit1, working_set_id),
|
||||||
|
)),
|
||||||
|
))(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_id_list_single() {
|
||||||
|
assert_eq!(id_list("123").unwrap().1, vec![TaskId::WorkingSetId(123)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_id_list_uuids() {
|
||||||
|
assert_eq!(
|
||||||
|
id_list("12341234").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("12341234"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("1234abcd").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("1234abcd"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("abcd1234").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("abcd1234"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("abcd1234-1234").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("abcd1234-1234"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("abcd1234-1234-2345").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("abcd1234-1234-2345"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("abcd1234-1234-2345-3456").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("abcd1234-1234-2345-3456"))]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
id_list("abcd1234-1234-2345-3456-0123456789ab").unwrap().1,
|
||||||
|
vec![TaskId::Uuid(
|
||||||
|
Uuid::parse_str("abcd1234-1234-2345-3456-0123456789ab").unwrap()
|
||||||
|
)]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_id_list_invalid_partial_uuids() {
|
||||||
|
assert!(id_list("abcd123").is_err());
|
||||||
|
assert!(id_list("abcd12345").is_err());
|
||||||
|
assert!(id_list("abcd1234-").is_err());
|
||||||
|
assert!(id_list("abcd1234-123").is_err());
|
||||||
|
assert!(id_list("abcd1234-1234-").is_err());
|
||||||
|
assert!(id_list("abcd1234-12345-").is_err());
|
||||||
|
assert!(id_list("abcd1234-1234-2345-3456-0123456789ab-").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_id_list_uuids_mixed() {
|
||||||
|
assert_eq!(id_list("abcd1234,abcd1234-1234,abcd1234-1234-2345,abcd1234-1234-2345-3456,abcd1234-1234-2345-3456-0123456789ab").unwrap().1,
|
||||||
|
vec![TaskId::PartialUuid(s!("abcd1234")),
|
||||||
|
TaskId::PartialUuid(s!("abcd1234-1234")),
|
||||||
|
TaskId::PartialUuid(s!("abcd1234-1234-2345")),
|
||||||
|
TaskId::PartialUuid(s!("abcd1234-1234-2345-3456")),
|
||||||
|
TaskId::Uuid(Uuid::parse_str("abcd1234-1234-2345-3456-0123456789ab").unwrap()),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
41
cli/src/argparse/args/misc.rs
Normal file
41
cli/src/argparse/args/misc.rs
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
use nom::bytes::complete::tag as nomtag;
|
||||||
|
use nom::{character::complete::*, combinator::*, sequence::*, IResult};
|
||||||
|
|
||||||
|
/// Recognizes any argument
|
||||||
|
pub(crate) fn any(input: &str) -> IResult<&str, &str> {
|
||||||
|
rest(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes a report name
|
||||||
|
pub(crate) fn report_name(input: &str) -> IResult<&str, &str> {
|
||||||
|
all_consuming(recognize(pair(alpha1, alphanumeric0)))(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes a literal string
|
||||||
|
pub(crate) fn literal(literal: &'static str) -> impl Fn(&str) -> IResult<&str, &str> {
|
||||||
|
move |input: &str| all_consuming(nomtag(literal))(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::super::*;
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_arg_matching() {
|
||||||
|
assert_eq!(
|
||||||
|
arg_matching(plus_tag)(argv!["+foo", "bar"]).unwrap(),
|
||||||
|
(argv!["bar"], "foo")
|
||||||
|
);
|
||||||
|
assert!(arg_matching(plus_tag)(argv!["foo", "bar"]).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_literal() {
|
||||||
|
assert_eq!(literal("list")("list").unwrap().1, "list");
|
||||||
|
assert!(literal("list")("listicle").is_err());
|
||||||
|
assert!(literal("list")(" list ").is_err());
|
||||||
|
assert!(literal("list")("LiSt").is_err());
|
||||||
|
assert!(literal("list")("denylist").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
13
cli/src/argparse/args/mod.rs
Normal file
13
cli/src/argparse/args/mod.rs
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
//! Parsers for single arguments (strings)
|
||||||
|
|
||||||
|
mod arg_matching;
|
||||||
|
mod colon;
|
||||||
|
mod idlist;
|
||||||
|
mod misc;
|
||||||
|
mod tags;
|
||||||
|
|
||||||
|
pub(crate) use arg_matching::arg_matching;
|
||||||
|
pub(crate) use colon::{status_colon, wait_colon};
|
||||||
|
pub(crate) use idlist::{id_list, TaskId};
|
||||||
|
pub(crate) use misc::{any, literal, report_name};
|
||||||
|
pub(crate) use tags::{minus_tag, plus_tag};
|
||||||
56
cli/src/argparse/args/tags.rs
Normal file
56
cli/src/argparse/args/tags.rs
Normal file
|
|
@ -0,0 +1,56 @@
|
||||||
|
use nom::{character::complete::*, combinator::*, sequence::*, IResult};
|
||||||
|
use std::convert::TryFrom;
|
||||||
|
use taskchampion::Tag;
|
||||||
|
|
||||||
|
/// Recognizes a tag prefixed with `+` and returns the tag value
|
||||||
|
pub(crate) fn plus_tag(input: &str) -> IResult<&str, &str> {
|
||||||
|
fn to_tag(input: (char, &str)) -> Result<&str, ()> {
|
||||||
|
Ok(input.1)
|
||||||
|
}
|
||||||
|
map_res(
|
||||||
|
all_consuming(tuple((
|
||||||
|
char('+'),
|
||||||
|
recognize(verify(rest, |s: &str| Tag::try_from(s).is_ok())),
|
||||||
|
))),
|
||||||
|
to_tag,
|
||||||
|
)(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recognizes a tag prefixed with `-` and returns the tag value
|
||||||
|
pub(crate) fn minus_tag(input: &str) -> IResult<&str, &str> {
|
||||||
|
fn to_tag(input: (char, &str)) -> Result<&str, ()> {
|
||||||
|
Ok(input.1)
|
||||||
|
}
|
||||||
|
map_res(
|
||||||
|
all_consuming(tuple((
|
||||||
|
char('-'),
|
||||||
|
recognize(verify(rest, |s: &str| Tag::try_from(s).is_ok())),
|
||||||
|
))),
|
||||||
|
to_tag,
|
||||||
|
)(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_plus_tag() {
|
||||||
|
assert_eq!(plus_tag("+abc").unwrap().1, "abc");
|
||||||
|
assert_eq!(plus_tag("+abc123").unwrap().1, "abc123");
|
||||||
|
assert!(plus_tag("-abc123").is_err());
|
||||||
|
assert!(plus_tag("+abc123 ").is_err());
|
||||||
|
assert!(plus_tag(" +abc123").is_err());
|
||||||
|
assert!(plus_tag("+1abc").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_minus_tag() {
|
||||||
|
assert_eq!(minus_tag("-abc").unwrap().1, "abc");
|
||||||
|
assert_eq!(minus_tag("-abc123").unwrap().1, "abc123");
|
||||||
|
assert!(minus_tag("+abc123").is_err());
|
||||||
|
assert!(minus_tag("-abc123 ").is_err());
|
||||||
|
assert!(minus_tag(" -abc123").is_err());
|
||||||
|
assert!(minus_tag("-1abc").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue