Config: Migrated to libshared Configuration

src/CMakeLists.txt

@@ -7,7 +7,6 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 add_library (task CLI2.cpp CLI2.h
-                  Config.cpp Config.h
                   Context.cpp Context.h
                   DOM.cpp DOM.h
                   Dates.cpp Dates.h
@@ -32,6 +31,7 @@ add_library (task CLI2.cpp CLI2.h
                   util.cpp util.h)
 
 add_library (libshared libshared/src/Color.cpp         libshared/src/Color.h
+                       libshared/src/Configuration.cpp libshared/src/Configuration.h
                        libshared/src/Datetime.cpp      libshared/src/Datetime.h
                        libshared/src/Duration.cpp      libshared/src/Duration.h
                        libshared/src/FS.cpp            libshared/src/FS.h

src/Context.cpp

@@ -1071,9 +1071,7 @@ void Context::staticInitialization ()
   Task::urgencyAgeMax                 = config.getReal ("urgency.age.max");
 
   // Tag- and project-specific coefficients.
-  std::vector <std::string> all;
-  config.all (all);
-  for (auto& var : all)
+  for (auto& var : config.all ())
     if (var.substr (0, 13) == "urgency.user." ||
         var.substr (0, 12) == "urgency.uda.")
       Task::coefficients[var] = config.getReal (var);

src/Context.h

@@ -29,7 +29,7 @@
 
 #include <Command.h>
 #include <Column.h>
-#include <Config.h>
+#include <Configuration.h>
 #include <Task.h>
 #include <TDB2.h>
 #include <Hooks.h>
@@ -81,7 +81,7 @@ public:
   std::string                         home_dir            {};
   File                                rc_file             {"~/.taskrc"};
   Path                                data_dir            {"~/.task"};
-  Config                              config              {};
+  Configuration                       config              {};
   TDB2                                tdb2                {};
   Hooks                               hooks               {};
   bool                                determine_color_use {true};

src/commands/CmdConfig.cpp

@@ -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)

src/commands/CmdDiagnostics.cpp

@@ -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

src/commands/CmdShow.cpp

@@ -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.