diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-12-16 07:58:54 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-12-16 08:55:50 +0000 |
| commit | 5fe839e2bf8ceb2931c1984efb2d956980431203 (patch) | |
| tree | b8091597db6999ec2de65ac2dd091611a37354ba /src/bin/git_remote_nostr/fetch.rs | |
| parent | 40463a9073df4033622066bd0c548e1549e0a953 (diff) | |
chore: nix flake update
update nix dependancies to latest version using default update options
fix warning related to idomatic patterns
Diffstat (limited to 'src/bin/git_remote_nostr/fetch.rs')
| -rw-r--r-- | src/bin/git_remote_nostr/fetch.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index 90387f3..458c6d8 100644 --- a/src/bin/git_remote_nostr/fetch.rs +++ b/src/bin/git_remote_nostr/fetch.rs | |||
| @@ -141,9 +141,11 @@ async fn fetch_proposals( | |||
| 141 | let current_user = get_curent_user(git_repo)?; | 141 | let current_user = get_curent_user(git_repo)?; |
| 142 | 142 | ||
| 143 | for refstr in proposal_refs.keys() { | 143 | for refstr in proposal_refs.keys() { |
| 144 | if let Some((_, (_, patches))) = | 144 | if let Some((_, (_, patches))) = find_proposal_and_patches_by_branch_name( |
| 145 | find_proposal_and_patches_by_branch_name(refstr, &open_proposals, ¤t_user) | 145 | refstr, |
| 146 | { | 146 | &open_proposals, |
| 147 | current_user.as_ref(), | ||
| 148 | ) { | ||
| 147 | if let Err(error) = make_commits_for_proposal(git_repo, repo_ref, patches) { | 149 | if let Err(error) = make_commits_for_proposal(git_repo, repo_ref, patches) { |
| 148 | term.write_line( | 150 | term.write_line( |
| 149 | format!("WARNING: failed to create branch for {refstr}, error: {error}",) | 151 | format!("WARNING: failed to create branch for {refstr}, error: {error}",) |
| @@ -234,7 +236,7 @@ pub fn fetch_from_git_server( | |||
| 234 | fn report_on_transfer_progress( | 236 | fn report_on_transfer_progress( |
| 235 | progress_stats: &Progress<'_>, | 237 | progress_stats: &Progress<'_>, |
| 236 | start_time: &Instant, | 238 | start_time: &Instant, |
| 237 | end_time: &Option<Instant>, | 239 | end_time: Option<&Instant>, |
| 238 | ) -> Vec<String> { | 240 | ) -> Vec<String> { |
| 239 | let mut report = vec![]; | 241 | let mut report = vec![]; |
| 240 | let total = progress_stats.total_objects() as f64; | 242 | let total = progress_stats.total_objects() as f64; |
| @@ -378,8 +380,11 @@ impl<'a> FetchReporter<'a> { | |||
| 378 | self.start_time = Some(Instant::now()); | 380 | self.start_time = Some(Instant::now()); |
| 379 | } | 381 | } |
| 380 | let existing_lines = self.just_count_transfer_progress(); | 382 | let existing_lines = self.just_count_transfer_progress(); |
| 381 | let updated = | 383 | let updated = report_on_transfer_progress( |
| 382 | report_on_transfer_progress(progress_stats, &self.start_time.unwrap(), &self.end_time); | 384 | progress_stats, |
| 385 | &self.start_time.unwrap(), | ||
| 386 | self.end_time.as_ref(), | ||
| 387 | ); | ||
| 383 | if self.transfer_progress_msgs.len() <= updated.len() { | 388 | if self.transfer_progress_msgs.len() <= updated.len() { |
| 384 | if self.end_time.is_none() && updated.first().is_some_and(|f| f.contains("100%")) { | 389 | if self.end_time.is_none() && updated.first().is_some_and(|f| f.contains("100%")) { |
| 385 | self.end_time = Some(Instant::now()); | 390 | self.end_time = Some(Instant::now()); |