From a6ecb1c6a898062001d3529b48e513ff80f2d01e Mon Sep 17 00:00:00 2001
From: _ <>
Date: Thu, 26 Nov 2020 23:51:10 +0000
Subject: [PATCH] :recycle: Move load_toml into server

---
 src/bin/ptth_file_server.rs   | 2 +-
 src/bin/ptth_server.rs        | 2 +-
 src/lib.rs                    | 1 -
 src/server/file_server.rs     | 2 +-
 src/{ => server}/load_toml.rs | 0
 src/server/mod.rs             | 1 +
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{ => server}/load_toml.rs (100%)

diff --git a/src/bin/ptth_file_server.rs b/src/bin/ptth_file_server.rs
index bbcfcf9..bb6ca9e 100644
--- a/src/bin/ptth_file_server.rs
+++ b/src/bin/ptth_file_server.rs
@@ -103,7 +103,7 @@ async fn main () -> Result <(), Box <dyn Error>> {
 	tracing_subscriber::fmt::init ();
 	
 	let path = PathBuf::from ("./config/ptth_server.toml");
-	let config_file: ConfigFile = ptth::load_toml::load (&path);
+	let config_file: ConfigFile = ptth::server::load_toml::load (&path);
 	info! ("file_server_root: {:?}", config_file.file_server_root);
 	
 	let addr = SocketAddr::from(([0, 0, 0, 0], 4000));
diff --git a/src/bin/ptth_server.rs b/src/bin/ptth_server.rs
index 4b4e047..ee52100 100644
--- a/src/bin/ptth_server.rs
+++ b/src/bin/ptth_server.rs
@@ -27,7 +27,7 @@ fn main () -> Result <(), Box <dyn Error>> {
 	
 	tracing_subscriber::fmt::init ();
 	let path = opt.config_path.clone ().unwrap_or_else (|| PathBuf::from ("./config/ptth_server.toml"));
-	let config_file: ptth::server::ConfigFile = ptth::load_toml::load (&path);
+	let config_file: ptth::server::ConfigFile = ptth::server::load_toml::load (&path);
 	
 	if opt.print_tripcode {
 		println! (r#""{}" = "{}""#, config_file.name, config_file.tripcode ());
diff --git a/src/lib.rs b/src/lib.rs
index e0e2cf3..ec195a0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,7 +8,6 @@ pub const PTTH_MAGIC_HEADER: &str = "X-PTTH-2LJYXWC4";
 pub mod git_version;
 pub mod graceful_shutdown;
 pub mod http_serde;
-pub mod load_toml;
 pub mod prelude;
 pub mod relay;
 pub mod server;
diff --git a/src/server/file_server.rs b/src/server/file_server.rs
index 1c2cf77..4b519b7 100644
--- a/src/server/file_server.rs
+++ b/src/server/file_server.rs
@@ -537,7 +537,7 @@ async fn internal_serve_all (
 		use std::os::unix::fs::PermissionsExt;
 		
 		let file_md = file.metadata ().await.unwrap ();
-		if file_md.permissions ().mode () == crate::load_toml::CONFIG_PERMISSIONS_MODE 
+		if file_md.permissions ().mode () == super::load_toml::CONFIG_PERMISSIONS_MODE 
 		{
 			return Forbidden;
 		}
diff --git a/src/load_toml.rs b/src/server/load_toml.rs
similarity index 100%
rename from src/load_toml.rs
rename to src/server/load_toml.rs
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 784354f..f89fe55 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -23,6 +23,7 @@ use crate::{
 };
 
 pub mod file_server;
+pub mod load_toml;
 
 // Thanks to https://github.com/robsheldon/bad-passwords-index