mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
subcommands: prepend and append to description
This currently uses format!() which may not be the best option. Fixes #88
This commit is contained in:
parent
8f5e299077
commit
ee341ac7d5
3 changed files with 132 additions and 0 deletions
64
cli/src/cmd/append.rs
Normal file
64
cli/src/cmd/append.rs
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
use crate::cmd::shared;
|
||||||
|
use clap::{App, Arg, ArgMatches, SubCommand as ClapSubCommand};
|
||||||
|
use failure::Fallible;
|
||||||
|
|
||||||
|
use crate::cmd::{ArgMatchResult, CommandInvocation};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct Invocation {
|
||||||
|
task: String,
|
||||||
|
description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
define_subcommand! {
|
||||||
|
fn decorate_app<'a>(&self, app: App<'a, 'a>) -> App<'a, 'a> {
|
||||||
|
app.subcommand(
|
||||||
|
ClapSubCommand::with_name("append").about("appends to a task description")
|
||||||
|
.arg(shared::task_arg())
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("description")
|
||||||
|
.help("extra task description")
|
||||||
|
.required(true),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
fn arg_match<'a>(&self, matches: &ArgMatches<'a>) -> ArgMatchResult {
|
||||||
|
match matches.subcommand() {
|
||||||
|
("append", Some(matches)) => ArgMatchResult::Ok(Box::new(Invocation {
|
||||||
|
task: matches.value_of("task").unwrap().into(),
|
||||||
|
description: matches.value_of("description").unwrap().into(),
|
||||||
|
})),
|
||||||
|
_ => ArgMatchResult::None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
subcommand_invocation! {
|
||||||
|
fn run(&self, command: &CommandInvocation) -> Fallible<()> {
|
||||||
|
let mut replica = command.get_replica()?;
|
||||||
|
let task = shared::get_task(&mut replica, &self.task)?;
|
||||||
|
|
||||||
|
let mut task = task.into_mut(&mut replica);
|
||||||
|
|
||||||
|
let new_description = format!("{} {}", task.get_description(), self.description.clone());
|
||||||
|
task.set_description(new_description)?;
|
||||||
|
println!("appended to task {}", task.get_uuid());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_command() {
|
||||||
|
with_subcommand_invocation!(
|
||||||
|
vec!["task", "append", "1", "foo bar"],
|
||||||
|
|inv: &Invocation| {
|
||||||
|
assert_eq!(inv.description, "foo bar".to_string());
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,6 +6,7 @@ mod macros;
|
||||||
mod shared;
|
mod shared;
|
||||||
|
|
||||||
mod add;
|
mod add;
|
||||||
|
mod append;
|
||||||
mod debug;
|
mod debug;
|
||||||
mod delete;
|
mod delete;
|
||||||
mod done;
|
mod done;
|
||||||
|
@ -14,6 +15,7 @@ mod info;
|
||||||
mod list;
|
mod list;
|
||||||
mod modify;
|
mod modify;
|
||||||
mod pending;
|
mod pending;
|
||||||
|
mod prepend;
|
||||||
mod start;
|
mod start;
|
||||||
mod stop;
|
mod stop;
|
||||||
mod sync;
|
mod sync;
|
||||||
|
@ -22,6 +24,7 @@ mod sync;
|
||||||
pub(crate) fn subcommands() -> Vec<Box<dyn SubCommand>> {
|
pub(crate) fn subcommands() -> Vec<Box<dyn SubCommand>> {
|
||||||
vec![
|
vec![
|
||||||
add::cmd(),
|
add::cmd(),
|
||||||
|
append::cmd(),
|
||||||
debug::cmd(),
|
debug::cmd(),
|
||||||
delete::cmd(),
|
delete::cmd(),
|
||||||
done::cmd(),
|
done::cmd(),
|
||||||
|
@ -30,6 +33,7 @@ pub(crate) fn subcommands() -> Vec<Box<dyn SubCommand>> {
|
||||||
list::cmd(),
|
list::cmd(),
|
||||||
modify::cmd(),
|
modify::cmd(),
|
||||||
pending::cmd(),
|
pending::cmd(),
|
||||||
|
prepend::cmd(),
|
||||||
start::cmd(),
|
start::cmd(),
|
||||||
stop::cmd(),
|
stop::cmd(),
|
||||||
sync::cmd(),
|
sync::cmd(),
|
||||||
|
|
64
cli/src/cmd/prepend.rs
Normal file
64
cli/src/cmd/prepend.rs
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
use crate::cmd::shared;
|
||||||
|
use clap::{App, Arg, ArgMatches, SubCommand as ClapSubCommand};
|
||||||
|
use failure::Fallible;
|
||||||
|
|
||||||
|
use crate::cmd::{ArgMatchResult, CommandInvocation};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct Invocation {
|
||||||
|
task: String,
|
||||||
|
description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
define_subcommand! {
|
||||||
|
fn decorate_app<'a>(&self, app: App<'a, 'a>) -> App<'a, 'a> {
|
||||||
|
app.subcommand(
|
||||||
|
ClapSubCommand::with_name("prepend").about("add to the start of a task description")
|
||||||
|
.arg(shared::task_arg())
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("description")
|
||||||
|
.help("extra task description")
|
||||||
|
.required(true),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
fn arg_match<'a>(&self, matches: &ArgMatches<'a>) -> ArgMatchResult {
|
||||||
|
match matches.subcommand() {
|
||||||
|
("prepend", Some(matches)) => ArgMatchResult::Ok(Box::new(Invocation {
|
||||||
|
task: matches.value_of("task").unwrap().into(),
|
||||||
|
description: matches.value_of("description").unwrap().into(),
|
||||||
|
})),
|
||||||
|
_ => ArgMatchResult::None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
subcommand_invocation! {
|
||||||
|
fn run(&self, command: &CommandInvocation) -> Fallible<()> {
|
||||||
|
let mut replica = command.get_replica()?;
|
||||||
|
let task = shared::get_task(&mut replica, &self.task)?;
|
||||||
|
|
||||||
|
let mut task = task.into_mut(&mut replica);
|
||||||
|
|
||||||
|
let new_description = format!("{} {}", self.description.clone(), task.get_description());
|
||||||
|
task.set_description(new_description)?;
|
||||||
|
println!("prepended to task {}", task.get_uuid());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_command() {
|
||||||
|
with_subcommand_invocation!(
|
||||||
|
vec!["task", "prepend", "1", "foo bar"],
|
||||||
|
|inv: &Invocation| {
|
||||||
|
assert_eq!(inv.description, "foo bar".to_string());
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue