From c7838f952f9e32bb871ea6453595b8b14e8fdd3e Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 18 Sep 2024 11:11:41 +0100 Subject: fix(remote): reporter lines on narrow terminals remove the correct number of lines when reporter prints to narrow terminals --- src/bin/git_remote_nostr/fetch.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/bin/git_remote_nostr/fetch.rs') diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index fed9925..5dd6ce8 100644 --- a/src/bin/git_remote_nostr/fetch.rs +++ b/src/bin/git_remote_nostr/fetch.rs @@ -20,9 +20,9 @@ use ngit::{ }; use crate::utils::{ - fetch_or_list_error_is_not_authentication_failure, find_proposal_and_patches_by_branch_name, - get_oids_from_fetch_batch, get_open_proposals, get_read_protocols_to_try, join_with_and, - set_protocol_preference, Direction, + count_lines_per_msg_vec, fetch_or_list_error_is_not_authentication_failure, + find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch, get_open_proposals, + get_read_protocols_to_try, join_with_and, set_protocol_preference, Direction, }; pub async fn run_fetch( @@ -270,7 +270,9 @@ impl<'a> FetchReporter<'a> { } } fn count_all_existing_lines(&self) -> usize { - self.remote_msgs.len() + self.transfer_progress_msgs.len() + let width = self.term.size().1; + count_lines_per_msg_vec(width, &self.remote_msgs, "remote: ".len()) + + count_lines_per_msg_vec(width, &self.transfer_progress_msgs, 0) } fn just_write_transfer_progress(&self, lines_to_clear: usize) { let _ = self.term.clear_last_lines(lines_to_clear); @@ -279,7 +281,8 @@ impl<'a> FetchReporter<'a> { } } fn just_count_transfer_progress(&self) -> usize { - self.transfer_progress_msgs.len() + let width = self.term.size().1; + count_lines_per_msg_vec(width, &self.transfer_progress_msgs, 0) } fn process_remote_msg(&mut self, data: &[u8]) { if let Ok(data) = str::from_utf8(data) { -- cgit v1.2.3