reactor
/
ptth
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

♻️ refactor: remove pointless `Option <>` for file server root

main
_ 2021-08-29 19:49:32 -05:00
parent 259f71b478
commit 324c1f7cd6
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ptth_file_server_bin/src/main.rs
View File

@ -95,7 +95,7 @@ async fn main () -> anyhow::Result <()> {
}); });
let state = Arc::new (FileServer::new ( let state = Arc::new (FileServer::new (
config_file.file_server_root, config_file.file_server_root.unwrap_or_else (|| PathBuf::from (".")),
&PathBuf::new (), &PathBuf::new (),
config_file.name.unwrap_or_else (|| "PTTH File Server".to_string ()), config_file.name.unwrap_or_else (|| "PTTH File Server".to_string ()),
metrics_interval, metrics_interval,

2
crates/ptth_server/src/bin/ptth_server.rs
View File

@ -105,7 +105,7 @@ async fn main () -> Result <(), anyhow::Error> {
name: opt.name.or (config_file.name).ok_or (anyhow::anyhow! ("`name` must be provided in command line or config file"))?, name: opt.name.or (config_file.name).ok_or (anyhow::anyhow! ("`name` must be provided in command line or config file"))?,
api_key: config_file.api_key, api_key: config_file.api_key,
relay_url: opt.relay_url.or (config_file.relay_url).ok_or (anyhow::anyhow! ("`--relay-url` must be provided in command line or `relay_url` in config file"))?, relay_url: opt.relay_url.or (config_file.relay_url).ok_or (anyhow::anyhow! ("`--relay-url` must be provided in command line or `relay_url` in config file"))?,
file_server_root: opt.file_server_root.or (config_file.file_server_root), file_server_root: opt.file_server_root.or (config_file.file_server_root).unwrap_or_else (|| PathBuf::from (".")),
throttle_upload: opt.throttle_upload, throttle_upload: opt.throttle_upload,
}; };

9
crates/ptth_server/src/file_server.rs
View File

@ -56,7 +56,7 @@ use errors::FileServerError;
#[derive (Default)] #[derive (Default)]
pub struct Config { pub struct Config {
pub file_server_root: Option <PathBuf>, pub file_server_root: PathBuf,
} }
pub struct FileServer { pub struct FileServer {
@ -69,7 +69,7 @@ pub struct FileServer {
impl FileServer { impl FileServer {
pub fn new ( pub fn new (
file_server_root: Option <PathBuf>, file_server_root: PathBuf,
asset_root: &Path, asset_root: &Path,
name: String, name: String,
metrics_interval: Arc <ArcSwap <Option <metrics::Interval>>>, metrics_interval: Arc <ArcSwap <Option <metrics::Interval>>>,
@ -364,10 +364,7 @@ impl FileServer {
resp resp
} }
let default_root = PathBuf::from ("./"); let root: &std::path::Path = &self.config.file_server_root;
let root: &std::path::Path = self.config.file_server_root
.as_ref ()
.unwrap_or (&default_root);
Ok (match internal::serve_all (root, method, uri, headers, self.hidden_path.as_deref ()).await? { Ok (match internal::serve_all (root, method, uri, headers, self.hidden_path.as_deref ()).await? {
Favicon => serve_error (StatusCode::NotFound, "Not found\n"), Favicon => serve_error (StatusCode::NotFound, "Not found\n"),

6
crates/ptth_server/src/lib.rs
View File

@ -214,7 +214,7 @@ pub struct ConfigFile {
/// Directory that the file server module will expose to clients /// Directory that the file server module will expose to clients
/// over the relay. If None, the current working dir is used. /// over the relay. If None, the current working dir is used.
pub file_server_root: Option <PathBuf>, pub file_server_root: PathBuf,
/// For debugging. /// For debugging.
pub throttle_upload: bool, pub throttle_upload: bool,
@ -227,7 +227,7 @@ impl ConfigFile {
name, name,
api_key, api_key,
relay_url, relay_url,
file_server_root: None, file_server_root: PathBuf::from ("."),
throttle_upload: false, throttle_upload: false,
} }
} }
@ -267,7 +267,7 @@ impl Builder {
name, name,
api_key: ptth_core::gen_key (), api_key: ptth_core::gen_key (),
relay_url, relay_url,
file_server_root: None, file_server_root: PathBuf::from ("."),
throttle_upload: false, throttle_upload: false,
}; };

2
crates/ptth_server_gui/src/main.rs
View File

@ -57,7 +57,7 @@ fn main ()
name: gui.input_name.value ().to_string (), name: gui.input_name.value ().to_string (),
api_key: gui.input_api_key.value ().to_string (), api_key: gui.input_api_key.value ().to_string (),
relay_url: gui.input_relay_url.value ().to_string (), relay_url: gui.input_relay_url.value ().to_string (),
file_server_root: Some (std::path::PathBuf::from (gui.input_file_server_root.value ())), file_server_root: std::path::PathBuf::from (gui.input_file_server_root.value ()),
throttle_upload: false, throttle_upload: false,
}; };