watcher/cli: fix json for assoc

Author: Will

CMakeLists.txt

@@ -75,7 +75,7 @@ if(NOT WIN32 AND NOT IS_CC_MSVC)
     "-fno-rtti"
     "-fstrict-enums"
     "-fstrict-overflow")
-  if(NOT IS_CC_APPLECLANG)
+  if(NOT IS_CC_APPLECLANG AND NOT ANDROID)
     set(COMPILE_OPTIONS
       "${COMPILE_OPTIONS}"
       "-fexpensive-optimizations"

src/wtr/watcher/main.cpp

@@ -94,24 +94,26 @@ struct Args {
 
 auto json(event const& e) -> string
 {
-  auto s = [](auto a)
-  { return '"' + to<string>(a) + '"'; };
+  auto s = [](auto a) { return to<string>(a); };
+  auto q = [&](auto a) { return '"' + s(a) + '"'; };
   return
-      "{\"path_type\":"   + s(e.path_type)
-    + ",\"path_name\":"   + s(e.path_name)
-    + ",\"effect_type\":" + s(e.effect_type)
-    + ",\"effect_time\":" + s(e.effect_time)
-    + (e.associated ? "," + json(*e.associated) : "")
-    + "}"
-    ;
+    "{\"path_type\":"   + q(e.path_type)
+  + ",\"path_name\":"   + q(e.path_name)
+  + ",\"effect_type\":" + q(e.effect_type)
+  + ",\"effect_time\":" + s(e.effect_time)
+  + ",\"associated\":"  + ( e.associated
+                          ? json(*e.associated)
+                          : "null" )
+  + "}"
+  ;
 }
 
 /*  Watch a path for some time.
     Or watch a path forever.
     Show what happens, or show help. */
 int main(int const argc, char const* const* const argv)
 {
-  auto cb = [](event ev) { cout << json(ev) << endl; };
+  auto cb = [](event const& ev) { cout << json(ev) << endl; };
   auto args = Args::try_parse(argc, argv);
   return ! args.has_value() ? (cerr << Args::help, 1)
        : args->is_help ? (cout << Args::help, 0)

tool/test/.ctx

@@ -47,8 +47,9 @@ show-output() {
     , path_name: .path_name
     , effect_type: .effect_type
     , effect_time: .effect_time
+    , associated: .associated
     }' \
-  | jq --slurp --sort-keys
+  | jq --slurp -S
 }
 export -f show-output
 
@@ -66,10 +67,11 @@ check-result() {
   [[ -z "$1" || -z "$2" ]] && return 1
   expect=$1
   actual=$2
-  if diff <(echo "$expect") <(echo "$actual") &> /dev/null
+  lhs() { echo "$expect" | jq -S; }
+  rhs() { echo "$actual" | jq -S | sed '/"associated": null,/d'; }
+  if diff <(lhs) <(rhs) &> /dev/null
   then echo ':) ok'
-  else echo 'oops :('
-       diff --side-by-side <(echo "$expect") <(echo "$actual")
+  else echo 'oops :(' && diff --side-by-side <(lhs) <(rhs)
   fi
 }
 export -f check-result

tool/test/rename-file-accuracy

@@ -18,14 +18,14 @@ ec=0
     "path_type": "file"
   },
   {
+    "effect_type": "rename",
+    "path_name": "d/a",
+    "path_type": "file",
     "associated": {
       "effect_type": "rename",
       "path_name": "d/b",
       "path_type": "file"
-    },
-    "effect_type": "rename",
-    "path_name": "d/a",
-    "path_type": "file"
+    }
   },
   {
     "effect_type": "destroy",
@@ -71,14 +71,14 @@ ec=$((ec + $?))
     "path_type": "file"
   },
   {
+    "effect_type": "rename",
+    "path_name": "d/a",
+    "path_type": "file",
     "associated": {
       "effect_type": "rename",
       "path_name": "d/b",
       "path_type": "file"
-    },
-    "effect_type": "rename",
-    "path_name": "d/a",
-    "path_type": "file"
+    }
   },
   {
     "effect_type": "destroy",