Move util module to server module

src/server/recurring/queue.rs

@@ -2,7 +2,7 @@ use sqlx::{Acquire, SqlitePool};
 use time::OffsetDateTime;
 use tracing::debug;
 
-use crate::{somehow, util};
+use crate::{server::util, somehow};
 
 pub async fn update(db: &SqlitePool) -> somehow::Result<()> {
     debug!("Updating queue");

src/server/recurring/repo.rs

@@ -9,7 +9,7 @@ use gix::{
 use sqlx::{Acquire, SqliteConnection, SqlitePool};
 use tracing::{debug, info};
 
-use crate::{somehow, util};
+use crate::{server::util, somehow};
 
 async fn get_all_commit_hashes_from_db(
     conn: &mut SqliteConnection,

src/server/util.rs

@@ -0,0 +1,76 @@
+use std::time::Duration;
+
+use gix::{actor::IdentityRef, date::Time};
+use rand::{rngs::OsRng, seq::IteratorRandom};
+use time::{macros::format_description, OffsetDateTime, UtcOffset};
+
+use crate::somehow;
+
+const RUN_ID_PREFIX: &str = "r-";
+const RUN_ID_CHARS: &str = "0123456789abcdefghijklmnopqrstuvwxyz";
+const RUN_ID_LEN: usize = 30; // log(16^40, base=len(RUN_ID_CHARS)) ~ 31
+
+pub fn new_run_id() -> String {
+    RUN_ID_PREFIX
+        .chars()
+        .chain((0..RUN_ID_LEN).map(|_| RUN_ID_CHARS.chars().choose(&mut OsRng).unwrap()))
+        .collect()
+}
+
+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_delta(delta: time::Duration) -> String {
+    let seconds = delta.unsigned_abs().as_secs();
+    let seconds = seconds + 30 - (seconds + 30) % 60; // To nearest minute
+    if seconds == 0 {
+        return "now".to_string();
+    }
+    let formatted = humantime::format_duration(Duration::from_secs(seconds));
+    if delta.is_positive() {
+        format!("in {formatted}")
+    } else {
+        format!("{formatted} ago")
+    }
+}
+
+pub fn format_delta_from_now(time: OffsetDateTime) -> String {
+    let now = OffsetDateTime::now_utc();
+    format_delta(time - now)
+}
+
+pub fn format_time(time: OffsetDateTime) -> String {
+    let formatted_time = time
+        .format(format_description!(
+        "[year]-[month]-[day] [hour]:[minute]:[second] [offset_hour sign:mandatory][offset_minute]"
+    ))
+        .expect("invalid date format");
+
+    let formatted_delta = format_delta_from_now(time);
+    format!("{formatted_time} ({formatted_delta})")
+}
+
+pub fn format_actor(author: IdentityRef<'_>) -> somehow::Result<String> {
+    let mut buffer = vec![];
+    author.trim().write_to(&mut buffer)?;
+    Ok(String::from_utf8_lossy(&buffer).to_string())
+}
+
+pub fn format_commit_summary(message: &str) -> String {
+    // Take everything up to the first double newline
+    let title = message
+        .split_once("\n\n")
+        .map(|(t, _)| t)
+        .unwrap_or(message);
+
+    // Turn consecutive whitespace into a single space
+    title.split_whitespace().collect::<Vec<_>>().join(" ")
+}
+
+pub fn format_commit_short(hash: &str, message: &str) -> String {
+    let short_hash = hash.chars().take(8).collect::<String>();
+    let summary = format_commit_summary(message);
+    format!("{short_hash} ({summary})")
+}

src/server/web/commit_hash.rs

@@ -7,7 +7,7 @@ use axum::{
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 

src/server/web/index.rs

@@ -3,7 +3,7 @@ use axum::{extract::State, response::IntoResponse};
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 

src/server/web/queue.rs

@@ -3,7 +3,7 @@ use axum::{extract::State, response::IntoResponse};
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 

src/server/web/queue_id.rs

@@ -6,7 +6,7 @@ use axum::{
 };
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};