gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

libhsared: migrating from local to libshared

Browse Source
This commit is contained in:
Paul Beckingham
2016-12-06 07:20:45 -05:00
parent 456925a02b
commit 355620c640
88 changed files with 185 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Hooks.cpp
View File

@@ -39,10 +39,12 @@
#include <Context.h>
#include <Variant.h>
#include <DOM.h>
#include <Lexer.h>
#include <JSON.h>
#include <Timer.h>
#include <format.h>
#include <shared.h>
#include <text.h>
#include <util.h>
#include <i18n.h>
extern Context context;
@@ -468,7 +470,9 @@ void Hooks::assertSameTask (const std::vector <std::string>& input, const Task&
}
json::string* up = (json::string*) u->second;
std::string json_uuid = json::decode (unquoteText (up->dump ()));
auto text = up->dump ();
Lexer::dequote (text);
std::string json_uuid = json::decode (text);
if (json_uuid != uuid)
{
context.error (format (STRING_HOOK_ERROR_SAME2, uuid, json_uuid));
@@ -562,7 +566,7 @@ int Hooks::callHookScript (
else
status = execute (script, args, inputStr, outputStr);
split (output, outputStr, '\n');
output = split (outputStr, '\n');
if (_debug >= 2)
{