summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-03-17 00:34:00 +0100
committerGitHub <noreply@github.com>2018-03-17 00:34:00 +0100
commit1d3994d1086587e12c697839642df55f9ad178e3 (patch)
tree88b9734601454074115ec6c0dc55c1b514fe9193
parentc5154e8363373d6f0f347097cee9cf47cf88fa45 (diff)
parent323517c6a71f97a0065dec884a9607600f3205c3 (diff)
downloadimag-1d3994d1086587e12c697839642df55f9ad178e3.zip
imag-1d3994d1086587e12c697839642df55f9ad178e3.tar.gz
Merge pull request #1347 from matthiasbeyer/imag-ids/prefix
imag-ids: prefix printing off by default
-rw-r--r--bin/core/imag-ids/src/main.rs15
-rw-r--r--doc/src/09020-changelog.md2
2 files changed, 16 insertions, 1 deletions
diff --git a/bin/core/imag-ids/src/main.rs b/bin/core/imag-ids/src/main.rs
index 98dd779..30e0c49 100644
--- a/bin/core/imag-ids/src/main.rs
+++ b/bin/core/imag-ids/src/main.rs
@@ -40,7 +40,7 @@ extern crate libimagstore;
use std::io::Write;
-use clap::App;
+use clap::{Arg, App};
use libimagrt::setup::generate_runtime_setup;
use libimagerror::trace::MapErrTrace;
@@ -51,6 +51,12 @@ use libimagerror::io::ToExitCode;
/// No special CLI
pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
app
+ .arg(Arg::with_name("print-storepath")
+ .long("with-storepath")
+ .takes_value(false)
+ .required(false)
+ .multiple(false)
+ .help("Print the storepath for each id"))
}
fn main() {
@@ -60,9 +66,16 @@ fn main() {
"print all ids",
build_ui);
+ let print_storepath = rt.cli().is_present("print-storepath");
+
rt.store()
.entries()
.map_err_trace_exit_unwrap(1)
+ .map(|id| if print_storepath {
+ id
+ } else {
+ id.without_base()
+ })
.for_each(|id| {
let _ = writeln!(rt.stdout(), "{}", id.to_str().map_err_trace_exit_unwrap(1))
.to_exit_code()
diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md
index 42c6da1..072d900 100644
--- a/doc/src/09020-changelog.md
+++ b/doc/src/09020-changelog.md
@@ -41,6 +41,8 @@ This section contains the changelog from the last release to the next release.
output as JSON.
* `imag-edit` can now read store ids from stdin, sorts
`imag ids | fzf | imag edit -I` is not a thing.
+ * `imag ids` does not print the path of the store. Can be turned on using
+ commandline flag.
* Minor changes
* A license-checker was included into the CI setup, which checks whether all
".rs"-files have the license header at the top of the file