CmdStop: Use a more descriptive error message when stopping intervals

Signed-off-by: Shaun Ruffell <[email protected]>

Author: sruffell

src/commands/CmdStop.cpp

@@ -71,10 +71,6 @@ int CmdStop (
   {
     throw std::string ("No datetime specified.");
   }
-  else if (filter.start <= latest.start)
-  {
-    throw std::string ("The end of a date range must be after the start.");
-  }
 
   std::set <std::string> diff = {};
 
@@ -94,6 +90,23 @@ int CmdStop (
                         std::inserter(diff, diff.begin()));
   }
 
+  if (filter.start <= latest.start)
+  {
+    std::stringstream sstr;
+
+    sstr << "Interval";
+    auto it = latest.tags ().cbegin ();
+    auto end = latest.tags ().cend ();
+    while (it != end)
+    {
+        sstr << " " << *it;
+        ++it;
+    }
+    sstr << " started at " << latest.start.toISOLocalExtended ()
+       << " cannot be stopped at " << filter.start.toISOLocalExtended () << '.';
+    throw sstr.str ();
+  }
+
   journal.startTransaction ();
 
   if (diff.empty ())

test/stop.t

@@ -67,7 +67,7 @@ class TestStop(TestCase):
 
         code, out, err = self.t.runError("stop {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc))
 
-        self.assertIn("The end of a date range must be after the start.", err)
+        self.assertIn("cannot be stopped at", err)
 
         j = self.t.export()