mirror of
https://github.com/nushell/nushell.git
synced 2025-04-15 16:58:19 +02:00
d9d6cea5a9
* Make json require string and pass around metadata The json deserializer was accepting any inputs by coercing non-strings into strings. As an example, if the input was `[1, 2]` the coercion would turn into `[12]` and deserialize as a list containing number twelve instead of a list of two numbers, one and two. This could lead to silent data corruption. Aside from that pipeline metadata wasn't passed aroud. This commit fixes the type issue by adding a strict conversion function that errors if the input type is not a string or external stream. It then uses this function instead of the original `collect_string()`. In addition, this function returns the pipeline metadata so it can be passed along. * Make other formats require string The problem with json coercing non-string types to string was present in all other text formats. This reuses the `collect_string_strict` function to fix them. * `IntoPipelineData` cleanup The method `into_pipeline_data_with_metadata` can now be conveniently used.
111 lines
3.2 KiB
Rust
111 lines
3.2 KiB
Rust
use indexmap::map::IndexMap;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct FromIni;
|
|
|
|
impl Command for FromIni {
|
|
fn name(&self) -> &str {
|
|
"from ini"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from ini")
|
|
.input_output_types(vec![(Type::String, Type::Record(vec![]))])
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .ini and create record"
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
example: "'[foo]
|
|
a=1
|
|
b=2' | from ini",
|
|
description: "Converts ini formatted string to record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["foo".to_string()],
|
|
vals: vec![Value::Record {
|
|
cols: vec!["a".to_string(), "b".to_string()],
|
|
vals: vec![
|
|
Value::String {
|
|
val: "1".to_string(),
|
|
span: Span::test_data(),
|
|
},
|
|
Value::String {
|
|
val: "2".to_string(),
|
|
span: Span::test_data(),
|
|
},
|
|
],
|
|
span: Span::test_data(),
|
|
}],
|
|
span: Span::test_data(),
|
|
}),
|
|
}]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
_engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, ShellError> {
|
|
let head = call.head;
|
|
from_ini(input, head)
|
|
}
|
|
}
|
|
|
|
pub fn from_ini_string_to_value(s: String, span: Span) -> Result<Value, ShellError> {
|
|
let v: Result<IndexMap<String, IndexMap<String, String>>, serde_ini::de::Error> =
|
|
serde_ini::from_str(&s);
|
|
match v {
|
|
Ok(index_map) => {
|
|
let (cols, vals) = index_map
|
|
.into_iter()
|
|
.fold((vec![], vec![]), |mut acc, (k, v)| {
|
|
let (cols, vals) = v.into_iter().fold((vec![], vec![]), |mut acc, (k, v)| {
|
|
acc.0.push(k);
|
|
acc.1.push(Value::String { val: v, span });
|
|
acc
|
|
});
|
|
acc.0.push(k);
|
|
acc.1.push(Value::Record { cols, vals, span });
|
|
acc
|
|
});
|
|
Ok(Value::Record { cols, vals, span })
|
|
}
|
|
Err(err) => Err(ShellError::UnsupportedInput(
|
|
format!("Could not load ini: {}", err),
|
|
span,
|
|
)),
|
|
}
|
|
}
|
|
|
|
fn from_ini(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
|
|
let (concat_string, metadata) = input.collect_string_strict(head)?;
|
|
|
|
match from_ini_string_to_value(concat_string, head) {
|
|
Ok(x) => Ok(x.into_pipeline_data_with_metadata(metadata)),
|
|
Err(other) => Err(other),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(FromIni {})
|
|
}
|
|
}
|