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

Handle case of empty interval, fix tests

Browse source 
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2020-03-02 20:46:50 +01:00
parent da27fdcdf0
commit bf87509329
4 changed files with 67 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/Interval.cpp
View file

@ -31,7 +31,7 @@
#include <Lexer.h>
#include <sstream>
#include <JSON.h>
#include "Interval.h"
#include <Interval.h>
////////////////////////////////////////////////////////////////////////////////
@ -39,7 +39,8 @@ bool Interval::empty () const
{
return start.toEpoch () == 0 &&
end.toEpoch () == 0 &&
_tags.empty ();
_tags.empty () &&
annotation.empty ();
}
////////////////////////////////////////////////////////////////////////////////
@ -99,48 +100,46 @@ std::string Interval::serialize () const
std::string Interval::json () const
{
std::stringstream out;
out << "{\"id\":" << id;
out << "{";
if (is_started ()) {
out << ",\"start\":\"" << start.toISO () << "\"";
}
if (is_ended ()) {
out << ",\"end\":\"" << end.toISO () << "\"";
}
if (! _tags.empty ())
if (!empty ())
{
std::string tags;
for (auto& tag : _tags)
{
if (tags[0])
tags += ',';
out << "\"id\":" << id;
tags += "\"" + escape (tag, '"') + "\"";
if (is_started ())
{
out << ",\"start\":\"" << start.toISO () << "\"";
}
if (start.toEpoch () ||
end.toEpoch ())
out << ',';
out << "\"tags\":["
<< tags
<< ']';
}
if (!annotation.empty ())
{
if (start.toEpoch () || end.toEpoch () || !_tags.empty ())
if (is_ended ())
{
out << ',';
out << ",\"end\":\"" << end.toISO () << "\"";
}
out << "\"annotation\":\"" << escape (annotation, '"') << "\"";
}
if (!_tags.empty ())
{
std::string tags;
for (auto &tag : _tags)
{
if (tags[0])
tags += ',';
tags += "\"" + escape (tag, '"') + "\"";
}
out << ",\"tags\":["
<< tags
<< ']';
}
if (!annotation.empty ())
{
out << ",\"annotation\":\"" << escape (annotation, '"') << "\"";
}
}
out << "}";
return out.str ();
return out.str();
}
////////////////////////////////////////////////////////////////////////////////

3
src/IntervalFactory.cpp
View file

@ -128,6 +128,9 @@ Interval IntervalFactory::fromJson (const std::string& jsonString)
interval.start = (start != nullptr) ? Datetime(start->_data) : 0;
json::string* end = (json::string*) json->_data["end"];
interval.end = (end != nullptr) ? Datetime(end->_data) : 0;
json::number* id = (json::number*) json->_data["id"];
interval.id = (id != nullptr) ? id->_dvalue : 0;
}
return interval;