✨ Add better progress reporting

For components migration and for binfile import process

backend/src/app/srepl/cli.clj

@@ -13,7 +13,8 @@
    [app.db :as db]
    [app.main :as main]
    [app.rpc.commands.auth :as cmd.auth]
-   [app.srepl.components-v2]
+   [app.srepl.components-v2 :refer [migrate-teams!]]
+   [app.util.events :as events]
    [app.util.json :as json]
    [app.util.time :as dt]
    [cuerdas.core :as str]))
@@ -106,25 +107,36 @@
 
 (defmethod exec-command :migrate-v2
   [_]
-  (letfn [(on-start [{:keys [total rollback]}]
-            (println
-             (str/ffmt "The components/v2 migration started (rollback:%, teams:%)"
-                       (if rollback "on" "off")
-                       total)))
+  (letfn [(on-progress-report [{:keys [elapsed completed errors]}]
+            (println (str/ffmt "-> Progress: completed: %, errors: %, elapsed: %"
+                               completed errors elapsed)))
+
+          (on-progress [{:keys [op name]}]
+            (case op
+              :migrate-team
+              (println (str/ffmt "-> Migrating team: \"%\"" name))
+              :migrate-file
+              (println (str/ffmt "=> Migrating file: \"%\"" name))
+              nil))
+
+          (on-event [[type payload]]
+            (case type
+              :progress-report (on-progress-report payload)
+              :progress        (on-progress payload)
+              :error           (on-error payload)
+              nil))
 
-          (on-progress [{:keys [total elapsed progress completed]}]
-            (println (str/ffmt "Progress % (total: %, completed: %, elapsed: %)"
-                               progress total completed elapsed)))
           (on-error [cause]
-            (println "ERR:" (ex-message cause)))
+            (println "EE:" (ex-message cause)))]
 
-          (on-end [_]
-            (println "Migration finished"))]
-    (app.srepl.components-v2/migrate-teams! main/system
-                                            :on-start on-start
-                                            :on-error on-error
-                                            :on-progress on-progress
-                                            :on-end on-end)))
+    (println "The components/v2 migration started...")
+
+    (try
+      (let [result (-> (partial migrate-teams! main/system {:rollback? true})
+                       (events/run-with! on-event))]
+        (println (str/ffmt "Migration process finished (elapsed: %)" (:elapsed result))))
+      (catch Throwable cause
+        (on-error cause)))))
 
 (defmethod exec-command :default
   [{:keys [::cmd]}]