cossmass/git-next
1
0
Fork 0
forked from kemitix/git-next
Code Pull requests Activity

refactor: pass RepoDetails by reference

Browse source
This commit is contained in:
Paul Campbell 2024-04-11 14:27:59 +01:00
parent ed1ab6faa5
commit d2d49f353c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/server/actors/repo/status.rs
View file

@ -18,7 +18,7 @@ pub async fn check_next(
// get the status - pass, fail, pending (all others map to fail, e.g. error) // get the status - pass, fail, pending (all others map to fail, e.g. error)
let status = match repo_details.forge.forge_type { let status = match repo_details.forge.forge_type {
ForgeType::ForgeJo => { ForgeType::ForgeJo => {
forge::forgejo::get_commit_status(next.clone(), repo_details, net).await forge::forgejo::get_commit_status(next.clone(), &repo_details, net).await
} }
}; };
info!(?status, "Checking next branch status"); info!(?status, "Checking next branch status");
@ -31,9 +31,8 @@ pub async fn check_next(
} // TODO: (#22) wait and try again OR can webhook tell us when it's done, in } // TODO: (#22) wait and try again OR can webhook tell us when it's done, in
// which case we can do nothing here and wait for the webhook to trigger // which case we can do nothing here and wait for the webhook to trigger
Status::Fail => { Status::Fail => {
warn!("Check have failed"); warn!("Checks have failed");
} // TODO: (#21) reset next and wait for dev to be updated and this }
// commit removed from the commit history before trying again
} }
} }

11
src/server/forge/forgejo/mod.rs
View file

@ -2,6 +2,7 @@ use kxio::network;
use terrors::OneOf; use terrors::OneOf;
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use crate::server;
use crate::server::{actors::repo::status::Status, config::BranchName, forge}; use crate::server::{actors::repo::status::Status, config::BranchName, forge};
use super::CommitHistories; use super::CommitHistories;
@ -9,8 +10,8 @@ use super::CommitHistories;
pub mod config; pub mod config;
pub async fn get_commit_histories( pub async fn get_commit_histories(
repo_details: &crate::server::config::RepoDetails, repo_details: &server::config::RepoDetails,
config: &crate::server::config::RepoConfig, config: &server::config::RepoConfig,
net: &kxio::network::Network, net: &kxio::network::Network,
) -> Result<CommitHistories, OneOf<(network::NetworkError,)>> { ) -> Result<CommitHistories, OneOf<(network::NetworkError,)>> {
let main = (get_commit_history(repo_details, &config.branches().main(), None, net).await)?; let main = (get_commit_history(repo_details, &config.branches().main(), None, net).await)?;
@ -30,9 +31,9 @@ pub async fn get_commit_histories(
#[tracing::instrument(fields(%branch_name),skip_all)] #[tracing::instrument(fields(%branch_name),skip_all)]
async fn get_commit_history( async fn get_commit_history(
repo_details: &crate::server::config::RepoDetails, repo_details: &server::config::RepoDetails,
branch_name: &BranchName, branch_name: &BranchName,
find_commit: Option<&forge::Commit>, // INFO: (#23) if [None] then get only one commit, if [Some] then get all commits up to this one or return an error find_commit: Option<&forge::Commit>,
net: &kxio::network::Network, net: &kxio::network::Network,
) -> Result<Vec<forge::Commit>, OneOf<(network::NetworkError,)>> { ) -> Result<Vec<forge::Commit>, OneOf<(network::NetworkError,)>> {
let hostname = &repo_details.forge.hostname; let hostname = &repo_details.forge.hostname;
@ -94,7 +95,7 @@ struct Commit {
pub async fn get_commit_status( pub async fn get_commit_status(
next: forge::Commit, next: forge::Commit,
repo_details: crate::server::config::RepoDetails, repo_details: &crate::server::config::RepoDetails,
net: network::Network, net: network::Network,
) -> Status { ) -> Status {
let hostname = &repo_details.forge.hostname; let hostname = &repo_details.forge.hostname;