From 1c608e9c1aa9149b59eed93a7dca5f90be1271c4 Mon Sep 17 00:00:00 2001
From: Dominik Lindner <d.lindner@dundee.ac.uk>
Date: Mon, 11 Jan 2021 15:09:04 +0000
Subject: [PATCH 1/2] test command: also print image id

---
 src/omero_cli_render.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/omero_cli_render.py b/src/omero_cli_render.py
index 852de192..9d634ad6 100755
--- a/src/omero_cli_render.py
+++ b/src/omero_cli_render.py
@@ -141,7 +141,7 @@
     Image is assumed if <object>: is omitted
 
     Output:
-    <Status>: <Pixels ID> <Time (in sec) to load the thumbnail> \
+    <Status>: <Pixels ID> <Image ID> <Time (in sec) to load the thumbnail> \
 <Error details, if any>
 
     Where status is either ok, miss, fill, cancel, or fail.
@@ -752,10 +752,10 @@ def test(self, args):
         """ Implements the 'test' command """
         self.gateway.SERVICE_OPTS.setOmeroGroup('-1')
         for img in self.render_images(self.gateway, args.object, batch=1):
-            self.test_per_pixel(
-                self.client, img.getPrimaryPixels().id, args.force, args.thumb)
+            self.test_per_image(
+                self.client, img, args.force, args.thumb)
 
-    def test_per_pixel(self, client, pixid, force, thumb):
+    def test_per_image(self, client, img, force, thumb):
         ctx = {'omero.group': '-1'}
         fail = {"omero.pixeldata.fail_if_missing": "true"}
         fail.update(ctx)
@@ -766,6 +766,8 @@ def test_per_pixel(self, client, pixid, force, thumb):
         error = ""
         rps = client.sf.createRawPixelsStore()
 
+        pixid = img.getPrimaryPixels().id
+
         try:
             rps.setPixelsId(long(pixid), False, fail)
             msg = "ok:"
@@ -799,7 +801,7 @@ def test_per_pixel(self, client, pixid, force, thumb):
                 tb.close()
 
         stop = time.time()
-        self.ctx.out("%s %s %s %s" % (msg, pixid, stop-start, error))
+        self.ctx.out("%s %s %s %s %s" % (msg, pixid, img.id, stop-start, error))
         return msg
 
 

From 37c89351f8e0c65f0fa4ab9c3b834431364bfd33 Mon Sep 17 00:00:00 2001
From: Dominik Lindner <d.lindner@dundee.ac.uk>
Date: Mon, 11 Jan 2021 15:50:50 +0000
Subject: [PATCH 2/2] Improve output of test command

---
 src/omero_cli_render.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/omero_cli_render.py b/src/omero_cli_render.py
index 9d634ad6..3fb77f18 100755
--- a/src/omero_cli_render.py
+++ b/src/omero_cli_render.py
@@ -141,8 +141,8 @@
     Image is assumed if <object>: is omitted
 
     Output:
-    <Status>: <Pixels ID> <Image ID> <Time (in sec) to load the thumbnail> \
-<Error details, if any>
+    <Status>: Pixels:<Pixels ID> Image:<Image ID> <Time (in sec) \
+     to load the thumbnail> <Error details, if any>
 
     Where status is either ok, miss, fill, cancel, or fail.
 
@@ -801,7 +801,8 @@ def test_per_image(self, client, img, force, thumb):
                 tb.close()
 
         stop = time.time()
-        self.ctx.out("%s %s %s %s %s" % (msg, pixid, img.id, stop-start, error))
+        self.ctx.out("%s Pixels:%s Image:%s %s %s" %
+                     (msg, pixid, img.id, stop-start, error))
         return msg