mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Sync
- Corrected handling of backlog.data after a synch, using TF2::clear_tasks.
This commit is contained in:
parent
c5ff24358c
commit
98d9a367f3
3 changed files with 16 additions and 4 deletions
|
@ -98,9 +98,9 @@ int CmdSync::execute (std::string& output)
|
|||
payload = response.getPayload ();
|
||||
std::vector <std::string> lines;
|
||||
split (lines, payload, '\n');
|
||||
std::cout << "# received " << lines.size () << " lines of data\n";
|
||||
|
||||
// Load all tasks.
|
||||
// TODO This is not necessary if only a synch key was received.
|
||||
std::vector <Task> all = context.tdb2.all_tasks ();
|
||||
|
||||
std::string synch_key = "";
|
||||
|
@ -116,11 +116,13 @@ int CmdSync::execute (std::string& output)
|
|||
<< "\n";
|
||||
context.tdb2.modify (from_server);
|
||||
}
|
||||
else
|
||||
else if (*line != "")
|
||||
{
|
||||
synch_key = *line;
|
||||
context.debug ("Synch key " + synch_key);
|
||||
}
|
||||
|
||||
// Otherwise line is blank, so ignore it.
|
||||
}
|
||||
|
||||
// Only update everything if there is a new synch_key. No synch_key means
|
||||
|
@ -128,7 +130,9 @@ int CmdSync::execute (std::string& output)
|
|||
if (synch_key != "")
|
||||
{
|
||||
// Truncate backlog.data, save new synch_key.
|
||||
context.tdb2.backlog.clear ();
|
||||
context.tdb2.backlog._file.truncate ();
|
||||
context.tdb2.backlog.clear_tasks ();
|
||||
context.tdb2.backlog.clear_lines ();
|
||||
context.tdb2.backlog.add_line (synch_key + "\n");
|
||||
|
||||
// Commit all changes.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue