Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move function closer to its only uses

Browse source
This commit is contained in:
Joscha 2023-08-17 00:40:51 +02:00
parent ca6a6be638
commit 0a9559f82a
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/recurring/repo.rs
View file

@ -3,8 +3,9 @@
use std::collections::HashSet; use std::collections::HashSet;
use futures::TryStreamExt; use futures::TryStreamExt;
use gix::{objs::Kind, prelude::ObjectIdExt, refs::Reference, ObjectId, Repository}; use gix::{date::Time, objs::Kind, prelude::ObjectIdExt, refs::Reference, ObjectId, Repository};
use sqlx::{Acquire, SqliteConnection, SqlitePool}; use sqlx::{Acquire, SqliteConnection, SqlitePool};
use time::{OffsetDateTime, UtcOffset};
use tracing::{debug, info}; use tracing::{debug, info};
use crate::{ use crate::{
@ -67,6 +68,11 @@ fn get_all_refs_and_new_commits_from_repo(
Ok((refs, new)) Ok((refs, new))
} }
fn time_to_offset_datetime(time: Time) -> somehow::Result<OffsetDateTime> {
Ok(OffsetDateTime::from_unix_timestamp(time.seconds)?
.to_offset(UtcOffset::from_whole_seconds(time.offset)?))
}
async fn insert_new_commits( async fn insert_new_commits(
conn: &mut SqliteConnection, conn: &mut SqliteConnection,
repo: &Repository, repo: &Repository,
@ -77,10 +83,10 @@ async fn insert_new_commits(
let hash = commit.id.to_string(); let hash = commit.id.to_string();
let author_info = commit.author()?; let author_info = commit.author()?;
let author = util::format_actor(author_info.actor())?; let author = util::format_actor(author_info.actor())?;
let author_date = util::time_to_offset_datetime(author_info.time)?; let author_date = time_to_offset_datetime(author_info.time)?;
let committer_info = commit.committer()?; let committer_info = commit.committer()?;
let committer = util::format_actor(committer_info.actor())?; let committer = util::format_actor(committer_info.actor())?;
let committer_date = util::time_to_offset_datetime(committer_info.time)?; let committer_date = time_to_offset_datetime(committer_info.time)?;
let message = commit.message_raw()?.to_string(); let message = commit.message_raw()?.to_string();
sqlx::query!( sqlx::query!(

9
src/server/util.rs
View file

@ -1,15 +1,10 @@
use std::time::Duration; use std::time::Duration;
use gix::{actor::IdentityRef, date::Time}; use gix::actor::IdentityRef;
use time::{macros::format_description, OffsetDateTime, UtcOffset}; use time::{macros::format_description, OffsetDateTime};
use crate::somehow; use crate::somehow;
pub fn time_to_offset_datetime(time: Time) -> somehow::Result<OffsetDateTime> {
Ok(OffsetDateTime::from_unix_timestamp(time.seconds)?
.to_offset(UtcOffset::from_whole_seconds(time.offset)?))
}
pub fn format_duration(duration: time::Duration) -> String { pub fn format_duration(duration: time::Duration) -> String {
let seconds = duration.unsigned_abs().as_secs(); // To nearest second let seconds = duration.unsigned_abs().as_secs(); // To nearest second
let formatted = humantime::format_duration(Duration::from_secs(seconds)); let formatted = humantime::format_duration(Duration::from_secs(seconds));