GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-06 17:37:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor getDOM to use a pointer for the optional context

Browse source 
It's possible to call getDOM without a contextual task.  Previously,
this was done by referencing a "dummy" task which necessitated a way to
distinguish such dummy tasks.  This switches to using a pointer and
treating the NULL value as meaning there is no context.

Note that this cannot use `std::optional<&Task>`, as optional does not
support reference types.
This commit is contained in:
Dustin J. Mitchell 2021-11-18 02:48:14 +00:00 • committed by Tomas Babej
parent 3af5ceadc1
commit 2812a8c77a
11 changed files with 76 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

114
src/DOM.cpp
View file

@ -239,24 +239,25 @@ bool getDOM (const std::string& name, Variant& value)
//
// This code emphasizes speed, hence 'id' and 'urgency' being evaluated first
// as special cases.
bool getDOM (const std::string& name, const Task& task, Variant& value)
//
// If task is NULL, then the contextual task will be determined from the DOM
// string, if any exists.
bool getDOM (const std::string& name, const Task* task, Variant& value)
{
// Special case, blank refs cause problems.
if (name == "")
return false;
auto have_task = !task.is_empty();
// Quickly deal with the most common cases.
if (have_task && name == "id")
if (task && name == "id")
{
value = Variant (static_cast<int> (task.id));
value = Variant (static_cast<int> (task->id));
return true;
}
if (have_task && name == "urgency")
if (task && name == "urgency")
{
value = Variant (task.urgency_c ());
value = Variant (task->urgency_c ());
return true;
}
@ -264,60 +265,55 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
auto elements = split (name, '.');
Task loaded_task;
// Use a lambda to decide whether the reference is going to be the passed
// decide whether the reference is going to be the passed
// "task" or whether it's going to be a newly loaded task (if id/uuid was
// given).
const Task& ref = [&]() -> const Task&
const Task* ref = task;
Lexer lexer (elements[0]);
std::string token;
Lexer::Type type;
// If this can be ID/UUID reference (the name contains '.'),
// lex it to figure out. Otherwise don't lex, as lexing can be slow.
if ((elements.size() > 1) and lexer.token (token, type))
{
Lexer lexer (elements[0]);
std::string token;
Lexer::Type type;
bool reloaded = false;
// If this can be ID/UUID reference (the name contains '.'),
// lex it to figure out. Otherwise don't lex, as lexing can be slow.
if ((elements.size() > 1) and lexer.token (token, type))
if (type == Lexer::Type::uuid &&
token.length () == elements[0].length ())
{
bool reloaded = false;
if (type == Lexer::Type::uuid &&
token.length () == elements[0].length ())
if (!task || token != task->get ("uuid"))
{
if (token != task.get ("uuid"))
{
Context::getContext ().tdb2.get (token, loaded_task);
if (Context::getContext ().tdb2.get (token, loaded_task))
reloaded = true;
}
// Eat elements[0]/UUID.
elements.erase (elements.begin ());
}
else if (type == Lexer::Type::number &&
token.find ('.') == std::string::npos)
{
auto id = strtol (token.c_str (), nullptr, 10);
if (id && id != task.id)
{
Context::getContext ().tdb2.get (id, loaded_task);
reloaded = true;
}
// Eat elements[0]/ID.
elements.erase (elements.begin ());
}
if (reloaded)
return loaded_task;
// Eat elements[0]/UUID.
elements.erase (elements.begin ());
}
else if (type == Lexer::Type::number &&
token.find ('.') == std::string::npos)
{
auto id = strtol (token.c_str (), nullptr, 10);
if (id && (!task || id != task->id))
{
if (Context::getContext ().tdb2.get (id, loaded_task))
reloaded = true;
}
// Eat elements[0]/ID.
elements.erase (elements.begin ());
}
return task;
if (reloaded)
ref = &loaded_task;
}
} ();
// The remainder of this method requires a contextual task, so if we do not
// have one, delegate to the two-argument getDOM
if (ref.is_empty ()) {
if (!ref)
return getDOM (name, value);
}
auto size = elements.size ();
@ -328,13 +324,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
// elements vector, DOM resolution is now simple.
if (size == 1 && canonical == "id")
{
value = Variant (static_cast<int> (ref.id));
value = Variant (static_cast<int> (ref->id));
return true;
}
if (size == 1 && canonical == "urgency")
{
value = Variant (ref.urgency_c ());
value = Variant (ref->urgency_c ());
return true;
}
@ -342,7 +338,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
// implementation. Remove in 3.0.0.
if (size == 1 && canonical == "status")
{
value = Variant (ref.statusToText (ref.getStatus ()));
value = Variant (ref->statusToText (ref->getStatus ()));
return true;
}
@ -350,7 +346,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
if (size == 1 && column)
{
if (column->is_uda () && ! ref.has (canonical))
if (column->is_uda () && ! ref->has (canonical))
{
value = Variant ("");
return true;
@ -358,7 +354,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
if (column->type () == "date")
{
auto numeric = ref.get_date (canonical);
auto numeric = ref->get_date (canonical);
if (numeric == 0)
value = Variant ("");
else
@ -366,32 +362,32 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
}
else if (column->type () == "duration" || canonical == "recur")
{
auto period = ref.get (canonical);
auto period = ref->get (canonical);
Duration iso;
std::string::size_type cursor = 0;
if (iso.parse (period, cursor))
value = Variant (iso.toTime_t (), Variant::type_duration);
else
value = Variant (Duration (ref.get (canonical)).toTime_t (), Variant::type_duration);
value = Variant (Duration (ref->get (canonical)).toTime_t (), Variant::type_duration);
}
else if (column->type () == "numeric")
value = Variant (ref.get_float (canonical));
value = Variant (ref->get_float (canonical));
else
value = Variant (ref.get (canonical));
value = Variant (ref->get (canonical));
return true;
}
if (size == 2 && canonical == "tags")
{
value = Variant (ref.hasTag (elements[1]) ? elements[1] : "");
value = Variant (ref->hasTag (elements[1]) ? elements[1] : "");
return true;
}
if (size == 2 && column && column->type () == "date")
{
Datetime date (ref.get_date (canonical));
Datetime date (ref->get_date (canonical));
if (elements[1] == "year") { value = Variant (static_cast<int> (date.year ())); return true; }
else if (elements[1] == "month") { value = Variant (static_cast<int> (date.month ())); return true; }
else if (elements[1] == "day") { value = Variant (static_cast<int> (date.day ())); return true; }
@ -406,13 +402,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
if (size == 2 && elements[0] == "annotations" && elements[1] == "count")
{
value = Variant (static_cast<int> (ref.getAnnotationCount ()));
value = Variant (static_cast<int> (ref->getAnnotationCount ()));
return true;
}
if (size == 3 && elements[0] == "annotations")
{
auto annos = ref.getAnnotations ();
auto annos = ref->getAnnotations ();
int a = strtol (elements[1].c_str (), nullptr, 10);
int count = 0;
@ -440,7 +436,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
if (size == 4 && elements[0] == "annotations" && elements[2] == "entry")
{
auto annos = ref.getAnnotations ();
auto annos = ref->getAnnotations ();
int a = strtol (elements[1].c_str (), nullptr, 10);
int count = 0;