TDB2 Conversion

- Migrated several commands over to use TDB2.  Have to start somewhere.

src/TDB2.cpp

@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-//#include <iostream> // TODO Remove.
+#include <iostream> // TODO Remove.
 #include <Context.h>
 #include <Color.h>
 #include <text.h>
@@ -98,6 +98,13 @@ void TF2::add_task (const Task& task)
 
   _tasks.push_back (task);           // For subsequent queries
   _added_tasks.push_back (task);     // For commit/synch
+
+/*
+  int id = next_id ();
+  _I2U[id] = task.get ("uuid");
+  _U2I[task.get ("uuid")] = id;
+*/
+
   _dirty = true;
 }
 
@@ -237,6 +244,25 @@ void TF2::commit ()
 */
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void TF2::commitUndo ()
+{
+/*
+  for each _added_task
+    fprintf (file,
+             "time %u\nnew %s---\n",
+             (unsigned int) time (NULL),
+             after.composeF4 ().c_str ());
+
+  for each _modified_task
+    fprintf (file,
+             "time %u\nold %snew %s---\n",
+             (unsigned int) time (NULL),
+             before.composeF4 ().c_str (),
+             after.composeF4 ().c_str ());
+*/
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void TF2::load_tasks ()
 {
@@ -451,6 +477,7 @@ void TDB2::add (const Task& task)
   else
     pending.add_task (task);
 
+  undo.add_task (task);
   backlog.add_task (task);
 }
 
@@ -477,7 +504,7 @@ void TDB2::commit ()
 
   pending.commit ();
   completed.commit ();
-  undo.commit ();
+  undo.commitUndo ();
   backlog.commit ();
   synch_key.commit ();
 

src/TDB2.h

@@ -54,6 +54,7 @@ public:
   void add_line (const std::string&);
   void clear_lines ();
   void commit ();
+  void commitUndo ();
 
   void load_tasks ();
   void load_lines ();

src/commands/CmdCount.cpp

@@ -48,17 +48,9 @@ CmdCount::CmdCount ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCount::execute (std::string& output)
 {
-  // Get all the tasks.
-  std::vector <Task> tasks;
-  context.tdb.lock (context.config.getBoolean ("locking"));
-  handleRecurrence ();
-  context.tdb.load (tasks);
-  context.tdb.commit ();
-  context.tdb.unlock ();
-
   // Apply filter.
   std::vector <Task> filtered;
-  filter (tasks, filtered);
+  filter (filtered);
 
   // Find number of matching tasks.  Skip recurring parent tasks.
   int count = 0;

src/commands/CmdCustom.cpp

@@ -93,7 +93,6 @@ int CmdCustom::execute (std::string& output)
 
   // Load the data.
   handleRecurrence ();
-  context.tdb2.commit ();
   std::vector <Task> filtered;
   filter (filtered);
 
@@ -177,6 +176,8 @@ int CmdCustom::execute (std::string& output)
     rc = 1;
   }
 
+  context.tdb2.commit ();
+
   output = out.str ();
   return rc;
 }

src/commands/CmdIDs.cpp

@@ -50,17 +50,11 @@ CmdIDs::CmdIDs ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdIDs::execute (std::string& output)
 {
-  // Scan the pending tasks, applying any filter.
-  std::vector <Task> tasks;
-  context.tdb.lock (context.config.getBoolean ("locking"));
-  handleRecurrence ();
-  context.tdb.load (tasks);
-  context.tdb.commit ();
-  context.tdb.unlock ();
-
   // Apply filter.
+  handleRecurrence ();
   std::vector <Task> filtered;
-  filter (tasks, filtered);
+  filter (filtered);
+  context.tdb.commit ();
 
   // Find number of matching tasks.
   std::vector <int> ids;
@@ -87,15 +81,11 @@ CmdCompletionIds::CmdCompletionIds ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionIds::execute (std::string& output)
 {
-  std::vector <Task> tasks;
-  context.tdb.lock (context.config.getBoolean ("locking"));
-  context.tdb.loadPending (tasks);
-  context.tdb.commit ();
-  context.tdb.unlock ();
-
   // Apply filter.
+  handleRecurrence ();
   std::vector <Task> filtered;
-  filter (tasks, filtered);
+  filter (filtered);
+  context.tdb.commit ();
 
   std::vector <int> ids;
   std::vector <Task>::iterator task;
@@ -128,15 +118,11 @@ CmdZshCompletionIds::CmdZshCompletionIds ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdZshCompletionIds::execute (std::string& output)
 {
-  std::vector <Task> tasks;
-  context.tdb.lock (context.config.getBoolean ("locking"));
-  context.tdb.loadPending (tasks);
-  context.tdb.commit ();
-  context.tdb.unlock ();
-
   // Apply filter.
+  handleRecurrence ();
   std::vector <Task> filtered;
-  filter (tasks, filtered);
+  filter (filtered);
+  context.tdb.commit ();
 
   std::stringstream out;
   std::vector <Task>::iterator task;

src/commands/CmdStatistics.cpp

@@ -81,16 +81,9 @@ int CmdStatistics::execute (std::string& output)
       ++undoCount;
 
   // Get all the tasks.
-  std::vector <Task> tasks;
-  context.tdb.lock (context.config.getBoolean ("locking"));
-  handleRecurrence ();
-  context.tdb.load (tasks);
-  context.tdb.commit ();
-  context.tdb.unlock ();
-
-  // Apply filter.
   std::vector <Task> filtered;
-  filter (tasks, filtered);
+  filter (context.tdb2.pending.get_tasks (), filtered);
+  filter (context.tdb2.completed.get_tasks (), filtered);
 
   Date now;
   time_t earliest   = time (NULL);

src/commands/Command.cpp

@@ -267,7 +267,7 @@ bool Command::displays_id () const
 
 ////////////////////////////////////////////////////////////////////////////////
 // Filter a specific list of tasks.
-void Command::filter (std::vector <Task>& input, std::vector <Task>& output)
+void Command::filter (const std::vector <Task>& input, std::vector <Task>& output)
 {
   context.timer_filter.start ();
 
@@ -278,7 +278,7 @@ void Command::filter (std::vector <Task>& input, std::vector <Task>& output)
   {
     E9 e (filt);
 
-    std::vector <Task>::iterator task;
+    std::vector <Task>::const_iterator task;
     for (task = input.begin (); task != input.end (); ++task)
       if (e.evalFilter (*task))
         output.push_back (*task);

src/commands/Command.h

@@ -53,7 +53,7 @@ public:
   virtual int execute (std::string&) = 0;
 
 protected:
-  void filter (std::vector <Task>&, std::vector <Task>&);
+  void filter (const std::vector <Task>&, std::vector <Task>&);
   void filter (std::vector <Task>&);
   bool filter_shortcut (const A3&);