GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Datafile: Handles modified intervals

Browse source
This commit is contained in:
Paul Beckingham 2016-03-22 00:09:59 -04:00
parent 3e16f52621
commit 9a513ea1b2
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Datafile.cpp
View file

@ -107,8 +107,17 @@ void Datafile::addInterval (const Interval& interval)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Datafile::modifyInterval (const Interval& interval) void Datafile::modifyInterval (const Interval& interval)
{ {
_lines_modified.push_back (interval.serialize ()); for (auto& i : _intervals)
_dirty = true; {
if (i.start () == interval.start () &&
i.tags () == interval.tags ())
{
i = interval;
_dirty = true;
_lines_modified = true;
break;
}
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -118,8 +127,8 @@ void Datafile::commit ()
if (_dirty) if (_dirty)
{ {
// Special case: added but no modified means just append to the file. // Special case: added but no modified means just append to the file.
if (! _lines_modified.size () && if (_lines_added.size () &&
_lines_added.size ()) ! _lines_modified)
{ {
if (_file.open ()) if (_file.open ())
{ {
@ -147,9 +156,10 @@ void Datafile::commit ()
// Truncate the file and rewrite. // Truncate the file and rewrite.
_file.truncate (); _file.truncate ();
// Rewrite all the intervals, because at least one was modified.
_file.append (std::string("")); // Seek to end of file _file.append (std::string("")); // Seek to end of file
for (auto& line : _lines) for (auto& interval : _intervals)
_file.write_raw (line + "\n"); _file.write_raw (interval.serialize () + "\n");
// Write out all the added lines. // Write out all the added lines.
for (auto& line : _lines_added) for (auto& line : _lines_added)

2
src/Datafile.h
View file

@ -63,7 +63,7 @@ private:
// Lines read from file, not parsed. // Lines read from file, not parsed.
std::vector <std::string> _lines {}; std::vector <std::string> _lines {};
std::vector <std::string> _lines_added {}; std::vector <std::string> _lines_added {};
std::vector <std::string> _lines_modified {}; bool _lines_modified {false};
bool _lines_loaded {false}; bool _lines_loaded {false};
// Intervals parsed from lines. // Intervals parsed from lines.