From 61bf321f9ba114b13d9c8a139ae2b5d8ad4e674a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 18 Jan 2022 14:04:35 +0100
Subject: [PATCH 1/2] OP-2402 - fixed progress reporting, changed to integer
 0-100

---
 openpype/lib/remote_publish.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/openpype/lib/remote_publish.py b/openpype/lib/remote_publish.py
index 8074b2d112..95238f5469 100644
--- a/openpype/lib/remote_publish.py
+++ b/openpype/lib/remote_publish.py
@@ -53,7 +53,7 @@ def start_webpublish_log(dbcon, batch_id, user):
         "start_date": datetime.now(),
         "user": user,
         "status": "in_progress",
-        "progress": 0.0
+        "progress": 0  # integer 0-100, percentage
     }).inserted_id
 
 
@@ -103,10 +103,13 @@ def publish_and_log(dbcon, _id, log, close_plugin_name=None):
         _id = ObjectId(_id)
 
     log_lines = []
+    processed = 0
+    log_every = 5
     for result in pyblish.util.publish_iter():
         for record in result["records"]:
             log_lines.append("{}: {}".format(
                 result["plugin"].label, record.msg))
+        processed += 1
 
         if result["error"]:
             log.error(error_format.format(**result))
@@ -126,12 +129,14 @@ def publish_and_log(dbcon, _id, log, close_plugin_name=None):
                 context = pyblish.api.Context()
                 close_plugin().process(context)
             sys.exit(1)
-        else:
+        elif processed % log_every == 0:
+            # pyblish returns progress in 0.0 - 2.0
+            progress = min(round(result["progress"] / 2 * 100), 99)
             dbcon.update_one(
                 {"_id": _id},
                 {"$set":
                     {
-                        "progress": max(result["progress"], 0.95),
+                        "progress": progress,
                         "log": os.linesep.join(log_lines)
                     }}
             )
@@ -143,7 +148,7 @@ def publish_and_log(dbcon, _id, log, close_plugin_name=None):
             {
                 "finish_date": datetime.now(),
                 "status": "finished_ok",
-                "progress": 1,
+                "progress": 100,
                 "log": os.linesep.join(log_lines)
             }}
     )

From a400fbd1e01457228f8b0498a795cd07632a43d3 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 19 Jan 2022 11:28:13 +0100
Subject: [PATCH 2/2] OP-2402 - progress changed to 100 (per cent)

---
 .../hosts/webpublisher/webserver_service/webserver_cli.py     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/webpublisher/webserver_service/webserver_cli.py b/openpype/hosts/webpublisher/webserver_service/webserver_cli.py
index c96ad8e110..a8b1cd11b8 100644
--- a/openpype/hosts/webpublisher/webserver_service/webserver_cli.py
+++ b/openpype/hosts/webpublisher/webserver_service/webserver_cli.py
@@ -131,7 +131,7 @@ def reprocess_failed(upload_dir, webserver_url):
                     {
                         "finish_date": datetime.now(),
                         "status": "error",
-                        "progress": 1,
+                        "progress": 100,
                         "log": batch.get("log") + msg
                     }}
             )
@@ -153,6 +153,6 @@ def reprocess_failed(upload_dir, webserver_url):
                 {
                     "finish_date": datetime.now(),
                     "status": "sent_for_reprocessing",
-                    "progress": 1
+                    "progress": 100
                 }}
         )