extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-30 14:50:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up some of the save formats

Browse Source
This commit is contained in:
Jonathan Turner 2019-07-16 16:03:28 +12:00
parent 60f4436849
commit c94c663771
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cli.rs
View File

@ -179,6 +179,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
command("to-array", Box::new(to_array::to_array)), command("to-array", Box::new(to_array::to_array)),
command("to-json", Box::new(to_json::to_json)), command("to-json", Box::new(to_json::to_json)),
command("to-toml", Box::new(to_toml::to_toml)), command("to-toml", Box::new(to_toml::to_toml)),
command("to-yaml", Box::new(to_yaml::to_yaml)),
command("sort-by", Box::new(sort_by::sort_by)), command("sort-by", Box::new(sort_by::sort_by)),
command("sort-by", Box::new(sort_by::sort_by)), command("sort-by", Box::new(sort_by::sort_by)),
Arc::new(Open), Arc::new(Open),

1
src/commands.rs
View File

@ -35,6 +35,7 @@ crate mod table;
crate mod to_array; crate mod to_array;
crate mod to_json; crate mod to_json;
crate mod to_toml; crate mod to_toml;
crate mod to_yaml;
crate mod trim; crate mod trim;
crate mod view; crate mod view;
crate mod vtable; crate mod vtable;

19
src/commands/save.rs
View File

@ -1,4 +1,7 @@
use crate::commands::command::SinkCommandArgs; use crate::commands::command::SinkCommandArgs;
use crate::commands::to_json::value_to_json_value;
use crate::commands::to_toml::value_to_toml_value;
use crate::commands::to_yaml::value_to_yaml_value;
use crate::errors::ShellError; use crate::errors::ShellError;
use crate::object::{Primitive, Value}; use crate::object::{Primitive, Value};
use crate::parser::Spanned; use crate::parser::Spanned;
@ -48,15 +51,7 @@ pub fn save(args: SinkCommandArgs) -> Result<(), ShellError> {
"saving to toml requires a single object (or use --raw)", "saving to toml requires a single object (or use --raw)",
)); ));
} }
toml::to_string(&args.input[0]).unwrap() toml::to_string(&value_to_toml_value(&args.input[0])).unwrap()
}
Some(x) if x == "ini" && !save_raw => {
if args.input.len() != 1 {
return Err(ShellError::string(
"saving to ini requires a single object (or use --raw)",
));
}
serde_ini::to_string(&args.input[0]).unwrap()
} }
Some(x) if x == "json" && !save_raw => { Some(x) if x == "json" && !save_raw => {
if args.input.len() != 1 { if args.input.len() != 1 {
@ -64,7 +59,7 @@ pub fn save(args: SinkCommandArgs) -> Result<(), ShellError> {
"saving to json requires a single object (or use --raw)", "saving to json requires a single object (or use --raw)",
)); ));
} }
serde_json::to_string(&args.input[0]).unwrap() serde_json::to_string(&value_to_json_value(&args.input[0])).unwrap()
} }
Some(x) if x == "yml" && !save_raw => { Some(x) if x == "yml" && !save_raw => {
if args.input.len() != 1 { if args.input.len() != 1 {
@ -72,7 +67,7 @@ pub fn save(args: SinkCommandArgs) -> Result<(), ShellError> {
"saving to yml requires a single object (or use --raw)", "saving to yml requires a single object (or use --raw)",
)); ));
} }
serde_yaml::to_string(&args.input[0]).unwrap() serde_yaml::to_string(&value_to_yaml_value(&args.input[0])).unwrap()
} }
Some(x) if x == "yaml" && !save_raw => { Some(x) if x == "yaml" && !save_raw => {
if args.input.len() != 1 { if args.input.len() != 1 {
@ -80,7 +75,7 @@ pub fn save(args: SinkCommandArgs) -> Result<(), ShellError> {
"saving to yaml requires a single object (or use --raw)", "saving to yaml requires a single object (or use --raw)",
)); ));
} }
serde_yaml::to_string(&args.input[0]).unwrap() serde_yaml::to_string(&value_to_yaml_value(&args.input[0])).unwrap()
} }
_ => { _ => {
let mut save_data = String::new(); let mut save_data = String::new();