GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 19:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Task: Migrated part of ::modify to ColRecur

Browse source
This commit is contained in:
Paul Beckingham 2016-01-31 19:28:23 -05:00
parent fec65a0f24
commit 6e56849bce
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Task.cpp
View file

@ -1981,6 +1981,7 @@ void Task::modify (modType type, bool text_required /* = false */)
! column->modifiable ()) ! column->modifiable ())
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
// TODO This eval section will go away soon...
// DOM resolution. If it evals, store that, otherwise raw. // DOM resolution. If it evals, store that, otherwise raw.
Variant evaluatedValue; Variant evaluatedValue;
if (name != "project" || Lexer::isDOM (value)) if (name != "project" || Lexer::isDOM (value))
@ -2008,7 +2009,8 @@ void Task::modify (modType type, bool text_required /* = false */)
// Dependencies are specified as IDs or UUIDs. // Dependencies are specified as IDs or UUIDs.
if (name == "depends" || if (name == "depends" ||
name == "tags") name == "tags" ||
name == "recur")
{ {
column->modify (*this, value); column->modify (*this, value);
mods = true; mods = true;
@ -2040,24 +2042,6 @@ void Task::modify (modType type, bool text_required /* = false */)
mods = true; mods = true;
} }
// Special case: type duration.
// Note: "recur" is marked as type "string" to force storage in raw form.
else if (name == "recur")
{
// The duration is stored in raw form, but it must still be valid,
// and therefore is parsed first.
if (evaluatedValue.type () == Variant::type_duration)
{
// Store the raw value, for 'recur'.
context.debug (label + name + " <-- '" + value + "'");
set (name, value);
mods = true;
}
else
throw format (STRING_TASK_INVALID_DUR, value);
}
else if (column->type () == "duration") else if (column->type () == "duration")
{ {
// The duration is stored in raw form, but it must still be valid, // The duration is stored in raw form, but it must still be valid,