matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Rewrite to accept ids from stdin

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-11-11 19:46:09 +01:00
parent 9dc345c833
commit fae53aa134
2 changed files with 45 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/core/imag-tag/Cargo.toml
View file

@ -23,6 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.6" log = "0.4.6"
toml = "0.5.1" toml = "0.5.1"
failure = "0.1.5" failure = "0.1.5"
resiter = "0.4.0"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }

72
bin/core/imag-tag/src/lib.rs
View file

@ -35,6 +35,7 @@
)] )]
extern crate clap; extern crate clap;
extern crate resiter;
#[macro_use] extern crate log; #[macro_use] extern crate log;
#[cfg(test)] extern crate toml; #[cfg(test)] extern crate toml;
@ -63,6 +64,8 @@ use std::io::Write;
use failure::Fallible as Result; use failure::Fallible as Result;
use failure::Error; use failure::Error;
use failure::err_msg; use failure::err_msg;
use resiter::AndThen;
use resiter::Map;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagrt::application::ImagApplication; use libimagrt::application::ImagApplication;
@ -82,39 +85,52 @@ mod ui;
pub enum ImagTag {} pub enum ImagTag {}
impl ImagApplication for ImagTag { impl ImagApplication for ImagTag {
fn run(rt: Runtime) -> Result<()> { fn run(rt: Runtime) -> Result<()> {
let ids = rt.ids::<crate::ui::PathProvider>()? let process = |iter: &mut dyn Iterator<Item = Result<StoreId>>| -> Result<()> {
.ok_or_else(|| err_msg("No ids supplied"))? if let Some(name) = rt.cli().subcommand_name() {
.into_iter(); match name {
"list" => iter
.map_ok(|id| list(id, &rt))
.collect::<Result<Vec<_>>>()
.map(|_| ()),
if let Some(name) = rt.cli().subcommand_name() { "remove" => iter.and_then_ok(|id| {
match name { let add = None;
"list" => ids.into_iter().map(|id| list(id, &rt)).collect(), let rem = get_remove_tags(rt.cli())?;
debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
alter(&rt, id, add, rem)
}).collect(),
"remove" => ids.into_iter().map(|id| { "add" => iter.and_then_ok(|id| {
let add = None; let add = get_add_tags(rt.cli())?;
let rem = get_remove_tags(rt.cli())?; let rem = None;
debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem); debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem);
alter(&rt, id, add, rem) alter(&rt, id, add, rem)
}).collect(), }).collect(),
"add" => ids.into_iter().map(|id| { other => {
let add = get_add_tags(rt.cli())?; debug!("Unknown command");
let rem = None; if rt.handle_unknown_subcommand("imag-tag", other, rt.cli())?.success() {
debug!("id = {:?}, add = {:?}, rem = {:?}", id, add, rem); Ok(())
alter(&rt, id, add, rem) } else {
}).collect(), Err(format_err!("Subcommand failed"))
}
other => { },
debug!("Unknown command"); }
if rt.handle_unknown_subcommand("imag-tag", other, rt.cli())?.success() { } else {
Ok(()) Ok(())
} else {
Err(format_err!("Subcommand failed"))
}
},
} }
};
if rt.ids_from_stdin() {
debug!("Fetching IDs from stdin...");
let mut iter = rt.ids::<crate::ui::PathProvider>()?
.ok_or_else(|| err_msg("No ids supplied"))?
.into_iter()
.map(Ok);
process(&mut iter)
} else { } else {
Ok(()) process(&mut rt.store().entries()?)
} }
} }