From e56062da69a6fcf5dc8706c5a98eeb3d571ba80f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 6 May 2016 00:12:56 -0400 Subject: [PATCH] CmdConfig: Now delegates to Cmdshow --- src/commands/CmdConfig.cpp | 59 ++------------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp index 80abb903..f21e8f00 100644 --- a/src/commands/CmdConfig.cpp +++ b/src/commands/CmdConfig.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -210,60 +211,6 @@ static int unsetConfigVariable (const Rules& rules, std::string name, bool confi return 2; } -//////////////////////////////////////////////////////////////////////////////// -// Shows all settings except "temp.*" in a hierarchical form that is ingestible -// by the Rules object. This allows copy/paste. -static void showAllSettings (const Rules& rules) -{ - // Obtain and sort the names. Sorting is critical. - auto names = rules.all (); - std::sort (names.begin (), names.end ()); - - std::vector previous {}; - for (auto& name : rules.all ()) - { - if (name.substr (0, 5) == "temp.") - continue; - - auto parts = split (name, '.'); - for (unsigned int i = 0; i < parts.size (); ++i) - { - // The last part is special. - if (i == parts.size () - 1) - { - if (previous.size () > 1 && - parts.size () == 1) - std::cout << '\n'; - - std::cout << std::string (2 * (parts.size () - 1), ' ') - << parts[i] - << " = " - << rules.get (name) - << "\n"; - } - else - { - if (previous.size () <= i || - previous[i] != parts[i]) - { - if (i == 0) - { - std::cout << '\n'; - if (rules.isRuleType (parts[0])) - std::cout << "define "; - } - - std::cout << std::string (2 * i, ' ') - << parts[i] - << ":\n"; - } - } - } - - previous = parts; - } -} - //////////////////////////////////////////////////////////////////////////////// // timew config name value Set name=value // timew config name '' Set name='' @@ -336,10 +283,10 @@ int CmdConfig ( std::cout << "No changes made.\n"; } else - showAllSettings (rules); + CmdShow (rules); } else - showAllSettings (rules); + CmdShow (rules); return rc; }