522a828687
* Refactor InputStream and affected commands. First, making `values` private and leaning on the `Stream` implementation makes consumes of `InputStream` less likely to have to change in the future, if we change what an `InputStream` is internally. Second, we're dropping `Option<InputStream>` as the input to pipelines, internals, and externals. Instead, `InputStream.is_empty` can be used to check for "emptiness". Empty streams are typically only ever used as the first input to a pipeline. * Add run_external internal command. We want to push external commands closer to internal commands, eventually eliminating the concept of "external" completely. This means we can consolidate a couple of things: - Variable evaluation (for example, `$it`, `$nu`, alias vars) - Behaviour of whole stream vs per-item external execution It should also make it easier for us to start introducing argument signatures for external commands, * Update run_external.rs * Update run_external.rs * Update run_external.rs * Update run_external.rs Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
81 lines
2.8 KiB
Rust
81 lines
2.8 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::context::CommandRegistry;
|
|
use crate::prelude::*;
|
|
use futures::stream::StreamExt;
|
|
use indexmap::IndexMap;
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::Dictionary;
|
|
use nu_protocol::{ReturnSuccess, Signature, UntaggedValue, Value};
|
|
|
|
pub struct Headers;
|
|
#[derive(Deserialize)]
|
|
pub struct HeadersArgs {}
|
|
|
|
impl WholeStreamCommand for Headers {
|
|
fn name(&self) -> &str {
|
|
"headers"
|
|
}
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("headers")
|
|
}
|
|
fn usage(&self) -> &str {
|
|
"Use the first row of the table as column names"
|
|
}
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
args.process(registry, headers)?.run()
|
|
}
|
|
}
|
|
|
|
pub fn headers(
|
|
HeadersArgs {}: HeadersArgs,
|
|
RunnableContext { input, .. }: RunnableContext,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let stream = async_stream! {
|
|
let rows: Vec<Value> = input.collect().await;
|
|
|
|
if rows.len() < 1 {
|
|
yield Err(ShellError::untagged_runtime_error("Couldn't find headers, was the input a properly formatted, non-empty table?"));
|
|
}
|
|
|
|
//the headers are the first row in the table
|
|
let headers: Vec<String> = match &rows[0].value {
|
|
UntaggedValue::Row(d) => {
|
|
Ok(d.entries.iter().map(|(k, v)| {
|
|
match v.as_string() {
|
|
Ok(s) => s,
|
|
Err(_) => { //If a cell that should contain a header name is empty, we name the column Column[index]
|
|
match d.entries.get_full(k) {
|
|
Some((index, _, _)) => format!("Column{}", index),
|
|
None => "unknownColumn".to_string()
|
|
}
|
|
}
|
|
}
|
|
}).collect())
|
|
}
|
|
_ => Err(ShellError::unexpected_eof("Could not get headers, is the table empty?", rows[0].tag.span))
|
|
}?;
|
|
|
|
//Each row is a dictionary with the headers as keys
|
|
for r in rows.iter().skip(1) {
|
|
match &r.value {
|
|
UntaggedValue::Row(d) => {
|
|
let mut i = 0;
|
|
let mut entries = IndexMap::new();
|
|
for (_, v) in d.entries.iter() {
|
|
entries.insert(headers[i].clone(), v.clone());
|
|
i += 1;
|
|
}
|
|
yield Ok(ReturnSuccess::Value(UntaggedValue::Row(Dictionary{entries}).into_value(r.tag.clone())))
|
|
}
|
|
_ => yield Err(ShellError::unexpected_eof("Couldn't iterate through rows, was the input a properly formatted table?", r.tag.span))
|
|
}
|
|
}
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|