Added first version of command 'annotate'

Closes #68
Closes #77

src/CLI.cpp

@@ -556,3 +556,20 @@ std::vector<std::string> CLI::getTags () const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+std::string CLI::getAnnotation () const
+{
+  std::string annotation;
+
+  for (auto& arg : _args)
+  {
+    if (arg.hasTag ("TAG"))
+    {
+      annotation = (arg.attribute ("raw"));
+    }
+
+  }
+
+  return annotation;
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/CLI.h

@@ -67,6 +67,7 @@ public:
   std::string getCommand () const;
   std::set <int> getIds () const;
   std::vector<std::string> getTags () const;
+  std::string getAnnotation() const;
   std::string dump (const std::string& title = "CLI Parser") const;
 
 private:

src/commands/CMakeLists.txt

@@ -5,7 +5,8 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src/libshared/src
                      ${TIMEW_INCLUDE_DIRS})
 
-set (commands_SRCS CmdCancel.cpp
+set (commands_SRCS CmdAnnotate.cpp
+                   CmdCancel.cpp
                    CmdChart.cpp
                    CmdConfig.cpp
                    CmdContinue.cpp

src/commands/CmdAnnotate.cpp

@@ -0,0 +1,114 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2018, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <commands.h>
+#include <format.h>
+#include <timew.h>
+#include <iostream>
+#include <stdlib.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int CmdAnnotate (
+  const CLI& cli,
+  Rules& rules,
+  Database& database)
+{
+  std::set <int> ids = cli.getIds ();
+  std::string annotation = cli.getAnnotation ();
+
+  // Load the data.
+  // Note: There is no filter.
+  Interval filter;
+  auto tracked = getTracked (database, rules, filter);
+
+  bool dirty = true;
+
+  database.startTransaction ();
+
+  for (auto& id : ids)
+  {
+    if (id > static_cast <int> (tracked.size ()))
+    {
+      throw format ("ID '@{1}' does not correspond to any tracking.", id);
+    }
+
+    if (tracked[tracked.size() - id].synthetic && dirty)
+    {
+      auto latest = getLatestInterval(database);
+      auto exclusions = getAllExclusions (rules, filter);
+
+      Interval modified {latest};
+
+      // Update database.
+      database.deleteInterval (latest);
+      for (auto& interval : flatten (modified, exclusions))
+        database.addInterval (interval, rules.getBoolean ("verbose"));
+
+      dirty = false;
+    }
+  }
+
+  if (ids.empty ())
+  {
+    if (tracked.empty ())
+    {
+      throw std::string ("There is no active time tracking.");
+    }
+
+    if (!tracked.back ().is_open ())
+    {
+      throw std::string ("At least one ID must be specified. See 'timew help annotate'.");
+    }
+
+    ids.insert (1);
+  }
+
+  // Apply tags to ids.
+  for (auto& id : ids)
+  {
+    if (id > static_cast <int> (tracked.size ()))
+    {
+      throw format ("ID '@{1}' does not correspond to any tracking.", id);
+    }
+
+    Interval i = tracked[tracked.size () - id];
+    i.setAnnotation (annotation);
+
+    database.modifyInterval (tracked[tracked.size () - id], i, rules.getBoolean ("verbose"));
+
+    if (rules.getBoolean ("verbose"))
+    {
+      std::cout << "Annotated @" << id << " with \"" << annotation << "\"" << std::endl;
+    }
+  }
+
+  database.endTransaction ();
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/commands/commands.h

@@ -32,6 +32,7 @@
 #include <Database.h>
 #include <Extensions.h>
 
+int CmdAnnotate      (const CLI&, Rules&, Database&                   );
 int CmdCancel        (            Rules&, Database&                   );
 int CmdConfig        (const CLI&, Rules&, Database&                   );
 int CmdContinue      (const CLI&, Rules&, Database&                   );

src/init.cpp

@@ -49,6 +49,7 @@ bool lightweightVersionCheck (int argc, const char** argv)
 void initializeEntities (CLI& cli)
 {
   // Command entities.
+  cli.entity ("command", "annotate");
   cli.entity ("command", "cancel");
   cli.entity ("command", "config");
   cli.entity ("command", "continue");
@@ -255,7 +256,8 @@ int dispatchCommand (
   {
     // These signatures are expected to be all different, therefore no
     // command to fn mapping.
-         if (command == "cancel")      status = CmdCancel        (     rules, database            );
+         if (command == "annotate")    status = CmdAnnotate      (cli, rules, database            );
+    else if (command == "cancel")      status = CmdCancel        (     rules, database            );
     else if (command == "config")      status = CmdConfig        (cli, rules, database            );
     else if (command == "continue")    status = CmdContinue      (cli, rules, database            );
     else if (command == "day")         status = CmdChartDay      (cli, rules, database            );