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

Task

Browse source 
- Upgrades legacy recur values.
This commit is contained in:
Paul Beckingham 2014-10-07 00:24:03 -04:00
parent 108a4c7959
commit 1a5fb437a5
3 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/TDB2.cpp
View file

@ -580,6 +580,7 @@ void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
{ {
// Ensure the task is consistent, and provide defaults if necessary. // Ensure the task is consistent, and provide defaults if necessary.
task.validate (false); task.validate (false);
task.upgradeLegacyValues ();
std::string uuid = task.get ("uuid"); std::string uuid = task.get ("uuid");
// Get the unmodified task as reference, so the hook can compare. // Get the unmodified task as reference, so the hook can compare.

53
src/Task.cpp
View file

@ -143,12 +143,13 @@ bool Task::operator== (const Task& other)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Task::Task (const std::string& input) Task::Task (const std::string& input)
{ {
id = 0; id = 0;
urgency_value = 0.0; urgency_value = 0.0;
recalc_urgency = true; recalc_urgency = true;
is_blocked = false; is_blocked = false;
is_blocking = false; is_blocking = false;
annotation_count = 0; annotation_count = 0;
parse (input); parse (input);
} }
@ -586,6 +587,8 @@ void Task::parse (const std::string& input)
parseJSON (copy); parseJSON (copy);
else else
throw std::string (STRING_RECORD_NOT_FF4); throw std::string (STRING_RECORD_NOT_FF4);
upgradeLegacyValues ();
} }
catch (const std::string&) catch (const std::string&)
@ -716,6 +719,8 @@ void Task::parseJSON (const std::string& line)
} }
} }
} }
upgradeLegacyValues ();
} }
} }
@ -2164,3 +2169,41 @@ void Task::modify (modType type, bool text_required /* = false */)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Task::upgradeLegacyValues ()
{
// 2.4.0 Update recurrence values.
if (has ("recur"))
{
std::string value = get ("recur");
std::string new_value = "";
std::string::size_type len = value.length ();
std::string::size_type p;
if (value == "-") new_value = "0s";
else if ((p = value.find ("hr")) != std::string::npos && p == len - 2) new_value = value.substr (0, p) + "h";
else if ((p = value.find ("hrs")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "h";
else if ((p = value.find ("mins")) != std::string::npos && p == len - 4) new_value = value.substr (0, p) + "min";
else if ((p = value.find ("mnths")) != std::string::npos && p == len - 5) new_value = value.substr (0, p) + "mo";
else if ((p = value.find ("mos")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "mo";
else if ((p = value.find ("mth")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "mo";
else if ((p = value.find ("mths")) != std::string::npos && p == len - 4) new_value = value.substr (0, p) + "mo";
else if ((p = value.find ("qrtrs")) != std::string::npos && p == len - 5) new_value = value.substr (0, p) + "q";
else if ((p = value.find ("qtr")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "q";
else if ((p = value.find ("qtrs")) != std::string::npos && p == len - 4) new_value = value.substr (0, p) + "q";
else if ((p = value.find ("sec")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "s";
else if ((p = value.find ("secs")) != std::string::npos && p == len - 4) new_value = value.substr (0, p) + "s";
else if ((p = value.find ("wk")) != std::string::npos && p == len - 2) new_value = value.substr (0, p) + "w";
else if ((p = value.find ("wks")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "w";
else if ((p = value.find ("yr")) != std::string::npos && p == len - 2) new_value = value.substr (0, p) + "y";
else if ((p = value.find ("yrs")) != std::string::npos && p == len - 3) new_value = value.substr (0, p) + "y";
if (new_value != "" &&
new_value != value)
{
set ("recur", new_value);
context.debug (format ("Legacy upgrade: recur {1} --> {2}", value, new_value));
}
}
}
////////////////////////////////////////////////////////////////////////////////

1
src/Task.h
View file

@ -154,6 +154,7 @@ public:
enum modType {modReplace, modPrepend, modAppend, modAnnotate}; enum modType {modReplace, modPrepend, modAppend, modAnnotate};
void modify (modType, bool text_required = false); void modify (modType, bool text_required = false);
void upgradeLegacyValues ();
private: private:
int determineVersion (const std::string&); int determineVersion (const std::string&);