From c94c66377111d752b53ac8aad082848582771338 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathan.d.turner@gmail.com>
Date: Tue, 16 Jul 2019 16:03:28 +1200
Subject: [PATCH] Fix up some of the save formats

---
 src/cli.rs           |  1 +
 src/commands.rs      |  1 +
 src/commands/save.rs | 19 +++++++------------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index 8165c87472..03025ebec3 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -179,6 +179,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
             command("to-array", Box::new(to_array::to_array)),
             command("to-json", Box::new(to_json::to_json)),
             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)),
             Arc::new(Open),
diff --git a/src/commands.rs b/src/commands.rs
index 3225923481..755d46ca1a 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -35,6 +35,7 @@ crate mod table;
 crate mod to_array;
 crate mod to_json;
 crate mod to_toml;
+crate mod to_yaml;
 crate mod trim;
 crate mod view;
 crate mod vtable;
diff --git a/src/commands/save.rs b/src/commands/save.rs
index 6c61df3f94..0a236117f5 100644
--- a/src/commands/save.rs
+++ b/src/commands/save.rs
@@ -1,4 +1,7 @@
 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::object::{Primitive, Value};
 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)",
                 ));
             }
-            toml::to_string(&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()
+            toml::to_string(&value_to_toml_value(&args.input[0])).unwrap()
         }
         Some(x) if x == "json" && !save_raw => {
             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)",
                 ));
             }
-            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 => {
             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)",
                 ));
             }
-            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 => {
             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)",
                 ));
             }
-            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();