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

init: Propagated CLI to initializeDataAndRules

Browse source
This commit is contained in:
Paul Beckingham 2016-04-04 07:58:39 -04:00
parent 0137c60878
commit e335e325be
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/init.cpp
View file

@ -82,6 +82,7 @@ void initializeEntities (CLI& cli)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void initializeDataAndRules ( void initializeDataAndRules (
CLI& cli,
Database& database, Database& database,
Rules& rules, Rules& rules,
Log& log) Log& log)

10
src/timew.cpp
View file

@ -69,17 +69,15 @@ int main (int argc, const char** argv)
} }
log.write ("command", commandLine); log.write ("command", commandLine);
cli.analyze ();
// TODO Remove.
std::cout << cli.dump () << "\n";
try try
{ {
// One-time command line scan.
cli.analyze ();
// Prepare the database, but do not read data. // Prepare the database, but do not read data.
Database database; Database database;
Rules rules; Rules rules;
initializeDataAndRules (database, rules, log); initializeDataAndRules (cli, database, rules, log);
// Load extension script info. // Load extension script info.
Extensions extensions; Extensions extensions;

2
src/timew.h
View file

@ -38,7 +38,7 @@
// init.cpp // init.cpp
bool lightweightVersionCheck (int, const char**); bool lightweightVersionCheck (int, const char**);
void initializeEntities (CLI&); void initializeEntities (CLI&);
void initializeDataAndRules (Database&, Rules&, Log&); void initializeDataAndRules (CLI&, Database&, Rules&, Log&);
void initializeExtensions (Rules&, Extensions&, Log&); void initializeExtensions (Rules&, Extensions&, Log&);
int dispatchCommand (CLI&, Database&, Rules&, Extensions&, Log&); int dispatchCommand (CLI&, Database&, Rules&, Extensions&, Log&);