From 0a9559f82af823e5470a33575e378f3de08350af Mon Sep 17 00:00:00 2001 From: Joscha Date: Thu, 17 Aug 2023 00:40:51 +0200 Subject: [PATCH] Move function closer to its only uses --- src/server/recurring/repo.rs | 12 +++++++++--- src/server/util.rs | 9 ++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/server/recurring/repo.rs b/src/server/recurring/repo.rs index f3bd8eb..ae8d316 100644 --- a/src/server/recurring/repo.rs +++ b/src/server/recurring/repo.rs @@ -3,8 +3,9 @@ use std::collections::HashSet; 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 time::{OffsetDateTime, UtcOffset}; use tracing::{debug, info}; use crate::{ @@ -67,6 +68,11 @@ fn get_all_refs_and_new_commits_from_repo( Ok((refs, new)) } +fn time_to_offset_datetime(time: Time) -> somehow::Result { + Ok(OffsetDateTime::from_unix_timestamp(time.seconds)? + .to_offset(UtcOffset::from_whole_seconds(time.offset)?)) +} + async fn insert_new_commits( conn: &mut SqliteConnection, repo: &Repository, @@ -77,10 +83,10 @@ async fn insert_new_commits( let hash = commit.id.to_string(); let author_info = commit.author()?; 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 = 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(); sqlx::query!( diff --git a/src/server/util.rs b/src/server/util.rs index 37b5210..8c82799 100644 --- a/src/server/util.rs +++ b/src/server/util.rs @@ -1,15 +1,10 @@ use std::time::Duration; -use gix::{actor::IdentityRef, date::Time}; -use time::{macros::format_description, OffsetDateTime, UtcOffset}; +use gix::actor::IdentityRef; +use time::{macros::format_description, OffsetDateTime}; use crate::somehow; -pub fn time_to_offset_datetime(time: Time) -> somehow::Result { - Ok(OffsetDateTime::from_unix_timestamp(time.seconds)? - .to_offset(UtcOffset::from_whole_seconds(time.offset)?)) -} - pub fn format_duration(duration: time::Duration) -> String { let seconds = duration.unsigned_abs().as_secs(); // To nearest second let formatted = humantime::format_duration(Duration::from_secs(seconds));