From f3aa253b07db63488b0b367fd9159400c40d41d1 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 17 Mar 2016 22:23:07 -0400 Subject: [PATCH] Rules: Replacing Configuration --- src/init.cpp | 12 +++++------- src/timew.cpp | 5 +++-- src/timew.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 2c6fb794..30966818 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -55,6 +55,7 @@ bool lightweightVersionCheck (const std::vector & args) //////////////////////////////////////////////////////////////////////////////// void initializeData ( Database& database, + Rules& rules, Log& log) { // The $TIMEWARRIORDB environment variable overrides the default value of @@ -88,7 +89,7 @@ void initializeData ( if (! extensions.exists ()) extensions.create (0700); - // Create extensions subdirectory if necessary. + // Create data subdirectory if necessary. Directory data (dbLocation); data += "data"; if (! data.exists ()) @@ -107,22 +108,19 @@ void initializeData ( File configFile (dbLocation); configFile += "timewarrior.cfg"; configFile.create (0600); -/* - configuration.load (configFile._data); -*/ // This value is not written out to disk, as there would be no point. Having // located the config file, the 'db' location is already known. This is just // for subsequent internal use. /* - configuration.set ("db", dbLocation._data); - log.write ("info", std::string (" rc.db=") + configuration.get ("db")); + rules.set ("db", dbLocation._data); + log.write ("info", std::string (" rc.db=") + rules.get ("db")); */ // Perhaps some subsequent code would like to know this is a new db and // possibly a first run. /* - configuration.set ("shiny", (shinyNewDatabase ? 1 : 0)); + rules.set ("shiny", (shinyNewDatabase ? 1 : 0)); */ // Initialize the database (no data read), but files are enumerated. diff --git a/src/timew.cpp b/src/timew.cpp index 304a3b5e..fe2839f5 100644 --- a/src/timew.cpp +++ b/src/timew.cpp @@ -30,6 +30,7 @@ #include #include //#include +#include #include #include #include @@ -61,7 +62,8 @@ int main (int argc, const char** argv) { // Prepare the database, but do not read data. Database database; - initializeData (database, log); + Rules rules; + initializeData (database, rules, log); // TODO Arrange the following to minimize memory use. // TODO Load CLI grammar. @@ -81,7 +83,6 @@ int main (int argc, const char** argv) */ // Load the rules. - Rules rules; initializeRules (rules, log); // Load extension script info. diff --git a/src/timew.h b/src/timew.h index 23db97ac..ca7e3cc4 100644 --- a/src/timew.h +++ b/src/timew.h @@ -34,7 +34,7 @@ // init.cpp bool lightweightVersionCheck (const std::vector &); -void initializeData (Database&, Log&); +void initializeData (Database&, Rules&, Log&); void initializeRules (Rules&, Log&); void initializeExtensions (Rules&, Extensions&, Log&); int dispatchCommand (const std::vector &, Database&, Rules&, Extensions&, Log&);