exrmetrics: fix json output, better testing (AcademySoftwareFoundation#1990)

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Co-authored-by: Cary Phillips <cary@ilm.com>

Author: peterhillman

src/bin/exrmetrics/main.cpp

@@ -14,6 +14,7 @@
 #include "ImfVersion.h"
 
 #include <algorithm>
+#include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <list>
@@ -30,6 +31,7 @@ using std::list;
 using std::max;
 using std::min;
 using std::sort;
+using std::quoted;
 
 using std::numeric_limits;
 using std::ostream;
@@ -234,7 +236,6 @@ printPartStats (
         out << indent << "\"re-read time\": ";
         printTiming (data.rereadPerf, out, raw, stats);
     }
-    if (output) { out << '\n'; }
 }
 
 void
@@ -260,7 +261,7 @@ jsonStats (
                 out << " },\n";
             }
             out << " {\n"
-                << "  \"file\": \"" << run.file << "\",\n";
+                << "  \"file\":" <<  quoted(run.file) << ",\n";
             lastFileName = run.file;
             if (outputSizeData)
             {
@@ -341,10 +342,10 @@ jsonStats (
                     }
                     out << "   ],\n";
                 }
-                out << "  \"metrics\":\n";
-                out << "   [";
-                firstEntryForFile = true;
             }
+            out << "  \"metrics\":\n";
+            out << "   [";
+            firstEntryForFile = true;
         }
 
         string compName;
@@ -358,38 +359,47 @@ jsonStats (
         out << '\n';
         out << "    {\n";
         out << "      \"compression\": \"" << compName << "\",\n";
-        out << "      \"pixel mode\": \"" << modeName (run.mode) << "\",\n";
+        out << "      \"pixel mode\": \"" << modeName (run.mode) << "\"";
 
         if (outputSizeData)
         {
-            out << "      \"output size\": " << run.metrics.outputFileSize
-                << ",\n";
+            out << ",\n";
+            out << "      \"output size\": " << run.metrics.outputFileSize;
         }
+        if(timing)
+        {
+             out << ",\n";
+             printPartStats ( out, run.metrics.totalStats, "      ", timing, raw, stats);
 
-        printPartStats (
-            out, run.metrics.totalStats, "      ", timing, raw, stats);
-        if (run.metrics.stats.size () > 1)
+        }
+        if (timing && run.metrics.stats.size () > 1)
         {
+            out << ",\n";
             out << "      \"parts\":\n";
             out << "       [\n";
             //first print total statistics, then print all part data, unless there's only one part
             for (size_t part = 0; part < run.metrics.stats.size (); ++part)
             {
                 out << "        {\n";
                 out << "          \"part\": " << part << ",\n";
+
                 printPartStats (
                     out,
                     run.metrics.stats[part],
                     "          ",
                     timing,
                     raw,
                     stats);
-                out << "        }";
+                out << "\n        }";
                 if (part < run.metrics.stats.size () - 1) { out << ','; }
                 out << endl;
             }
             out << "       ]\n";
         }
+        else
+        {
+             out << "\n";
+        }
         out << "    }";
         firstEntryForFile = false;
     }
@@ -482,8 +492,6 @@ main (int argc, char** argv)
 
     if (opts.parse (argc, argv)) { return 1; }
 
-    if (opts.inFiles.size () == 0) { return 0; }
-
     list<runData> data;
     try
     {

src/test/bin/test_exrmetrics.py

@@ -55,22 +55,26 @@ def cleanup():
     assert(result.returncode != 0), "\n"+result.stderr
     assert("Missing" in result.stderr),"expected 'Missing argument' error"
 
-command = [exrmetrics]
-image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
-command += ["-i",image, "--passes","2","-o",outimage]
-
-result = run (command, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-print(" ".join(result.args))
-print(result.returncode)
-print(result.stdout)
-print(result.stderr)
-assert(result.returncode == 0), "\n"+result.stderr
-assert(os.path.isfile(outimage)), "\nMissing " + outimage
-
-# confirm data is valid JSON (will not be true if filename contains quotes)
-data = json.loads(result.stdout)
-assert(len(data)==1),"\n Unexpected list size in JSON object"
-for x in ['file','pixels','compression','part type','total raw size']:
-  assert(x in data[0]),"\n Missing field "+x
+for image in [f"{image_dir}/TestImages/GrayRampsHorizontal.exr",f"{image_dir}/Beachball/multipart.0001.exr"]:
+    for time in ["none","read","write","reread","read,write","read,reread","read,write,reread"]:
+        for passes in ["1","2"]:
+            for nosize in range(0,2):
+              command = [exrmetrics]
+              command += ["-i",image, "--passes",passes,"--time",time,"-o",outimage]
+              if nosize:
+                  command += ['--no-size']
+              result = run (command, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+              print(" ".join(result.args))
+              print(result.returncode)
+              print(result.stderr)
+              assert(result.returncode == 0), "\n"+result.stderr
+              assert(os.path.isfile(outimage)), "\nMissing " + outimage
+              if len(result.stdout):
+                # confirm data is valid JSON (will not be true if filename contains quotes)
+                data = json.loads(result.stdout)
+                assert(len(data)==1),"\n Unexpected list size in JSON object"
+                if not nosize:
+                  for x in ['file','pixels','compression','part type','total raw size']:
+                     assert(x in data[0]),"\n Missing field "+x
 
 print("success")