moss: Fix percentage calculation, improved callbacks

Author: joebonrichie

moss/src/client/mod.rs

@@ -443,14 +443,14 @@ impl Client {
         );
 
         postblit::execute_triggers(scope, &triggers, |progress| {
-            progress_bar.inc(progress.completed);
+            progress_bar.inc(1);
             info!(
-                progress = (total_items + progress.completed) as f32 / total_items as f32,
-                current = total_items + progress.in_progress as u64,
+                progress = progress.completed as f32 / total_items as f32,
+                current = progress.completed,
                 total = total_items,
                 event_type = "progress_update",
                 "Executing {:?}",
-                progress.items
+                progress.item
             );
         })?;
 

moss/src/client/postblit.rs

@@ -11,6 +11,7 @@
 use std::{
     path::{Path, PathBuf},
     process,
+    sync::atomic::{AtomicUsize, Ordering},
 };
 
 use crate::Installation;
@@ -107,10 +108,9 @@ pub(super) struct TriggerRunner {
 
 /// Progress callback handler
 #[derive(Debug, Clone)]
-pub struct Progress {
-    pub in_progress: usize,
+pub struct Progress<'a> {
     pub completed: u64,
-    pub items: Vec<String>,
+    pub item: &'a str,
 }
 
 /// Load all triggers matching the given scope and staging filesystem, return in batches
@@ -167,7 +167,7 @@ pub(super) fn triggers<'a>(
 pub fn execute_triggers(
     scope: TriggerScope<'_>,
     triggers: &[Vec<TriggerRunner>],
-    on_progress: impl Fn(Progress) + Send + Sync,
+    on_progress: impl Fn(Progress<'_>) + Send + Sync,
 ) -> Result<(), Error> {
     match scope {
         TriggerScope::Transaction(install, scope) => {
@@ -193,7 +193,7 @@ fn execute_transaction_triggers<P>(
     on_progress: P,
 ) -> Result<(), Error>
 where
-    P: Fn(Progress) + Send + Sync,
+    P: Fn(Progress<'_>) + Send + Sync,
 {
     let trigger_scope = TriggerScope::Transaction(install, scope);
     // TODO: Add caching support via /var/
@@ -221,7 +221,7 @@ fn execute_system_triggers<P>(
     on_progress: P,
 ) -> Result<(), Error>
 where
-    P: Fn(Progress) + Send + Sync,
+    P: Fn(Progress<'_>) + Send + Sync,
 {
     let trigger_scope = TriggerScope::System(install, scope);
 
@@ -253,23 +253,22 @@ impl TriggerRunner {
 /// Internal executor for triggers.
 fn execute_triggers_directly<P>(triggers: &[Vec<TriggerRunner>], on_progress: P) -> Result<(), Error>
 where
-    P: Fn(Progress) + Send + Sync,
+    P: Fn(Progress<'_>) + Send + Sync,
 {
     let rayon_runtime = rayon::ThreadPoolBuilder::new().build().expect("rayon runtime");
-    let total = 0;
+
+    let counter = AtomicUsize::new(0);
+
     rayon_runtime.install(|| {
         triggers.iter().try_for_each(|batch| {
             batch.par_iter().try_for_each(|trigger| {
+                let completed = counter.fetch_add(1, Ordering::Relaxed);
                 (on_progress)(Progress {
-                    in_progress: batch.len(),
-                    completed: total + 1,
-                    items: batch
-                        .iter()
-                        .map(|t| match t.handler() {
-                            Handler::Run { run, .. } => run.clone(),
-                            Handler::Delete { .. } => "delete operation".to_owned(),
-                        })
-                        .collect(),
+                    completed: completed as u64,
+                    item: match trigger.handler() {
+                        Handler::Run { run, .. } => run,
+                        Handler::Delete { .. } => "delete operation",
+                    },
                 });
                 execute_trigger_directly(trigger.trigger())
             })