New Command - append

- New "append" command concatenates additional text onto an existing
  task description.
- Added unit tests to append command.

src/command.cpp

@@ -724,6 +724,100 @@ std::string handleModify (TDB& tdb, T& task, Config& conf)
   return out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+std::string handleAppend (TDB& tdb, T& task, Config& conf)
+{
+  std::stringstream out;
+  std::vector <T> all;
+  tdb.pendingT (all);
+
+  std::vector <T>::iterator it;
+  for (it = all.begin (); it != all.end (); ++it)
+  {
+    if (it->getId () == task.getId ())
+    {
+      T original (*it);
+
+      // A non-zero value forces a file write.
+      int changes = 0;
+
+      // Apply a new description, if any.
+      if (task.getDescription () != "")
+      {
+        original.setDescription (original.getDescription () +
+                                 " " +
+                                task.getDescription ());
+        ++changes;
+      }
+
+      // Apply or remove tags, if any.
+      std::vector <std::string> tags;
+      task.getTags (tags);
+      for (unsigned int i = 0; i < tags.size (); ++i)
+      {
+        if (tags[i][0] == '+')
+          original.addTag (tags[i].substr (1, std::string::npos));
+        else
+          original.addTag (tags[i]);
+
+        ++changes;
+      }
+
+      task.getRemoveTags (tags);
+      for (unsigned int i = 0; i < tags.size (); ++i)
+      {
+        if (tags[i][0] == '-')
+          original.removeTag (tags[i].substr (1, std::string::npos));
+        else
+          original.removeTag (tags[i]);
+
+        ++changes;
+      }
+
+      // Apply or remove attributes, if any.
+      std::map <std::string, std::string> attributes;
+      task.getAttributes (attributes);
+      foreach (i, attributes)
+      {
+        if (i->second == "")
+          original.removeAttribute (i->first);
+        else
+          original.setAttribute (i->first, i->second);
+
+        ++changes;
+      }
+
+      std::string from;
+      std::string to;
+      task.getSubstitution (from, to);
+      if (from != "")
+      {
+        std::string description = original.getDescription ();
+        size_t pattern = description.find (from);
+        if (pattern != std::string::npos)
+        {
+          description = description.substr (0, pattern) +
+                        to                              +
+                        description.substr (pattern + from.length (), std::string::npos);
+          original.setDescription (description);
+          ++changes;
+        }
+      }
+
+      if (changes)
+      {
+        original.setId (task.getId ());
+        tdb.modifyT (original);
+      }
+
+      return out.str ();
+    }
+  }
+
+  throw std::string ("Task not found.");
+  return out.str ();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 std::string handleColor (Config& conf)
 {

src/parse.cpp

@@ -120,6 +120,7 @@ static const char* commands[] =
 {
   "active",
   "add",
+  "append",
   "calendar",
   "colors",
   "completed",
@@ -188,7 +189,6 @@ void guess (const std::string& type, std::vector<std::string>& options, std::str
     candidate = matches[0];
 
   else if (0 == matches.size ())
-//    throw std::string ("Unrecognized ") + type + " '" + candidate + "'";
     candidate = "";
 
   else

src/task.cpp

@@ -84,6 +84,10 @@ static std::string shortUsage (Config& conf)
   table.addCell (row, 1, "task add [tags] [attrs] desc...");
   table.addCell (row, 2, "Adds a new task");
 
+  row = table.addRow ();
+  table.addCell (row, 1, "task append [tags] [attrs] desc...");
+  table.addCell (row, 2, "Appends more description to an existing task");
+
   row = table.addRow ();
   table.addCell (row, 1, "task completed [tags] [attrs] desc...");
   table.addCell (row, 2, "Chronological listing of all completed tasks matching the specified criteria");
@@ -816,6 +820,7 @@ std::string runTaskCommand (
   // Commands that cause updates.
   else if (command == "" && task.getId ())  { cmdMod = true; out = handleModify   (tdb, task, conf); }
   else if (command == "add")                { cmdMod = true; out = handleAdd      (tdb, task, conf); }
+  else if (command == "append")             { cmdMod = true; out = handleAppend   (tdb, task, conf); }
   else if (command == "done")               { cmdMod = true; out = handleDone     (tdb, task, conf); }
   else if (command == "undelete")           { cmdMod = true; out = handleUndelete (tdb, task, conf); }
   else if (command == "delete")             { cmdMod = true; out = handleDelete   (tdb, task, conf); }

src/task.h

@@ -75,6 +75,7 @@ std::string runTaskCommand (std::vector <std::string>&, TDB&, Config&, bool gc =
 
 // command.cpp
 std::string handleAdd (TDB&, T&, Config&);
+std::string handleAppend (TDB&, T&, Config&);
 std::string handleExport (TDB&, T&, Config&);
 std::string handleDone (TDB&, T&, Config&);
 std::string handleModify (TDB&, T&, Config&);

src/tests/append.t

@@ -0,0 +1,55 @@
+#! /usr/bin/perl
+################################################################################
+## task - a command line task list manager.
+##
+## Copyright 2006 - 2009, Paul Beckingham.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 4;
+
+# Create the rc file.
+if (open my $fh, '>', 'append.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'append.rc', 'Created append.rc');
+}
+
+# Add a task, then append more decsription.
+qx{../task rc:append.rc add foo};
+qx{../task rc:append.rc 1 append bar};
+my $output = qx{../task rc:append.rc info 1};
+like ($output, qr/Description\s+foo\sbar\n/, 'append worked');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'append.rc';
+ok (!-r 'append.rc', 'Removed append.rc');
+
+exit 0;
+