refactor: move progress tracking setup into utils function

Author: dervoeti

rust/patchable/src/main.rs

@@ -10,7 +10,7 @@ use std::{fs::File, io::Write, path::PathBuf};
 use git2::{Oid, Repository};
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, OptionExt, ResultExt as _, Snafu};
-use tracing_indicatif::{span_ext::IndicatifSpanExt, IndicatifLayer};
+use tracing_indicatif::IndicatifLayer;
 use tracing_subscriber::{layer::SubscriberExt as _, util::SubscriberInitExt as _};
 
 #[derive(clap::Parser)]
@@ -466,13 +466,14 @@ fn main() -> Result<()> {
                 });
 
                 // Add progress tracking for push operation
-                let span_push = tracing::info_span!("pushing");
-                span_push.pb_set_style(&utils::progress_bar_style());
-                let _ = span_push.enter();
-                let mut quant_push = utils::Quantizer::percent();
+                let (span_push, mut quant_push) = utils::setup_progress_tracking(tracing::info_span!("pushing"));
                 callbacks.push_transfer_progress(move |current, total, _| {
                     if total > 0 {
-                        quant_push.update_span_progress(current, total, &span_push);
+                        quant_push.update_span_progress(
+                            current,
+                            total,
+                            &span_push,
+                        );
                     }
                 });
 

rust/patchable/src/repo.rs

@@ -5,11 +5,10 @@ use git2::{
     WorktreeAddOptions,
 };
 use snafu::{ResultExt, Snafu};
-use tracing_indicatif::span_ext::IndicatifSpanExt;
 
 use crate::{
     error::{self, CommitRef},
-    utils::{progress_bar_style, Quantizer},
+    utils::setup_progress_tracking,
 };
 
 #[derive(Debug, Snafu)]
@@ -149,15 +148,11 @@ pub fn resolve_and_fetch_commitish(
                 error = &err as &dyn std::error::Error,
                 "base commit not found locally, fetching from upstream"
             );
-            let span_recv = tracing::info_span!("receiving");
-            let span_index = tracing::info_span!("indexing");
-            span_recv.pb_set_style(&progress_bar_style());
-            span_index.pb_set_style(&progress_bar_style());
-            let _ = span_recv.enter();
-            let _ = span_index.enter();
+
+            let (span_recv, mut quant_recv) = setup_progress_tracking(tracing::info_span!("receiving"));
+            let (span_index, mut quant_index) = setup_progress_tracking(tracing::info_span!("indexing"));
+
             let mut callbacks = RemoteCallbacks::new();
-            let mut quant_recv = Quantizer::percent();
-            let mut quant_index = Quantizer::percent();
             callbacks.transfer_progress(move |progress| {
                 quant_recv.update_span_progress(
                     progress.received_objects(),
@@ -171,6 +166,7 @@ pub fn resolve_and_fetch_commitish(
                 );
                 true
             });
+
             repo.remote_anonymous(upstream_url)
                 .context(CreateRemoteSnafu {
                     repo,

rust/patchable/src/utils.rs

@@ -4,13 +4,6 @@ use git2::Repository;
 use tracing::Span;
 use tracing_indicatif::{span_ext::IndicatifSpanExt, style::ProgressStyle};
 
-pub fn progress_bar_style() -> ProgressStyle {
-    ProgressStyle::with_template(
-        "{span_child_prefix}{spinner} {span_name}{{{span_fields}}} {wide_msg} {bar:40} {percent:>3}%",
-    )
-    .expect("hard-coded template should be valid")
-}
-
 /// Runs a function whenever a `value` changes "enough".
 ///
 /// See [`Self::update`], and especially [`Self::update_span_progress`].
@@ -94,3 +87,14 @@ pub mod oid_serde {
             .and_then(|oid| Oid::from_str(&oid).map_err(<D::Error as serde::de::Error>::custom))
     }
 }
+
+/// Sets up progress tracking for Git operations with a progress bar.
+pub fn setup_progress_tracking(span: tracing::Span) -> (tracing::Span, Quantizer) {
+    span.pb_set_style(&ProgressStyle::with_template(
+        "{span_child_prefix}{spinner} {span_name}{{{span_fields}}} {wide_msg} {bar:40} {percent:>3}%",
+    )
+    .expect("hard-coded template should be valid"));
+    let _ = span.enter();
+    let quantizer = Quantizer::percent();
+    (span, quantizer)
+}