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

Diagnostics - Better parsing errors

Browse source 
- Improved the errors when parsing a corrupt or unrecognized pending.data
  or completed.data file.
This commit is contained in:
Paul Beckingham 2009-05-03 00:18:23 -04:00
parent 3235ac592f
commit a0838474c4
2 changed files with 77 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/T.cpp
View file

@ -575,6 +575,9 @@ void T::parse (const std::string& line)
openAttrBracket + 1, closeAttrBracket - openAttrBracket - 1);
std::vector <std::string> pairs;
split (pairs, attributes, ' ');
if (pairs.size () == 0)
throw std::string ("Could not find any attributes.");
for (size_t i = 0; i < pairs.size (); ++i)
{
std::vector <std::string> pair;
@ -623,15 +626,17 @@ void T::parse (const std::string& line)
mDescription = line.substr (closeAnnoBracket + 2, std::string::npos);
}
else
throw std::string ("Missing annotation brackets.");
}
else
throw std::string ("Missing attribute brackets");
throw std::string ("Missing attribute brackets.");
}
else
throw std::string ("Missing tag brackets");
throw std::string ("Missing tag brackets.");
}
else
throw std::string ("Line too short");
throw std::string ("Line too short.");
}
break;

81
src/TDB.cpp
View file

@ -26,6 +26,7 @@
////////////////////////////////////////////////////////////////////////////////
#include <iostream>
#include <fstream>
#include <sstream>
#include <sys/file.h>
#include <unistd.h>
#include <string.h>
@ -104,13 +105,27 @@ bool TDB::pendingT (std::vector <T>& all)
{
mId = 1;
int line = 1;
std::vector <std::string>::iterator it;
for (it = lines.begin (); it != lines.end (); ++it)
{
T t (*it);
t.setId (mId++);
if (t.getStatus () == T::pending)
all.push_back (t);
try
{
T t (*it);
t.setId (mId++);
if (t.getStatus () == T::pending)
all.push_back (t);
}
catch (std::string& e)
{
std::stringstream more;
more << " Line " << line << ", in " << "pending.data";
throw e + more.str ();
}
++line;
}
return true;
@ -130,12 +145,26 @@ bool TDB::allPendingT (std::vector <T>& all)
{
mId = 1;
int line = 1;
std::vector <std::string>::iterator it;
for (it = lines.begin (); it != lines.end (); ++it)
{
T t (*it);
t.setId (mId++);
all.push_back (t);
try
{
T t (*it);
t.setId (mId++);
all.push_back (t);
}
catch (std::string& e)
{
std::stringstream more;
more << " Line " << line << ", in " << "pending.data";
throw e + more.str ();
}
++line;
}
return true;
@ -152,12 +181,26 @@ bool TDB::completedT (std::vector <T>& all) const
std::vector <std::string> lines;
if (readLockedFile (mCompletedFile, lines))
{
int line = 1;
std::vector <std::string>::iterator it;
for (it = lines.begin (); it != lines.end (); ++it)
{
T t (*it);
if (t.getStatus () != T::deleted)
all.push_back (t);
try
{
T t (*it);
if (t.getStatus () != T::deleted)
all.push_back (t);
}
catch (std::string& e)
{
std::stringstream more;
more << " Line " << line << ", in " << "pending.data";
throw e + more.str ();
}
++line;
}
return true;
@ -174,11 +217,25 @@ bool TDB::allCompletedT (std::vector <T>& all) const
std::vector <std::string> lines;
if (readLockedFile (mCompletedFile, lines))
{
int line = 1;
std::vector <std::string>::iterator it;
for (it = lines.begin (); it != lines.end (); ++it)
{
T t (*it);
all.push_back (t);
try
{
T t (*it);
all.push_back (t);
}
catch (std::string& e)
{
std::stringstream more;
more << " Line " << line << ", in " << "pending.data";
throw e + more.str ();
}
++line;
}
return true;