mirror of
https://github.com/nushell/nushell.git
synced 2025-04-11 14:58:21 +02:00
* Moves off of draining between filters. Instead, the sink will pull on the stream, and will drain element-wise. This moves the whole stream to being lazy. * Adds ctrl-c support and connects it into some of the key points where we pull on the stream. If a ctrl-c is detect, we immediately halt pulling on the stream and return to the prompt. * Moves away from having a SourceMap where anchor locations are stored. Now AnchorLocation is kept directly in the Tag. * To make this possible, split tag and span. Span is largely used in the parser and is copyable. Tag is now no longer copyable.
121 lines
3.4 KiB
Rust
121 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>,
|
|
) -> Tagged<Value> {
|
|
let mut second = TaggedDictBuilder::new(tag);
|
|
|
|
for (key, value) in v.into_iter() {
|
|
second.insert(key.clone(), Primitive::String(value.clone()));
|
|
}
|
|
|
|
second.into_tagged_value()
|
|
}
|
|
|
|
fn convert_ini_top_to_nu_value(
|
|
v: &HashMap<String, HashMap<String, String>>,
|
|
tag: impl Into<Tag>,
|
|
) -> Tagged<Value> {
|
|
let tag = tag.into();
|
|
let mut top_level = TaggedDictBuilder::new(tag.clone());
|
|
|
|
for (key, value) in v.iter() {
|
|
top_level.insert_tagged(
|
|
key.clone(),
|
|
convert_ini_second_to_nu_value(value, tag.clone()),
|
|
);
|
|
}
|
|
|
|
top_level.into_tagged_value()
|
|
}
|
|
|
|
pub fn from_ini_string_to_value(
|
|
s: String,
|
|
tag: impl Into<Tag>,
|
|
) -> Result<Tagged<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 input = args.input;
|
|
|
|
let stream = async_stream! {
|
|
let values: Vec<Tagged<Value>> = input.values.collect().await;
|
|
|
|
let mut concat_string = String::new();
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
for value in values {
|
|
let value_tag = value.tag();
|
|
latest_tag = Some(value_tag.clone());
|
|
match value.item {
|
|
Value::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",
|
|
&tag,
|
|
"value originates from here",
|
|
&value_tag,
|
|
)),
|
|
|
|
}
|
|
}
|
|
|
|
match from_ini_string_to_value(concat_string, tag.clone()) {
|
|
Ok(x) => match x {
|
|
Tagged { item: Value::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())
|
|
}
|