From bbc00edc6508ea1910c4d9e6a272f7859900950d Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 22:14:16 -0400 Subject: end of summer refactor (#31) * crates: `bot-*` -> `discord-bot` I didn't really need all these crates to be split :/ * discord-bot: revamp http impl also handles the new errors reported by teawieAPI * crates: split http backend this can be reused easily * git-tracker: short-circuit boolean logic We don't need to check if the commit is a descendant of the HEAD of the branch if it *is* the HEAD * nix: fenix -> nixpkgs * treefmt: add actionlint * nix: use docker arch names for containers * ci: use actions-rust-lang actions * nix: drop ci dev shell * git-tracker: init ManagedRepository this logic can be shared * ci: use nix for clippy scan * discord-bot: better handle unmerged PRs * ci: fix treefmt check * nix: fix clippy check * .env.template: update crate names * git-tracker: use remote name for remote name i was half asleep * discord-bot: handle merged PRs that aren't found in any tracked branches * git-tracker: make collect_statuses_in() return a Vec * discord-bot: add more PR info with response fixes #18 --- crates/bot-jobs/src/repo.rs | 77 --------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 crates/bot-jobs/src/repo.rs (limited to 'crates/bot-jobs/src/repo.rs') diff --git a/crates/bot-jobs/src/repo.rs b/crates/bot-jobs/src/repo.rs deleted file mode 100644 index 4d3e214..0000000 --- a/crates/bot-jobs/src/repo.rs +++ /dev/null @@ -1,77 +0,0 @@ -use bot_consts::{NIXPKGS_REMOTE, NIXPKGS_URL}; -use bot_error::Error; - -use std::{io::Write, path::Path}; - -use git2::{AutotagOption, FetchOptions, RemoteCallbacks, Repository}; -use log::{debug, info, trace, warn}; - -pub const TTL_SECS: u64 = 60 * 5; // 5 minutes - -// much of this is shamelessly lifted from -// https://github.com/rust-lang/git2-rs/blob/9a5c9706ff578c936be644dd1e8fe155bdc4d129/examples/pull.rs - -/// basic set of options for fetching from remotes -fn fetch_options<'a>() -> FetchOptions<'a> { - let mut remote_callbacks = RemoteCallbacks::new(); - remote_callbacks.transfer_progress(|progress| { - if progress.received_objects() == progress.total_objects() { - trace!( - "Resolving deltas {}/{}\r", - progress.indexed_deltas(), - progress.total_deltas() - ); - } else { - trace!( - "Received {}/{} objects ({}) in {} bytes\r", - progress.received_objects(), - progress.total_objects(), - progress.indexed_objects(), - progress.received_bytes() - ); - } - std::io::stdout().flush().ok(); - true - }); - - let mut fetch_opts = FetchOptions::new(); - fetch_opts.remote_callbacks(remote_callbacks); - - fetch_opts -} - -/// update the given branches in the [`repository`] using the nixpkgs remote -fn update_branches_in(repository: &Repository, branches: &[String]) -> Result<(), Error> { - let mut remote = repository.find_remote(NIXPKGS_REMOTE)?; - // download all the refs - remote.download(branches, Some(&mut fetch_options()))?; - remote.disconnect()?; - // and (hopefully) update what they refer to for later - remote.update_tips(None, true, AutotagOption::Auto, None)?; - - Ok(()) -} - -pub fn fetch_or_update_repository(path: &str, branches: &[String]) -> Result<(), Error> { - // Open our repository or clone it if it doesn't exist - let path = Path::new(path); - let repository = if path.exists() { - Repository::open(path)? - } else { - warn!( - "Couldn't find repository at {}! Cloning a fresh one from {NIXPKGS_URL}", - path.display() - ); - Repository::clone(NIXPKGS_URL, path)?; - info!("Finished cloning to {}", path.display()); - - // bail early as we already have a fresh copy - return Ok(()); - }; - - debug!("Updating repository at {}", path.display()); - update_branches_in(&repository, branches)?; - debug!("Finished updating!"); - - Ok(()) -} -- cgit v1.2.3