GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 07:57:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

FF4

Browse source 
- Removed encodings for ',' -> ',', ''' -> '&squot;', and
  ':' -> '&colon'.
- Retained decodings to provide backward compatibility.
This commit is contained in:
Paul Beckingham 2010-06-20 00:35:09 -04:00
parent fbe24b3fda
commit ba87499eca
2 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Att.cpp
View file

@ -744,12 +744,12 @@ void Att::dequote (std::string& value) const
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Encode values prior to serialization. // Encode values prior to serialization.
// \t -> &tab; // \t -> &tab;
// ' -> &squot; // ' -> &squot; <-- deprecated, no need to encode/decod single quotes.
// " -> &dquot; // " -> &dquot;
// , -> &comma; // , -> &comma; <-- deprecated, no need to encode/decode commas.
// [ -> &open; // [ -> &open;
// ] -> &close; // ] -> &close;
// : -> &colon; // : -> &colon; <-- deprecated, no need to encode/decode colons.
void Att::encode (std::string& value) const void Att::encode (std::string& value) const
{ {
std::string::size_type i; std::string::size_type i;
@ -757,23 +757,14 @@ void Att::encode (std::string& value) const
while ((i = value.find ('\t')) != std::string::npos) while ((i = value.find ('\t')) != std::string::npos)
value.replace (i, 1, "&tab;"); // no i18n value.replace (i, 1, "&tab;"); // no i18n
while ((i = value.find ('\'')) != std::string::npos)
value.replace (i, 1, "&squot;"); // no i18n
while ((i = value.find ('"')) != std::string::npos) while ((i = value.find ('"')) != std::string::npos)
value.replace (i, 1, "&dquot;"); // no i18n value.replace (i, 1, "&dquot;"); // no i18n
while ((i = value.find (',')) != std::string::npos)
value.replace (i, 1, "&comma;"); // no i18n
while ((i = value.find ('[')) != std::string::npos) while ((i = value.find ('[')) != std::string::npos)
value.replace (i, 1, "&open;"); // no i18n value.replace (i, 1, "&open;"); // no i18n
while ((i = value.find (']')) != std::string::npos) while ((i = value.find (']')) != std::string::npos)
value.replace (i, 1, "&close;"); // no i18n value.replace (i, 1, "&close;"); // no i18n
while ((i = value.find (':')) != std::string::npos)
value.replace (i, 1, "&colon;"); // no i18n
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -789,28 +780,32 @@ void Att::decode (std::string& value) const
{ {
std::string::size_type i; std::string::size_type i;
while ((i = value.find ("&tab;")) != std::string::npos) // no i18n // Supported encodings.
while ((i = value.find ("&tab;")) != std::string::npos)
value.replace (i, 5, "\t"); value.replace (i, 5, "\t");
while ((i = value.find ("&dquot;")) != std::string::npos) // no i18n while ((i = value.find ("&dquot;")) != std::string::npos)
value.replace (i, 7, "\""); value.replace (i, 7, "\"");
while ((i = value.find ("&squot;")) != std::string::npos) // no i18n while ((i = value.find ("&quot;")) != std::string::npos)
value.replace (i, 7, "'");
while ((i = value.find ("&quot;")) != std::string::npos) // no i18n
value.replace (i, 6, "\""); value.replace (i, 6, "\"");
while ((i = value.find ("&comma;")) != std::string::npos) // no i18n while ((i = value.find ("&open;")) != std::string::npos)
value.replace (i, 7, ",");
while ((i = value.find ("&open;")) != std::string::npos) // no i18n
value.replace (i, 6, "["); value.replace (i, 6, "[");
while ((i = value.find ("&close;")) != std::string::npos) // no i18n while ((i = value.find ("&close;")) != std::string::npos)
value.replace (i, 7, "]"); value.replace (i, 7, "]");
while ((i = value.find ("&colon;")) != std::string::npos) // no i18n // Support for deprecated encodings. These cannot be removed or old files
// will not be parsable. Not just old files - completed.data can contain
// tasks formatted/encoded using these.
while ((i = value.find ("&squot;")) != std::string::npos)
value.replace (i, 7, "'");
while ((i = value.find ("&comma;")) != std::string::npos)
value.replace (i, 7, ",");
while ((i = value.find ("&colon;")) != std::string::npos)
value.replace (i, 7, ":"); value.replace (i, 7, ":");
} }

6
src/tests/att.t.cpp
View file

@ -77,7 +77,7 @@ int main (int argc, char** argv)
a5.value ("\""); a5.value ("\"");
t.is (a5.composeF4 (), "name:\"&dquot;\"", "Att::composeF4 encoded \""); t.is (a5.composeF4 (), "name:\"&dquot;\"", "Att::composeF4 encoded \"");
a5.value ("\t\",[]:"); a5.value ("\t\",[]:");
t.is (a5.composeF4 (), "name:\"&tab;&dquot;&comma;&open;&close;&colon;\"", "Att::composeF4 fully encoded \\t\",[]:"); t.is (a5.composeF4 (), "name:\"&tab;&dquot;,&open;&close;:\"", "Att::composeF4 fully encoded \\t\",[]:");
Att a6 ("name", 6); Att a6 ("name", 6);
t.is (a6.value_int (), 6, "Att::value_int get"); t.is (a6.value_int (), 6, "Att::value_int get");
@ -187,8 +187,8 @@ int main (int argc, char** argv)
n = Nibbler ("name:\"&tab;&quot;&comma;&open;&close;&colon;\""); n = Nibbler ("name:\"&tab;&quot;&comma;&open;&close;&colon;\"");
a7.parse (n); a7.parse (n);
t.is (a7.composeF4 (), "name:\"&tab;&dquot;&comma;&open;&close;&colon;\"", t.is (a7.composeF4 (), "name:\"&tab;&dquot;,&open;&close;:\"",
"Att::parse (name:\"&tab;&quot;&comma;&open;&close;&colon;\")"); "Att::parse (name:\"&tab;&quot;,&open;&close;:\")");
n = Nibbler ("total gibberish"); n = Nibbler ("total gibberish");
good = true; good = true;