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

TDB2

Browse source 
- Properly handles cases where tasks are added, then existing data files
  are loaded.  The 'add' list and the 'loaded' list needed to be merged.
This commit is contained in:
Paul Beckingham 2011-08-27 23:30:51 -04:00
parent 1b25c415b0
commit 1e70f00c29
2 changed files with 69 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/TDB2.cpp
View file

@ -65,8 +65,17 @@ const std::vector <Task>& TF2::get_tasks ()
// std::cout << "# TF2::get_tasks " << _file._data << "\n";
if (! _loaded_tasks)
{
load_tasks ();
// Apply previously added tasks.
std::vector <Task>::iterator i;
for (i = _added_tasks.begin (); i != _added_tasks.end (); ++i)
_tasks.push_back (*i);
// std::cout << "# TF2::get_tasks added " << _added_tasks.size () << " tasks\n";
}
return _tasks;
}
@ -76,8 +85,17 @@ const std::vector <std::string>& TF2::get_lines ()
// std::cout << "# TF2::get_lines " << _file._data << "\n";
if (! _loaded_lines)
{
load_lines ();
// Apply previously added lines.
std::vector <std::string>::iterator i;
for (i = _added_lines.begin (); i != _added_lines.end (); ++i)
_lines.push_back (*i);
// std::cout << "# TF2::get_lines added " << _added_lines.size () << " lines\n";
}
return _lines;
}
@ -232,8 +250,17 @@ void TF2::load_tasks ()
context.timer_load.start ();
if (! _loaded_lines)
{
load_lines ();
// Apply previously added lines.
std::vector <std::string>::iterator i;
for (i = _added_lines.begin (); i != _added_lines.end (); ++i)
_lines.push_back (*i);
// std::cout << "# TF2::load_tasks added " << _added_lines.size () << " lines\n";
}
int line_number = 0;
try
{
@ -308,8 +335,17 @@ void TF2::load_contents ()
std::string TF2::uuid (int id)
{
if (! _loaded_tasks)
{
load_tasks ();
// Apply previously added tasks.
std::vector <Task>::iterator i;
for (i = _added_tasks.begin (); i != _added_tasks.end (); ++i)
_tasks.push_back (*i);
// std::cout << "# TF2::uuid added " << _added_tasks.size () << " tasks\n";
}
std::map <int, std::string>::const_iterator i;
if ((i = _I2U.find (id)) != _I2U.end ())
return i->second;
@ -321,8 +357,17 @@ std::string TF2::uuid (int id)
int TF2::id (const std::string& uuid)
{
if (! _loaded_tasks)
{
load_tasks ();
// Apply previously added tasks.
std::vector <Task>::iterator i;
for (i = _added_tasks.begin (); i != _added_tasks.end (); ++i)
_tasks.push_back (*i);
// std::cout << "# TF2::id added " << _added_tasks.size () << " tasks\n";
}
std::map <std::string, int>::const_iterator i;
if ((i = _U2I.find (uuid)) != _U2I.end ())
return i->second;