From 45abda2b6d491a86656121e622dbee06b30eb16b Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 7 Aug 2023 14:23:47 +0200
Subject: [PATCH] Move server code into its own module

---
 src/main.rs                         |  6 ++----
 src/server.rs                       | 13 +++++++++++++
 src/{ => server}/recurring.rs       |  0
 src/{ => server}/recurring/queue.rs |  0
 src/{ => server}/recurring/repo.rs  |  0
 src/{ => server}/web.rs             |  0
 src/{ => server}/web/commit.rs      |  0
 src/{ => server}/web/commit_hash.rs |  0
 src/{ => server}/web/index.rs       |  0
 src/{ => server}/web/queue.rs       |  0
 src/{ => server}/web/queue_id.rs    |  0
 src/{ => server}/web/static.rs      |  0
 12 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/server.rs
 rename src/{ => server}/recurring.rs (100%)
 rename src/{ => server}/recurring/queue.rs (100%)
 rename src/{ => server}/recurring/repo.rs (100%)
 rename src/{ => server}/web.rs (100%)
 rename src/{ => server}/web/commit.rs (100%)
 rename src/{ => server}/web/commit_hash.rs (100%)
 rename src/{ => server}/web/index.rs (100%)
 rename src/{ => server}/web/queue.rs (100%)
 rename src/{ => server}/web/queue_id.rs (100%)
 rename src/{ => server}/web/static.rs (100%)

diff --git a/src/main.rs b/src/main.rs
index 2cb1108..c306618 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,9 @@
 mod args;
 mod config;
-mod recurring;
+mod server;
 mod somehow;
 mod state;
 mod util;
-mod web;
 
 use std::{io, path::PathBuf, process};
 
@@ -105,8 +104,7 @@ async fn run() -> somehow::Result<()> {
     info!("Startup complete, running");
     select! {
         _ = wait_for_signal() => {}
-        _ = web::run(state.clone()) => {}
-        _ = recurring::run(state.clone()) => {}
+        _ = server::run(state.clone()) => {}
     }
 
     select! {
diff --git a/src/server.rs b/src/server.rs
new file mode 100644
index 0000000..b0cd53c
--- /dev/null
+++ b/src/server.rs
@@ -0,0 +1,13 @@
+mod recurring;
+mod web;
+
+use tokio::select;
+
+use crate::{somehow, state::AppState};
+
+pub async fn run(state: AppState) -> somehow::Result<()> {
+    select! {
+        e = web::run(state.clone()) => e,
+        () = recurring::run(state.clone()) => Ok(()),
+    }
+}
diff --git a/src/recurring.rs b/src/server/recurring.rs
similarity index 100%
rename from src/recurring.rs
rename to src/server/recurring.rs
diff --git a/src/recurring/queue.rs b/src/server/recurring/queue.rs
similarity index 100%
rename from src/recurring/queue.rs
rename to src/server/recurring/queue.rs
diff --git a/src/recurring/repo.rs b/src/server/recurring/repo.rs
similarity index 100%
rename from src/recurring/repo.rs
rename to src/server/recurring/repo.rs
diff --git a/src/web.rs b/src/server/web.rs
similarity index 100%
rename from src/web.rs
rename to src/server/web.rs
diff --git a/src/web/commit.rs b/src/server/web/commit.rs
similarity index 100%
rename from src/web/commit.rs
rename to src/server/web/commit.rs
diff --git a/src/web/commit_hash.rs b/src/server/web/commit_hash.rs
similarity index 100%
rename from src/web/commit_hash.rs
rename to src/server/web/commit_hash.rs
diff --git a/src/web/index.rs b/src/server/web/index.rs
similarity index 100%
rename from src/web/index.rs
rename to src/server/web/index.rs
diff --git a/src/web/queue.rs b/src/server/web/queue.rs
similarity index 100%
rename from src/web/queue.rs
rename to src/server/web/queue.rs
diff --git a/src/web/queue_id.rs b/src/server/web/queue_id.rs
similarity index 100%
rename from src/web/queue_id.rs
rename to src/server/web/queue_id.rs
diff --git a/src/web/static.rs b/src/server/web/static.rs
similarity index 100%
rename from src/web/static.rs
rename to src/server/web/static.rs