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

Bug #1300

Browse source 
- Encode/decode pairing is now properly balanced.
This commit is contained in:
Paul Beckingham 2013-07-07 09:07:10 -04:00
parent d4fabba8ee
commit 061bf4882e
3 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Task.cpp
View file

@ -461,6 +461,7 @@ void Task::parse (const std::string& input)
}
////////////////////////////////////////////////////////////////////////////////
// Note that all fields undergo encode/decode.
void Task::parseJSON (const std::string& line)
{
// Parse the whole thing.
@ -477,7 +478,6 @@ void Task::parseJSON (const std::string& line)
{
// If the attribute is a recognized column.
std::string type = Task::attributes[i->first];
if (type != "")
{
// Any specified id is ignored.
@ -509,6 +509,10 @@ void Task::parseJSON (const std::string& line)
}
}
// Strings are decoded.
else if (type == "string")
set (i->first, json::decode (unquoteText (i->second->dump ())));
// Other types are simply added.
else
set (i->first, unquoteText (i->second->dump ()));
@ -540,8 +544,7 @@ void Task::parseJSON (const std::string& line)
throw format (STRING_TASK_NO_DESC, line);
std::string name = "annotation_" + Date (when->_data).toEpochString ();
annos.insert (std::make_pair (name, what->_data));
annos.insert (std::make_pair (name, json::decode (what->_data)));
}
setAnnotations (annos);
@ -559,7 +562,7 @@ void Task::parseJSON (const std::string& line)
<< "' --> preserved\n";
context.debug (message.str ());
#endif
set (i->first, unquoteText (i->second->dump ()));
set (i->first, json::decode (unquoteText (i->second->dump ())));
}
}
}
@ -1964,4 +1967,4 @@ bool Task::next_mod_group (const A3& input, Arg& arg, unsigned int& pos)
return false;
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////