From 5e958f48e58712736e6394f15b91997ba5231e01 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 12 Sep 2024 16:54:52 +0100 Subject: fix(remote): `push` status updates push needs to use push_transfer_progress rather than transfer_progress --- src/bin/git_remote_nostr/utils.rs | 63 --------------------------------------- 1 file changed, 63 deletions(-) (limited to 'src/bin/git_remote_nostr/utils.rs') diff --git a/src/bin/git_remote_nostr/utils.rs b/src/bin/git_remote_nostr/utils.rs index 6e09851..15a0d76 100644 --- a/src/bin/git_remote_nostr/utils.rs +++ b/src/bin/git_remote_nostr/utils.rs @@ -310,69 +310,6 @@ pub fn error_might_be_authentication_related(error: &anyhow::Error) -> bool { false } -pub enum TransferDirection { - Fetch, - Push, -} - -pub enum ProgressStatus { - InProgress, - Complete, -} - -#[allow(clippy::cast_precision_loss)] -#[allow(clippy::float_cmp)] -#[allow(clippy::needless_pass_by_value)] -pub fn report_on_transfer_progress( - progress_stats: &git2::Progress<'_>, - term: &console::Term, - direction: TransferDirection, - status: ProgressStatus, -) { - let total = progress_stats.total_objects() as f64; - if total == 0.0 { - return; - } - let received = progress_stats.received_objects() as f64; - let percentage = (received / total) * 100.0; - - // Get the total received bytes - let received_bytes = progress_stats.received_bytes() as f64; - - // Determine whether to use KiB or MiB - let (size, unit) = if received_bytes >= (1024.0 * 1024.0) { - // Convert to MiB - (received_bytes / (1024.0 * 1024.0), "MiB") - } else { - // Convert to KiB - (received_bytes / 1024.0, "KiB") - }; - - // Format the output for receiving objects - if received < total || matches!(status, ProgressStatus::Complete) { - let _ = term.write_line( - format!( - "{} objects: {percentage:.0}% ({received}/{total}) {size:.2} {unit}, done.\r", - if matches!(direction, TransferDirection::Fetch) { - "Receiving" - } else { - "Writing" - }, - ) - .as_str(), - ); - } - if received == total || matches!(status, ProgressStatus::Complete) { - let indexed_deltas = progress_stats.indexed_deltas() as f64; - let total_deltas = progress_stats.total_deltas() as f64; - let percentage = (indexed_deltas / total_deltas) * 100.0; - let _ = term.write_line( - format!("Resolving deltas: {percentage:.0}% ({indexed_deltas}/{total_deltas}) done.\r") - .as_str(), - ); - } -} - pub fn report_on_sideband_progress(data: &[u8], term: &console::Term) { if let Ok(data) = str::from_utf8(data) { let data = data -- cgit v1.2.3