forked from extern/nushell
e626522b3a
* make sort-by fail gracefully if mismatched types are compared * Added a test to check if sorted-by with invalid types exists gracefully * Linter changes * removed redundant pattern matching * Changed the error message * Added a comma after every argument * Changed the test to accomodate the new err messages * Err message for sort-by invalid types now shows the mismatched types * Lints problems * Changed unwrap to expect * Added the -f flag to rm command Now when you a use rm -f there will be no error message, even if the file doesnt actually exist * Lint problems * Fixed the wrong line * Removed println * Spelling mistake * Fix problems when you mv a file into itself * Lint mistakes * Remove unecessary filtering in most cases * Allow the removal of sockets * Conditional compilations to systems without socket * Add a size-format option to ls command * Added kib and mib formating * Make patterns lowercase * New subcommand to format, filesize * Forgot the linter once more * Remove the ls changes since its no longer needed * CI mistakes * Lint stuff * Fix lint * Added formatting for bytes * fix lint * Changed the usage comment
163 lines
4.4 KiB
Rust
163 lines
4.4 KiB
Rust
use crate::command_registry::CommandRegistry;
|
|
use crate::commands::WholeStreamCommand;
|
|
use crate::evaluate::evaluate_baseline_expr;
|
|
use crate::prelude::*;
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::{ReturnSuccess, Scope, Signature, SyntaxShape, UntaggedValue};
|
|
use nu_source::Tagged;
|
|
use std::borrow::Borrow;
|
|
|
|
pub struct Format;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct FormatArgs {
|
|
pattern: Tagged<String>,
|
|
}
|
|
|
|
#[async_trait]
|
|
impl WholeStreamCommand for Format {
|
|
fn name(&self) -> &str {
|
|
"format"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("format").required(
|
|
"pattern",
|
|
SyntaxShape::String,
|
|
"the pattern to output. Eg) \"{foo}: {bar}\"",
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Format columns into a string using a simple pattern."
|
|
}
|
|
|
|
async fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
format_command(args, registry).await
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Print filenames with their sizes",
|
|
example: "ls | format '{name}: {size}'",
|
|
result: None,
|
|
}]
|
|
}
|
|
}
|
|
|
|
async fn format_command(
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let registry = Arc::new(registry.clone());
|
|
let scope = args.call_info.scope.clone();
|
|
let (FormatArgs { pattern }, input) = args.process(®istry).await?;
|
|
|
|
let format_pattern = format(&pattern);
|
|
let commands = Arc::new(format_pattern);
|
|
|
|
Ok(input
|
|
.then(move |value| {
|
|
let mut output = String::new();
|
|
let commands = commands.clone();
|
|
let registry = registry.clone();
|
|
let scope = scope.clone();
|
|
|
|
async move {
|
|
for command in &*commands {
|
|
match command {
|
|
FormatCommand::Text(s) => {
|
|
output.push_str(&s);
|
|
}
|
|
FormatCommand::Column(c) => {
|
|
// FIXME: use the correct spans
|
|
let full_column_path = nu_parser::parse_full_column_path(
|
|
&(c.to_string()).spanned(Span::unknown()),
|
|
&*registry,
|
|
);
|
|
|
|
let result = evaluate_baseline_expr(
|
|
&full_column_path.0,
|
|
®istry,
|
|
Scope::append_it(scope.clone(), value.clone()),
|
|
)
|
|
.await;
|
|
|
|
if let Ok(c) = result {
|
|
output
|
|
.push_str(&value::format_leaf(c.borrow()).plain_string(100_000))
|
|
} else {
|
|
// That column doesn't match, so don't emit anything
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ReturnSuccess::value(UntaggedValue::string(output).into_untagged_value())
|
|
}
|
|
})
|
|
.to_output_stream())
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
enum FormatCommand {
|
|
Text(String),
|
|
Column(String),
|
|
}
|
|
|
|
fn format(input: &str) -> Vec<FormatCommand> {
|
|
let mut output = vec![];
|
|
|
|
let mut loop_input = input.chars();
|
|
loop {
|
|
let mut before = String::new();
|
|
|
|
while let Some(c) = loop_input.next() {
|
|
if c == '{' {
|
|
break;
|
|
}
|
|
before.push(c);
|
|
}
|
|
|
|
if !before.is_empty() {
|
|
output.push(FormatCommand::Text(before.to_string()));
|
|
}
|
|
// Look for column as we're now at one
|
|
let mut column = String::new();
|
|
|
|
while let Some(c) = loop_input.next() {
|
|
if c == '}' {
|
|
break;
|
|
}
|
|
column.push(c);
|
|
}
|
|
|
|
if !column.is_empty() {
|
|
output.push(FormatCommand::Column(column.to_string()));
|
|
}
|
|
|
|
if before.is_empty() && column.is_empty() {
|
|
break;
|
|
}
|
|
}
|
|
|
|
output
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::Format;
|
|
use super::ShellError;
|
|
|
|
#[test]
|
|
fn examples_work_as_expected() -> Result<(), ShellError> {
|
|
use crate::examples::test as test_examples;
|
|
|
|
Ok(test_examples(Format {})?)
|
|
}
|
|
}
|