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

Hooks

Browse source 
- Factored out the code that determines if the JSON output from a hook script is
  actually JSON.
This commit is contained in:
Paul Beckingham 2014-10-18 16:55:26 -04:00
parent 5275c0ce60
commit b6be1cdc99
2 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/Hooks.cpp
View file

@ -36,6 +36,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h> #include <sys/types.h>
#include <Context.h> #include <Context.h>
#include <JSON.h>
#include <Hooks.h> #include <Hooks.h>
#include <text.h> #include <text.h>
#include <util.h> #include <util.h>
@ -133,7 +134,7 @@ void Hooks::onLaunch ()
{ {
for (line = lines.begin (); line != lines.end (); ++line) for (line = lines.begin (); line != lines.end (); ++line)
{ {
if (line->length () && (*line)[0] == '{') if (isJSON (*line))
{ {
if (_debug >= 2) if (_debug >= 2)
context.debug ("Hook output: " + *line); context.debug ("Hook output: " + *line);
@ -149,7 +150,7 @@ void Hooks::onLaunch ()
else else
{ {
for (line = lines.begin (); line != lines.end (); ++line) for (line = lines.begin (); line != lines.end (); ++line)
if (line->length () && (*line)[0] != '{') if (! isJSON (*line))
context.error (*line); context.error (*line);
throw 0; // This is how hooks silently terminate processing. throw 0; // This is how hooks silently terminate processing.
@ -215,7 +216,7 @@ void Hooks::onExit ()
if (_debug >= 2) if (_debug >= 2)
context.debug ("Hook output: " + *line); context.debug ("Hook output: " + *line);
if (line->length () && (*line)[0] != '{') if (! isJSON (*line))
{ {
if (status == 0) if (status == 0)
context.footnote (*line); context.footnote (*line);
@ -280,7 +281,7 @@ void Hooks::onAdd (std::vector <Task>& changes)
if (_debug >= 2) if (_debug >= 2)
context.debug ("Hook output: " + *line); context.debug ("Hook output: " + *line);
if (line->length () && (*line)[0] == '{') if (isJSON (*line))
changes.push_back (Task (*line)); changes.push_back (Task (*line));
else else
context.footnote (*line); context.footnote (*line);
@ -289,7 +290,7 @@ void Hooks::onAdd (std::vector <Task>& changes)
else else
{ {
for (line = lines.begin (); line != lines.end (); ++line) for (line = lines.begin (); line != lines.end (); ++line)
if (line->length () && (*line)[0] != '{') if (! isJSON (*line))
context.error (*line); context.error (*line);
throw 0; // This is how hooks silently terminate processing. throw 0; // This is how hooks silently terminate processing.
@ -359,7 +360,7 @@ void Hooks::onModify (const Task& before, std::vector <Task>& changes)
if (_debug >= 2) if (_debug >= 2)
context.debug ("Hook output: " + *line); context.debug ("Hook output: " + *line);
if (line->length () && (*line)[0] == '{') if (isJSON (*line))
changes.push_back (Task (*line)); changes.push_back (Task (*line));
else else
context.footnote (*line); context.footnote (*line);
@ -368,7 +369,7 @@ void Hooks::onModify (const Task& before, std::vector <Task>& changes)
else else
{ {
for (line = lines.begin (); line != lines.end (); ++line) for (line = lines.begin (); line != lines.end (); ++line)
if (line->length () && (*line)[0] != '{') if (! isJSON (*line))
context.error (*line); context.error (*line);
throw 0; // This is how hooks silently terminate processing. throw 0; // This is how hooks silently terminate processing.
@ -403,3 +404,35 @@ std::vector <std::string> Hooks::scripts (const std::string& event)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool Hooks::isJSON (const std::string& input) const
{
if (input.length () &&
input[0] == '{' &&
input[input.length () - 1] == '}')
{
try
{
Task maybe (input);
return true;
}
catch (const std::string& e)
{
if (_debug >= 1)
context.debug ("Hook output looks like JSON, but is not a valid task.");
if (_debug >= 2)
context.debug ("JSON parser error: " + e);
}
catch (...)
{
if (_debug >= 1)
context.debug ("Hook output looks like JSON, but fails to parse.");
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////

1
src/Hooks.h
View file

@ -51,6 +51,7 @@ public:
private: private:
std::vector <std::string> scripts (const std::string&); std::vector <std::string> scripts (const std::string&);
bool isJSON (const std::string&) const;
private: private:
bool _enabled; bool _enabled;