From 50a969ede64af5115bba2807bf0481db34b6bd29 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Thu, 18 Apr 2024 20:26:19 +0100
Subject: [PATCH] refactor: move server config loading out of forgejo module

Delete empty modules left over
---
 src/server/actors/repo/config.rs              | 28 +++++--------------
 .../forgejo/config.rs => config/load.rs}      |  0
 src/server/{config.rs => config/mod.rs}       |  2 ++
 src/server/forge/forgejo/mod.rs               |  1 -
 src/server/forge/mock/config.rs               | 14 ----------
 src/server/forge/mock/mod.rs                  |  1 -
 src/server/forge/mod.rs                       |  7 -----
 src/server/forge/tests.rs                     | 10 -------
 src/server/mod.rs                             |  1 -
 9 files changed, 9 insertions(+), 55 deletions(-)
 rename src/server/{forge/forgejo/config.rs => config/load.rs} (100%)
 rename src/server/{config.rs => config/mod.rs} (99%)
 delete mode 100644 src/server/forge/forgejo/mod.rs
 delete mode 100644 src/server/forge/mock/config.rs
 delete mode 100644 src/server/forge/mock/mod.rs
 delete mode 100644 src/server/forge/mod.rs
 delete mode 100644 src/server/forge/tests.rs

diff --git a/src/server/actors/repo/config.rs b/src/server/actors/repo/config.rs
index 32ef412..f1eb98e 100644
--- a/src/server/actors/repo/config.rs
+++ b/src/server/actors/repo/config.rs
@@ -1,30 +1,16 @@
 use actix::prelude::*;
 use tracing::error;
 
-use crate::server::{
-    config::{ForgeType, RepoDetails},
-    forge, gitforge,
-};
+use crate::server::{config::RepoDetails, gitforge};
 
 use super::{LoadedConfig, RepoActor};
 
-pub async fn load(details: RepoDetails, addr: Addr<RepoActor>, forge: gitforge::Forge) {
-    let config = match details.config {
-        Some(config) => config,
-        None => {
-            let config = match details.forge.forge_type {
-                #[cfg(feature = "forgejo")]
-                ForgeType::ForgeJo => forge::forgejo::config::load(&details, &forge).await,
-                #[cfg(test)]
-                ForgeType::MockForge => forge::mock::config::load(&details, &forge).await,
-            };
-            match config {
-                Ok(config) => config,
-                Err(err) => {
-                    error!(?err, "Failed to load config");
-                    return;
-                }
-            }
+pub async fn load(repo_details: RepoDetails, addr: Addr<RepoActor>, forge: gitforge::Forge) {
+    let config = match crate::server::config::load::load(&repo_details, &forge).await {
+        Ok(config) => config,
+        Err(err) => {
+            error!(?err, "Failed to load config");
+            return;
         }
     };
     addr.do_send(LoadedConfig(config));
diff --git a/src/server/forge/forgejo/config.rs b/src/server/config/load.rs
similarity index 100%
rename from src/server/forge/forgejo/config.rs
rename to src/server/config/load.rs
diff --git a/src/server/config.rs b/src/server/config/mod.rs
similarity index 99%
rename from src/server/config.rs
rename to src/server/config/mod.rs
index 0afd9eb..87402fa 100644
--- a/src/server/config.rs
+++ b/src/server/config/mod.rs
@@ -1,3 +1,5 @@
+pub mod load;
+
 use std::{
     collections::HashMap,
     fmt::{Display, Formatter},
diff --git a/src/server/forge/forgejo/mod.rs b/src/server/forge/forgejo/mod.rs
deleted file mode 100644
index ef68c36..0000000
--- a/src/server/forge/forgejo/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod config;
diff --git a/src/server/forge/mock/config.rs b/src/server/forge/mock/config.rs
deleted file mode 100644
index 6202bd2..0000000
--- a/src/server/forge/mock/config.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use terrors::OneOf;
-
-use crate::server::{
-    config::RepoConfig,
-    forge::forgejo::config::RepoConfigValidationErrors,
-    gitforge::{self, ForgeFileError},
-};
-
-pub async fn load(
-    _details: &crate::server::config::RepoDetails,
-    _forge: &gitforge::Forge,
-) -> Result<RepoConfig, OneOf<(ForgeFileError, toml::de::Error, RepoConfigValidationErrors)>> {
-    todo!()
-}
diff --git a/src/server/forge/mock/mod.rs b/src/server/forge/mock/mod.rs
deleted file mode 100644
index ef68c36..0000000
--- a/src/server/forge/mock/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod config;
diff --git a/src/server/forge/mod.rs b/src/server/forge/mod.rs
deleted file mode 100644
index 44fa00a..0000000
--- a/src/server/forge/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[cfg(feature = "forgejo")]
-pub mod forgejo;
-
-#[cfg(test)]
-pub mod mock;
-#[cfg(test)]
-mod tests;
diff --git a/src/server/forge/tests.rs b/src/server/forge/tests.rs
deleted file mode 100644
index 9b3cf6c..0000000
--- a/src/server/forge/tests.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use kxio::network;
-
-use crate::server::gitforge;
-
-#[test]
-const fn test_is_send() {
-    const fn assert_send<T: Send>() {}
-    assert_send::<gitforge::CommitHistories>();
-    assert_send::<network::NetworkError>();
-}
diff --git a/src/server/mod.rs b/src/server/mod.rs
index ea60455..242a0eb 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,6 +1,5 @@
 mod actors;
 mod config;
-pub mod forge;
 pub mod gitforge;
 pub mod types;