Indented toml config files for improved legibility (#4558)

nano/lib/tomlconfig.cpp

@@ -186,25 +186,24 @@ void nano::tomlconfig::erase_default_values (tomlconfig & defaults_a)
 	erase_defaults (defaults_l.get_tree (), self.get_tree (), get_tree ());
 }
 
-std::string nano::tomlconfig::to_string ()
-{
-	std::stringstream ss;
-	cpptoml::toml_writer writer{ ss, "" };
-	tree->accept (writer);
-	return ss.str ();
-}
-
-std::string nano::tomlconfig::to_string_commented_entries ()
+std::string nano::tomlconfig::to_string (bool comment_values)
 {
 	std::stringstream ss, ss_processed;
 	cpptoml::toml_writer writer{ ss, "" };
 	tree->accept (writer);
 	std::string line;
 	while (std::getline (ss, line, '\n'))
 	{
-		if (!line.empty () && line[0] != '#' && line[0] != '[')
+		if (!line.empty () && line[0] != '[')
 		{
-			line = "#" + line;
+			if (line[0] == '#') // Already commented
+			{
+				line = "\t" + line;
+			}
+			else
+			{
+				line = comment_values ? "\t# " + line : "\t" + line;
+			}
 		}
 		ss_processed << line << std::endl;
 	}

nano/lib/tomlconfig.hpp

@@ -47,8 +47,7 @@ class tomlconfig : public nano::configbase
 	tomlconfig & erase (std::string const & key_a);
 	std::shared_ptr<cpptoml::array> create_array (std::string const & key, boost::optional<char const *> documentation_a);
 	void erase_default_values (tomlconfig & defaults_a);
-	std::string to_string ();
-	std::string to_string_commented_entries ();
+	std::string to_string (bool comment_values);
 
 	/** Set value for the given key. Any existing value will be overwritten. */
 	template <typename T>

nano/node/cli.cpp

@@ -703,11 +703,11 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
 
 			if (vm.count ("use_defaults"))
 			{
-				std::cout << toml.to_string () << std::endl;
+				std::cout << toml.to_string (false) << std::endl;
 			}
 			else
 			{
-				std::cout << toml.to_string_commented_entries () << std::endl;
+				std::cout << toml.to_string (true) << std::endl;
 			}
 		}
 	}