GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CmdConfig: Passed Rules to the set/unset functions

Browse source
This commit is contained in:
Paul Beckingham 2016-05-05 19:52:00 -04:00
parent b441f0c020
commit b419a97d8b
1 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/commands/CmdConfig.cpp
View file

@ -32,7 +32,10 @@
#include <iostream>
////////////////////////////////////////////////////////////////////////////////
static bool setConfigVariable (std::string name, std::string value, bool confirmation /* = false */)
// Note that because this function does not recurse with includes, it therefore
// only sees the top-level settings. This has the desirable effect of adding as
// an override any setting which resides in an imported file.
static bool setConfigVariable (const Rules& rules, std::string name, std::string value, bool confirmation /* = false */)
{
bool change = false;
@ -40,30 +43,20 @@ static bool setConfigVariable (std::string name, std::string value, bool confirm
}
////////////////////////////////////////////////////////////////////////////////
static int unsetConfigVariable (std::string name, bool confirmation /* = false */)
// Removes lines from configuration but leaves comments intact.
//
// Return codes:
// 0 - found and removed
// 1 - found and not removed
// 2 - not found
static int unsetConfigVariable (const Rules& rules, std::string name, bool confirmation /* = false */)
{
return 0;
}
////////////////////////////////////////////////////////////////////////////////
// a.b.c.d = 1
// a.b.d = 2
// a.b.e = 3
// b.d.e = 4
// f = 5
//
// define a:
// b:
// c:
// d = 1
// d = 2
// e = 3
//
// define b:
// d:
// e = 4
//
// f = 5
// 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)
{
for (auto& name : rules.all ())
@ -71,16 +64,14 @@ static void showAllSettings (const Rules& rules)
}
////////////////////////////////////////////////////////////////////////////////
// timew config name value Set name=value
// timew config name '' Set name=''
// timew config name Remove name
// timew config Show all config
int CmdConfig (
const CLI& cli,
Rules& rules)
{
// Determine form:
// timew config name value Set name=value
// timew config name '' Set name=''
// timew config name Remove name
// TODO timew config Show all config
int rc = 0;
// Get the command line args that are not binary, ext or command.
@ -115,13 +106,13 @@ int CmdConfig (
// task config name value
// task config name ""
if (words.size () > 1)
change = setConfigVariable(name, value, confirmation);
change = setConfigVariable (rules, name, value, confirmation);
// task config name
else
{
bool found = false;
rc = unsetConfigVariable(name, confirmation);
rc = unsetConfigVariable (rules, name, confirmation);
if (rc == 0)
{
change = true;