f70c6d5d48
This commit extracts Tag, Span, Text, as well as source-related debug facilities into a new crate called nu_source. This change is much bigger than one might have expected because the previous code relied heavily on implementing inherent methods on `Tagged<T>` and `Spanned<T>`, which is no longer possible. As a result, this change creates more concrete types instead of using `Tagged<T>`. One notable example: Tagged<Value> became Value, and Value became UntaggedValue. This change clarifies the intent of the code in many places, but it does make it a big change.
119 lines
3.4 KiB
Rust
119 lines
3.4 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::data::{Primitive, TaggedDictBuilder, Value};
|
|
use crate::prelude::*;
|
|
use std::collections::HashMap;
|
|
|
|
pub struct FromINI;
|
|
|
|
impl WholeStreamCommand for FromINI {
|
|
fn name(&self) -> &str {
|
|
"from-ini"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from-ini")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .ini and create table"
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
from_ini(args, registry)
|
|
}
|
|
}
|
|
|
|
fn convert_ini_second_to_nu_value(v: &HashMap<String, String>, tag: impl Into<Tag>) -> Value {
|
|
let mut second = TaggedDictBuilder::new(tag);
|
|
|
|
for (key, value) in v.into_iter() {
|
|
second.insert_untagged(key.clone(), Primitive::String(value.clone()));
|
|
}
|
|
|
|
second.into_value()
|
|
}
|
|
|
|
fn convert_ini_top_to_nu_value(
|
|
v: &HashMap<String, HashMap<String, String>>,
|
|
tag: impl Into<Tag>,
|
|
) -> Value {
|
|
let tag = tag.into();
|
|
let mut top_level = TaggedDictBuilder::new(tag.clone());
|
|
|
|
for (key, value) in v.iter() {
|
|
top_level.insert_value(
|
|
key.clone(),
|
|
convert_ini_second_to_nu_value(value, tag.clone()),
|
|
);
|
|
}
|
|
|
|
top_level.into_value()
|
|
}
|
|
|
|
pub fn from_ini_string_to_value(
|
|
s: String,
|
|
tag: impl Into<Tag>,
|
|
) -> Result<Value, serde_ini::de::Error> {
|
|
let v: HashMap<String, HashMap<String, String>> = serde_ini::from_str(&s)?;
|
|
Ok(convert_ini_top_to_nu_value(&v, tag))
|
|
}
|
|
|
|
fn from_ini(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
|
let args = args.evaluate_once(registry)?;
|
|
let tag = args.name_tag();
|
|
let span = tag.span;
|
|
let input = args.input;
|
|
|
|
let stream = async_stream! {
|
|
let values: Vec<Value> = input.values.collect().await;
|
|
|
|
let mut concat_string = String::new();
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
for value in values {
|
|
latest_tag = Some(value.tag.clone());
|
|
let value_span = value.tag.span;
|
|
match &value.value {
|
|
UntaggedValue::Primitive(Primitive::String(s)) => {
|
|
concat_string.push_str(&s);
|
|
concat_string.push_str("\n");
|
|
}
|
|
_ => yield Err(ShellError::labeled_error_with_secondary(
|
|
"Expected a string from pipeline",
|
|
"requires string input",
|
|
span,
|
|
"value originates from here",
|
|
value_span,
|
|
)),
|
|
|
|
}
|
|
}
|
|
|
|
match from_ini_string_to_value(concat_string, tag.clone()) {
|
|
Ok(x) => match x {
|
|
Value { value: UntaggedValue::Table(list), .. } => {
|
|
for l in list {
|
|
yield ReturnSuccess::value(l);
|
|
}
|
|
}
|
|
x => yield ReturnSuccess::value(x),
|
|
},
|
|
Err(_) => if let Some(last_tag) = latest_tag {
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
|
"Could not parse as INI",
|
|
"input cannot be parsed as INI",
|
|
&tag,
|
|
"value originates from here",
|
|
last_tag,
|
|
))
|
|
} ,
|
|
}
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|