diff --git a/src/Hooks.cpp b/src/Hooks.cpp index da14e0dfc..293bd0999 100644 --- a/src/Hooks.cpp +++ b/src/Hooks.cpp @@ -164,36 +164,46 @@ void Hooks::onAdd (Task& after) { context.timer_hooks.start (); + std::vector matchingScripts = scripts ("on-add"); std::vector ::iterator i; - for (i = _scripts.begin (); i != _scripts.end (); ++i) + for (i = matchingScripts.begin (); i != matchingScripts.end (); ++i) { - if (i->find ("/on-add") != std::string::npos) + std::string input = after.composeJSON () + "\n"; + std::string output; + int status = execute (*i, input, output); + + std::vector lines; + split (lines, output, '\n'); + std::vector ::iterator line; + + if (status == 0) { - File script (*i); - if (script.executable ()) + bool first = true; + for (line = lines.begin (); line != lines.end (); ++line) { - std::string input = after.composeJSON (); - std::string output; - int status = execute (*i, input, output); - - std::vector lines; - split (lines, output, '\n'); - std::vector ::iterator line; - - if (status == 0) + if (line->length () && (*line)[0] == '{') { - for (line = lines.begin (); line != lines.end (); ++line) - context.footnote (*line); + Task newTask (*line); + + if (first) + { + after = newTask; + first = false; + } + else + context.tdb2.add (newTask); } else - { - for (line = lines.begin (); line != lines.end (); ++line) - context.error (*line); - - throw 0; // This is how hooks silently terminate processing. - } + context.footnote (*line); } } + else + { + for (line = lines.begin (); line != lines.end (); ++line) + context.error (*line); + + throw 0; // This is how hooks silently terminate processing. + } } context.timer_hooks.stop ();