Use JSON to communicate with highlights

samcv · samcv · commit 58770cc78a7f · 2016-12-20T15:40:13.000-08:00
This will allow us to use multiple threads by waiting for the results
from the correct file to be returned, and not just using the result
returned most recently.
diff --git a/highlights/highlight-filename-from-stdin.coffee b/highlights/highlight-filename-from-stdin.coffee
@@ -11,7 +11,8 @@ stdin = process.openStdin()
 stdin.setEncoding 'utf8'
 mystderr = process.stderr
 mystdout = process.stdout
-process_file = (full_path) ->
+process_file = (given_path) ->
+  full_path = path.resolve given_path
   fs.readFile full_path, 'utf8', (read_err, file_str) ->
     if read_err
       console.error read_err
@@ -20,8 +21,11 @@ process_file = (full_path) ->
         if hl_err
           console.error hl_err
         else
-          mystdout.write(html + '\n')
+          obj = {}
+          obj.file = full_path
+          obj.html = html
+          mystdout.write(JSON.stringify(obj) + '\n' )
 
 
 stdin.on 'data', (input) ->
-    process_file path.resolve input.trim()
+    process_file input.trim()
diff --git a/htmlify.p6 b/htmlify.p6
@@ -28,6 +28,7 @@ use Perl6::TypeGraph::Viz;
 use Perl6::Documentable::Registry;
 use Pod::Convenience;
 use Pod::Htmlify;
+use JSON::Fast;
 
 &spurt.wrap(sub (|c){
     state %seen-paths;
@@ -153,7 +154,7 @@ sub MAIN(
     #       Then they can be copied to doc/Programs.
     if $use-highlights and $async {
         $proc = Proc::Async.new('./highlights/node_modules/coffee-script/bin/coffee', './highlights/highlight-filename-from-stdin.coffee', :r, :w);
-        $supply = $proc.stdout.lines.Channel;
+        $supply = $proc.stdout.lines;
         $supply2 = $proc.stderr.tap( { .say } );
 
         $prom = $proc.start;
@@ -1023,8 +1024,17 @@ sub highlight-code-blocks(:$use-inline-python = True, :$use-highlights = False)
             my $thing;
             if $use-highlights {
                 if $async {
+                    my $promise = Promise.new;
+                    my $tap = $supply.tap( -> $json {
+                        my $parsed-json = from-json($json);
+                        if $parsed-json<file> eq $tmp_fname {
+                            $promise.keep($parsed-json<html>);
+                            $tap.close();
+                        }
+                    } );
                     $proc.say($tmp_fname);
-                    $thing = $supply.receive;
+                    await $promise;
+                    $thing = $promise.result;
                 }
                 else {
                     $command = “./highlights/node_modules/coffee-script/bin/coffee ./highlights/highlight-file.coffee "$tmp_fname"”;
