GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-09 18:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Config: Migrated to libshared Configuration

Browse source
This commit is contained in:
Paul Beckingham 2017-02-26 10:46:51 -05:00
parent a31434fd48
commit dd4fef6794
9 changed files with 19 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/commands/CmdConfig.cpp
View file

@ -60,7 +60,7 @@ bool CmdConfig::setConfigVariable (
{
// Read .taskrc (or equivalent)
std::vector <std::string> contents;
File::read (context.config._original_file, contents);
File::read (context.config.file (), contents);
auto found = false;
auto change = false;
@ -99,7 +99,7 @@ bool CmdConfig::setConfigVariable (
}
if (change)
File::write (context.config._original_file, contents);
File::write (context.config.file (), contents);
return change;
}
@ -109,7 +109,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
{
// Read .taskrc (or equivalent)
std::vector <std::string> contents;
File::read (context.config._original_file, contents);
File::read (context.config.file (), contents);
auto found = false;
auto change = false;
@ -144,7 +144,7 @@ int CmdConfig::unsetConfigVariable (const std::string& name, bool confirmation /
}
if (change)
File::write (context.config._original_file, contents);
File::write (context.config.file (), contents);
if (change && found)
return 0;
@ -216,7 +216,7 @@ int CmdConfig::execute (std::string& output)
if (change)
{
out << format (STRING_CMD_CONFIG_FILE_MOD,
context.config._original_file._data)
context.config.file ())
<< '\n';
}
else
@ -252,8 +252,7 @@ CmdCompletionConfig::CmdCompletionConfig ()
////////////////////////////////////////////////////////////////////////////////
int CmdCompletionConfig::execute (std::string& output)
{
std::vector <std::string> configs;
context.config.all (configs);
auto configs = context.config.all ();
std::sort (configs.begin (), configs.end ());
for (const auto& config : configs)

9
src/commands/CmdDiagnostics.cpp
View file

@ -163,16 +163,17 @@ int CmdDiagnostics::execute (std::string& output)
<< "\n\n";
// Config: .taskrc found, readable, writable
File rcFile (context.config.file ());
out << bold.colorize (STRING_CMD_DIAG_CONFIG)
<< '\n'
<< " File: " << context.config._original_file._data << ' '
<< (context.config._original_file.exists ()
<< " File: " << rcFile._data << ' '
<< (rcFile.exists ()
? STRING_CMD_DIAG_FOUND
: STRING_CMD_DIAG_MISSING)
<< ", " << context.config._original_file.size () << ' ' << "bytes"
<< ", " << rcFile.size () << ' ' << "bytes"
<< ", mode "
<< std::setbase (8)
<< context.config._original_file.mode ()
<< rcFile.mode ()
<< '\n';
// Config: data.location found, readable, writable

9
src/commands/CmdShow.cpp
View file

@ -253,7 +253,7 @@ int CmdShow::execute (std::string& output)
// Find all the values that match the defaults, for highlighting.
std::vector <std::string> default_values;
Config default_config;
Configuration default_config;
default_config.parse (configurationDefaults);
for (auto& i : context.config)
@ -411,11 +411,8 @@ CmdShowRaw::CmdShowRaw ()
////////////////////////////////////////////////////////////////////////////////
int CmdShowRaw::execute (std::string& output)
{
// Get all the settings.
std::vector <std::string> all;
context.config.all (all);
// Sort alphabetically by name.
// Get all the settings and sort alphabetically by name.
auto all = context.config.all ();
std::sort (all.begin (), all.end ());
// Display them all.