From e25deffa749836297fa3eb9dc121e7904b141d81 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 28 Jan 2019 18:25:47 -0500
Subject: [PATCH] [libcalamares] Implement most of dumpYaml

 - Write out bools, strings, lists and maps; this is enough to
   read and reproduce settings.conf
 - Fix infinite loop in writeIndent()
---
 src/libcalamares/utils/YamlUtils.cpp | 46 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/utils/YamlUtils.cpp b/src/libcalamares/utils/YamlUtils.cpp
index 80e2a316a..48295851c 100644
--- a/src/libcalamares/utils/YamlUtils.cpp
+++ b/src/libcalamares/utils/YamlUtils.cpp
@@ -207,8 +207,47 @@ loadYaml(const QString& filename, bool* ok)
 static void
 writeIndent( QFile& f, int indent )
 {
-    while ( indent > 0 )
-        f.write( "    " );
+    while ( indent-- > 0 )
+        f.write( "  " );
+}
+
+// forward declaration
+static bool dumpYaml( QFile& f, const QVariantMap& map, int indent );
+
+/// @brief Recursive helper to dump a single value
+static void
+dumpYamlElement( QFile& f, const QVariant& value, int indent )
+{
+    if ( value.type() == QVariant::Type::Bool )
+        f.write( value.toBool() ? "true" : "false" );
+    else if ( value.type() == QVariant::Type::String )
+    {
+        static const char quote[] = "\"";
+        f.write( quote );
+        f.write( value.toString().toUtf8() );
+        f.write( quote );
+    }
+    else if ( value.type() == QVariant::Type::List )
+    {
+        int c = 0;
+        for ( const auto& it : value.toList() )
+        {
+            f.write( "\n" );
+            writeIndent( f, indent+1 );
+            f.write( "- " );
+            dumpYamlElement( f, it, indent+1 );
+        }
+    }
+    else if ( value.type() == QVariant::Type::Map )
+    {
+        dumpYaml( f, value.toMap(), indent+1 );
+    }
+    else
+    {
+        f.write( "<" );
+        f.write( value.typeName() );
+        f.write( ">" );
+    }
 }
 
 /// @brief Recursive helper to dump @p map to file
@@ -217,8 +256,9 @@ dumpYaml( QFile& f, const QVariantMap& map, int indent )
 {
     for ( auto it = map.cbegin(); it != map.cend(); ++it )
     {
-        writeIndent( f, indent );
         f.write( it.key().toUtf8() );
+        f.write( ": " );
+        dumpYamlElement( f, it.value(), indent );
         f.write( "\n" );
     }
     return true;