diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2020-09-05 13:19:01 +0200 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2020-09-05 13:34:49 +0200 |
commit | 0f3b0bcb6c196a9b93075a8abee897634c9c892f (patch) | |
tree | d3af9f19fdc6afe4db9e4c7920d623e9b1404c18 /src | |
parent | bb809992ad543ea4c0c31897fbf2d130394dd80e (diff) | |
download | nitrocli-output-formats.tar.gz nitrocli-output-formats.tar.bz2 |
Add tsv output formatoutput-formats
This patch adds a new output format, tsv. It uses the tsv crate to
generate the data and the serde_json crate to transform structs into
key-value pairs.
TODO: man page, changelog
Diffstat (limited to 'src')
-rw-r--r-- | src/args.rs | 1 | ||||
-rw-r--r-- | src/output.rs | 59 |
2 files changed, 60 insertions, 0 deletions
diff --git a/src/args.rs b/src/args.rs index 3936738..f34de81 100644 --- a/src/args.rs +++ b/src/args.rs @@ -63,6 +63,7 @@ Enum! { OutputFormat, [ Json => "json", Text => "text", + Tsv => "tsv", ] } diff --git a/src/output.rs b/src/output.rs index 37daf92..01dee2c 100644 --- a/src/output.rs +++ b/src/output.rs @@ -76,6 +76,7 @@ impl<T: fmt::Display + serde::Serialize> Output for Value<T> { fn format(&self, format: args::OutputFormat) -> anyhow::Result<String> { match format { args::OutputFormat::Json => get_json(&self.key, &self.value), + args::OutputFormat::Tsv => get_tsv_object(&self.value), args::OutputFormat::Text => Ok(self.value.to_string()), } } @@ -103,6 +104,7 @@ impl<T: TableItem> Output for Table<T> { fn format(&self, format: args::OutputFormat) -> anyhow::Result<String> { match format { args::OutputFormat::Json => get_json(&self.key, &self.items), + args::OutputFormat::Tsv => get_tsv_list(&self.items), args::OutputFormat::Text => { if self.items.is_empty() { Ok(self.empty_message.clone()) @@ -192,3 +194,60 @@ fn get_json<T: serde::Serialize + ?Sized>(key: &str, value: &T) -> anyhow::Resul let _ = map.insert(key, value); serde_json::to_string_pretty(&map).context("Could not serialize output to JSON") } + +fn get_tsv_list<T: serde::Serialize>(items: &[T]) -> anyhow::Result<String> { + let mut writer = csv::WriterBuilder::new() + .delimiter(b'\t') + .from_writer(vec![]); + for item in items { + writer + .serialize(item) + .context("Could not serialize output to TSV")?; + } + String::from_utf8(writer.into_inner()?).context("Could not parse TSV output as UTF-8") +} + +fn get_tsv_object<T: serde::Serialize>(value: T) -> anyhow::Result<String> { + let value = serde_json::to_value(&value).context("Could not serialize output")?; + get_tsv_list(&get_tsv_records(&[], value)) +} + +/// Converts an arbitrary value into a list of TSV records. +/// +/// There are two cases: Scalars are converted to a single value (without headers). Arrays and +/// objects are converted to a list of key-value pairs (with headers). Nested arrays and objects +/// are flattened and their keys are separated by dots. +/// +/// `prefix` is the prefix to use for the keys of arrays and objects, or an empty slice if the +/// given value is the top-level value. +fn get_tsv_records(prefix: &[&str], value: serde_json::Value) -> Vec<serde_json::Value> { + use serde_json::Value; + + let mut vec = Vec::new(); + if (value.is_array() || value.is_object()) && prefix.is_empty() { + vec.push(Value::Array(vec!["key".into(), "value".into()])); + } + + match value { + Value::Object(o) => { + for (key, value) in o { + vec.append(&mut get_tsv_records(&[prefix, &[&key]].concat(), value)); + } + } + Value::Array(a) => { + for (idx, value) in a.into_iter().enumerate() { + let idx = idx.to_string(); + vec.append(&mut get_tsv_records(&[prefix, &[&idx]].concat(), value)); + } + } + _ => { + if prefix.is_empty() { + vec.push(value); + } else { + vec.push(Value::Array(vec![prefix.join(".").into(), value])); + } + } + } + + vec +} |