mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
FF4/JSON Interop
- Removed the \n characters from Task::composeFF4 and Task::ComposeJSON. - Tasks in backlog.data file are now written as JSON. - Tasks are recognized in FF4 or JSON format.
This commit is contained in:
Paul Beckingham
parent
29e9dbcea6
commit
4133d29cca
5 changed files with 59 additions and 59 deletions
24
src/TDB2.cpp
24
src/TDB2.cpp
|
|
@ -223,7 +223,7 @@ void TF2::commit ()
|
|||
task != _added_tasks.end ();
|
||||
++task)
|
||||
{
|
||||
_file.append (task->composeF4 ());
|
||||
_file.append (task->composeF4 () + "\n");
|
||||
}
|
||||
|
||||
_added_tasks.clear ();
|
||||
|
|
@ -255,7 +255,7 @@ void TF2::commit ()
|
|||
task != _tasks.end ();
|
||||
++task)
|
||||
{
|
||||
_file.append (task->composeF4 ());
|
||||
_file.append (task->composeF4 () + "\n");
|
||||
}
|
||||
|
||||
// Write out all the added lines.
|
||||
|
|
@ -565,12 +565,12 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
|
|||
// new <task>
|
||||
// ---
|
||||
undo.add_line ("time " + Date ().toEpochString () + "\n");
|
||||
undo.add_line ("new " + task.composeF4 ());
|
||||
undo.add_line ("new " + task.composeF4 () + "\n");
|
||||
undo.add_line ("---\n");
|
||||
|
||||
// Add task to backlog.
|
||||
if (add_to_backlog)
|
||||
backlog.add_task (task);
|
||||
backlog.add_line (task.composeJSON () + "\n");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -597,13 +597,13 @@ void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
|
|||
// new <task>
|
||||
// ---
|
||||
undo.add_line ("time " + Date ().toEpochString () + "\n");
|
||||
undo.add_line ("old " + original.composeF4 ());
|
||||
undo.add_line ("new " + task.composeF4 ());
|
||||
undo.add_line ("old " + original.composeF4 () + "\n");
|
||||
undo.add_line ("new " + task.composeF4 () + "\n");
|
||||
undo.add_line ("---\n");
|
||||
|
||||
// Add modified task to backlog.
|
||||
if (add_to_backlog)
|
||||
backlog.add_task (task);
|
||||
backlog.add_line (task.composeJSON () + "\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1112,9 +1112,7 @@ void TDB2::merge (const std::string& mergeFile)
|
|||
<< "\n";
|
||||
*/
|
||||
|
||||
// remove the \n from composeF4() string
|
||||
std::string newline = tmod.getAfter ().composeF4 ();
|
||||
newline = newline.substr (0, newline.length ()-1);
|
||||
|
||||
// does the tasks move to pending data?
|
||||
// this taskmod will not arise from
|
||||
|
|
@ -1154,10 +1152,7 @@ void TDB2::merge (const std::string& mergeFile)
|
|||
cutOff (tmod.getBefore ().get ("description"), 10))
|
||||
<< "\n";
|
||||
|
||||
// remove the \n from composeF4() string
|
||||
// which will replace the current line
|
||||
std::string newline = tmod.getAfter ().composeF4 ();
|
||||
newline = newline.substr (0, newline.length ()-1);
|
||||
|
||||
// does the tasks move to completed data
|
||||
if ( (statusAfter == Task::completed)
|
||||
|
|
@ -1215,10 +1210,7 @@ void TDB2::merge (const std::string& mergeFile)
|
|||
cutOff (tmod.getAfter ().get ("description"), 10))
|
||||
<< "\n";
|
||||
|
||||
// remove the \n from composeF4() string
|
||||
std::string newline = tmod.getAfter ().composeF4 ();
|
||||
newline = newline.substr (0, newline.length ()-1);
|
||||
pending_lines.push_back (newline);
|
||||
pending_lines.push_back (tmod.getAfter ().composeF4 ());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
76
src/Task.cpp
76
src/Task.cpp
|
|
@ -399,49 +399,53 @@ void Task::parse (const std::string& input)
|
|||
try
|
||||
{
|
||||
// File format version 4, from 2009-5-16 - now, v1.7.1+
|
||||
// This is the parse format tried first, because it is most used.
|
||||
clear ();
|
||||
|
||||
Nibbler n (copy);
|
||||
std::string line;
|
||||
if (n.skip ('[') &&
|
||||
n.getUntil (']', line) &&
|
||||
n.skip (']') &&
|
||||
n.depleted ())
|
||||
if (copy[0] == '[')
|
||||
{
|
||||
if (line.length () == 0)
|
||||
throw std::string (STRING_RECORD_EMPTY);
|
||||
|
||||
Nibbler nl (line);
|
||||
std::string name;
|
||||
std::string value;
|
||||
while (!nl.depleted ())
|
||||
Nibbler n (copy);
|
||||
std::string line;
|
||||
if (n.skip ('[') &&
|
||||
n.getUntil (']', line) &&
|
||||
n.skip (']') &&
|
||||
n.depleted ())
|
||||
{
|
||||
if (nl.getUntil (':', name) &&
|
||||
nl.skip (':') &&
|
||||
nl.getQuoted ('"', value))
|
||||
if (line.length () == 0)
|
||||
throw std::string (STRING_RECORD_EMPTY);
|
||||
|
||||
Nibbler nl (line);
|
||||
std::string name;
|
||||
std::string value;
|
||||
while (!nl.depleted ())
|
||||
{
|
||||
// Experimental legacy value translation of 'recur:m' --> 'recur:mo'.
|
||||
if (name == "recur" &&
|
||||
digitsOnly (value.substr (0, value.length () - 1)) &&
|
||||
value[value.length () - 1] == 'm')
|
||||
value += 'o';
|
||||
if (nl.getUntil (':', name) &&
|
||||
nl.skip (':') &&
|
||||
nl.getQuoted ('"', value))
|
||||
{
|
||||
// Experimental legacy value translation of 'recur:m' --> 'recur:mo'.
|
||||
if (name == "recur" &&
|
||||
digitsOnly (value.substr (0, value.length () - 1)) &&
|
||||
value[value.length () - 1] == 'm')
|
||||
value += 'o';
|
||||
|
||||
if (name.substr (0, 11) == "annotation_")
|
||||
++annotation_count;
|
||||
if (name.substr (0, 11) == "annotation_")
|
||||
++annotation_count;
|
||||
|
||||
(*this)[name] = decode (json::decode (value));
|
||||
(*this)[name] = decode (json::decode (value));
|
||||
}
|
||||
|
||||
nl.skip (' ');
|
||||
}
|
||||
|
||||
nl.skip (' ');
|
||||
std::string remainder;
|
||||
nl.getUntilEOS (remainder);
|
||||
if (remainder.length ())
|
||||
throw std::string (STRING_RECORD_JUNK_AT_EOL);
|
||||
}
|
||||
|
||||
std::string remainder;
|
||||
nl.getUntilEOS (remainder);
|
||||
if (remainder.length ())
|
||||
throw std::string (STRING_RECORD_JUNK_AT_EOL);
|
||||
}
|
||||
else if (input[0] == '{')
|
||||
parseJSON (input);
|
||||
else if (copy[0] == '{')
|
||||
parseJSON (copy);
|
||||
else
|
||||
throw std::string (STRING_RECORD_NOT_FF4);
|
||||
}
|
||||
|
|
@ -686,7 +690,7 @@ void Task::parseLegacy (const std::string& line)
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// The format is:
|
||||
//
|
||||
// [ <name>:<value> ... ] \n
|
||||
// [ <name>:<value> ... ]
|
||||
//
|
||||
std::string Task::composeF4 () const
|
||||
{
|
||||
|
|
@ -705,7 +709,7 @@ std::string Task::composeF4 () const
|
|||
}
|
||||
}
|
||||
|
||||
ff4 += "]\n";
|
||||
ff4 += "]";
|
||||
return ff4;
|
||||
}
|
||||
|
||||
|
|
@ -728,6 +732,10 @@ std::string Task::composeJSON (bool decorate /*= false*/) const
|
|||
if (attributes_written)
|
||||
out << ",";
|
||||
|
||||
// Annotations are not written out here.
|
||||
if (i->first.substr (0, 11) == "annotation_")
|
||||
continue;
|
||||
|
||||
std::string type = Task::attributes[i->first];
|
||||
if (type == "")
|
||||
type = "string";
|
||||
|
|
|
|||
|
|
@ -182,10 +182,10 @@ std::string Taskmod::toString ()
|
|||
|
||||
if (_bBeforeSet)
|
||||
{
|
||||
stream << STRING_TASKMOD_OLD << _before.composeF4();
|
||||
stream << STRING_TASKMOD_OLD << _before.composeF4() << "\n";
|
||||
}
|
||||
|
||||
stream << STRING_TASKMOD_NEW << _after.composeF4();
|
||||
stream << STRING_TASKMOD_NEW << _after.composeF4() << "\n";
|
||||
stream << "---\n";
|
||||
|
||||
return stream.str ();
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ int main (int argc, char** argv)
|
|||
// Task::set
|
||||
task.clear ();
|
||||
task.set ("name", "value");
|
||||
t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::set");
|
||||
t.is (task.composeF4 (), "[name:\"value\"]", "Task::set");
|
||||
|
||||
// Task::has
|
||||
t.ok (task.has ("name"), "Task::has");
|
||||
|
|
@ -85,18 +85,18 @@ int main (int argc, char** argv)
|
|||
|
||||
// Task::get_int
|
||||
task.set ("one", 1);
|
||||
t.is (task.composeF4 (), "[name:\"value\" one:\"1\"]\n", "Task::set");
|
||||
t.is (task.composeF4 (), "[name:\"value\" one:\"1\"]", "Task::set");
|
||||
t.is (task.get_int ("one"), 1, "Task::get_int");
|
||||
|
||||
// Task::get_ulong
|
||||
task.set ("two", "4294967295");
|
||||
t.is (task.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]\n", "Task::set");
|
||||
t.is (task.composeF4 (), "[name:\"value\" one:\"1\" two:\"4294967295\"]", "Task::set");
|
||||
t.is ((size_t)task.get_ulong ("two"), (size_t)4294967295UL, "Task::get_ulong");
|
||||
|
||||
// Task::remove
|
||||
task.remove ("one");
|
||||
task.remove ("two");
|
||||
t.is (task.composeF4 (), "[name:\"value\"]\n", "Task::remove");
|
||||
t.is (task.composeF4 (), "[name:\"value\"]", "Task::remove");
|
||||
|
||||
// Task::all
|
||||
t.is (task.size (), (size_t)1, "Task::all size");
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ int main (int argc, char** argv)
|
|||
std::vector <Task> pending = context.tdb2.pending.get_tasks ();
|
||||
std::vector <Task> completed = context.tdb2.completed.get_tasks ();
|
||||
std::vector <std::string> undo = context.tdb2.undo.get_lines ();
|
||||
std::vector <Task> backlog = context.tdb2.backlog.get_tasks ();
|
||||
std::vector <std::string> backlog = context.tdb2.backlog.get_lines ();
|
||||
|
||||
t.is ((int) pending.size (), 0, "TDB2 Read empty pending");
|
||||
t.is ((int) completed.size (), 0, "TDB2 Read empty completed");
|
||||
|
|
@ -71,7 +71,7 @@ int main (int argc, char** argv)
|
|||
pending = context.tdb2.pending.get_tasks ();
|
||||
completed = context.tdb2.completed.get_tasks ();
|
||||
undo = context.tdb2.undo.get_lines ();
|
||||
backlog = context.tdb2.backlog.get_tasks ();
|
||||
backlog = context.tdb2.backlog.get_lines ();
|
||||
|
||||
t.is ((int) pending.size (), 1, "TDB2 after add, 1 pending task");
|
||||
t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");
|
||||
|
|
@ -84,7 +84,7 @@ int main (int argc, char** argv)
|
|||
pending = context.tdb2.pending.get_tasks ();
|
||||
completed = context.tdb2.completed.get_tasks ();
|
||||
undo = context.tdb2.undo.get_lines ();
|
||||
backlog = context.tdb2.backlog.get_tasks ();
|
||||
backlog = context.tdb2.backlog.get_lines ();
|
||||
|
||||
t.is ((int) pending.size (), 1, "TDB2 after add, 1 pending task");
|
||||
t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue