Remove the most ugly parts
This commit is contained in:
parent
fadeae5214
commit
aef80874da
1 changed files with 47 additions and 56 deletions
|
|
@ -44,8 +44,7 @@ fn main() {
|
|||
}
|
||||
};
|
||||
|
||||
let scmd = rt.cli().subcommand_name();
|
||||
match scmd {
|
||||
match rt.cli().subcommand_name() {
|
||||
Some("tw-hook") => tw_hook(&rt),
|
||||
Some("exec") => exec(&rt),
|
||||
Some("list") => list(&rt),
|
||||
|
|
@ -56,25 +55,25 @@ fn main() {
|
|||
fn tw_hook(rt: &Runtime) {
|
||||
let subcmd = rt.cli().subcommand_matches("tw-hook").unwrap();
|
||||
if subcmd.is_present("add") {
|
||||
let stdin = stdin();
|
||||
let stdin = stdin();
|
||||
let mut stdin = stdin.lock();
|
||||
let mut line = String::new();
|
||||
match stdin.read_line(&mut line) {
|
||||
Ok(_) => { }
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
return;
|
||||
}
|
||||
let mut line = String::new();
|
||||
|
||||
if let Err(e) = stdin.read_line(&mut line) {
|
||||
trace_error(&e);
|
||||
exit(1);
|
||||
};
|
||||
|
||||
if let Ok(ttask) = import_task(&line.as_str()) {
|
||||
let uuid = *ttask.uuid();
|
||||
println!("{}", match serde_json::ser::to_string(&ttask) {
|
||||
Ok(val) => val,
|
||||
match serde_json::ser::to_string(&ttask) {
|
||||
Ok(val) => println!("{}", val),
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
return;
|
||||
trace_error(&e);
|
||||
exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let uuid = *ttask.uuid();
|
||||
match ttask.into_filelockentry(rt.store()) {
|
||||
Ok(val) => {
|
||||
println!("Task {} stored in imag", uuid);
|
||||
|
|
@ -82,22 +81,20 @@ fn tw_hook(rt: &Runtime) {
|
|||
},
|
||||
Err(e) => {
|
||||
trace_error(&e);
|
||||
error!("{}", e);
|
||||
return;
|
||||
exit(1);
|
||||
}
|
||||
};
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
error!("No usable input");
|
||||
return;
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
else if subcmd.is_present("delete") {
|
||||
} else if subcmd.is_present("delete") {
|
||||
// The used hook is "on-modify". This hook gives two json-objects
|
||||
// per usage und wants one (the second one) back.
|
||||
let mut counter = 0;
|
||||
let stdin = stdin();
|
||||
let stdin = stdin.lock();
|
||||
let mut counter = 0;
|
||||
let stdin = stdin();
|
||||
let stdin = stdin.lock();
|
||||
|
||||
if let Ok(ttasks) = import_tasks(stdin) {
|
||||
for ttask in ttasks {
|
||||
if counter % 2 == 1 {
|
||||
|
|
@ -105,23 +102,21 @@ fn tw_hook(rt: &Runtime) {
|
|||
// task before the change, and the second one after
|
||||
// the change. The (maybe modified) second one is
|
||||
// expected by taskwarrior.
|
||||
println!("{}", match serde_json::ser::to_string(&ttask) {
|
||||
Ok(val) => val,
|
||||
match serde_json::ser::to_string(&ttask) {
|
||||
Ok(val) => println!("{}", val),
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
return;
|
||||
trace_error(&e);
|
||||
exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
match ttask.status() {
|
||||
&task_hookrs::status::TaskStatus::Deleted => {
|
||||
match libimagtodo::delete::delete(rt.store(), *ttask.uuid()) {
|
||||
Ok(_) => {
|
||||
println!("Deleted task {}", *ttask.uuid());
|
||||
}
|
||||
Ok(_) => println!("Deleted task {}", *ttask.uuid()),
|
||||
Err(e) => {
|
||||
trace_error(&e);
|
||||
error!("{}", e);
|
||||
return;
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -131,12 +126,10 @@ fn tw_hook(rt: &Runtime) {
|
|||
} // end if c % 2
|
||||
counter += 1;
|
||||
} // end for
|
||||
} // end if let
|
||||
else {
|
||||
} else {
|
||||
error!("No usable input");
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Should not be possible, as one argument is required via
|
||||
// ArgGroup
|
||||
unreachable!();
|
||||
|
|
@ -167,48 +160,46 @@ fn exec(rt: &Runtime) {
|
|||
}
|
||||
|
||||
fn list(rt: &Runtime) {
|
||||
let subcmd = rt.cli().subcommand_matches("list").unwrap();
|
||||
let subcmd = rt.cli().subcommand_matches("list").unwrap();
|
||||
let mut args = Vec::new();
|
||||
let verbose = subcmd.is_present("verbose");
|
||||
let iter = match libimagtodo::read::get_todo_iterator(rt.store()) {
|
||||
//let iter = match rt.store().retrieve_for_module("todo/taskwarrior") {
|
||||
let verbose = subcmd.is_present("verbose");
|
||||
let iter = match libimagtodo::read::get_todo_iterator(rt.store()) {
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
return;
|
||||
trace_error(&e);
|
||||
exit(1);
|
||||
}
|
||||
Ok(val) => val,
|
||||
};
|
||||
|
||||
for task in iter {
|
||||
match task {
|
||||
Ok(val) => {
|
||||
//let val = libimagtodo::task::Task::new(fle);
|
||||
//println!("{:#?}", val.flentry);
|
||||
let uuid = match val.flentry.get_header().read("todo.uuid") {
|
||||
Ok(Some(u)) => u,
|
||||
Ok(None) => continue,
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
Ok(None) => continue,
|
||||
Err(e) => {
|
||||
trace_error(&e);
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
if verbose {
|
||||
args.clear();
|
||||
args.push(format!("uuid:{}", uuid));
|
||||
args.push(format!("{}", "information"));
|
||||
let tw_process = Command::new("task").stdin(Stdio::null()).args(&args).spawn()
|
||||
.unwrap_or_else(|e| {
|
||||
error!("{}", e);
|
||||
trace_error(&e);
|
||||
panic!("failed");
|
||||
});
|
||||
let output = tw_process.wait_with_output().unwrap_or_else(|e| {
|
||||
panic!("failed to unwrap output: {}", e);
|
||||
});
|
||||
let outstring = String::from_utf8(output.stdout).unwrap_or_else(|e| {
|
||||
panic!("failed to ececute: {}", e);
|
||||
panic!("failed to execute: {}", e);
|
||||
});
|
||||
println!("{}", outstring);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
println!("{}", match uuid {
|
||||
toml::Value::String(s) => s,
|
||||
_ => {
|
||||
|
|
@ -219,7 +210,7 @@ fn list(rt: &Runtime) {
|
|||
}
|
||||
}
|
||||
Err(e) => {
|
||||
error!("{}", e);
|
||||
trace_error(&e);
|
||||
continue;
|
||||
}
|
||||
} // end match task
|
||||
|
|
|
|||
Loading…
Reference in a new issue