add file_server_root CLI opt too
parent
5b7934169b
commit
a356d981a8
|
@ -14,8 +14,8 @@ use ptth_server::{
|
||||||
|
|
||||||
#[derive (Debug, StructOpt)]
|
#[derive (Debug, StructOpt)]
|
||||||
struct Opt {
|
struct Opt {
|
||||||
//#[structopt (long)]
|
#[structopt (long)]
|
||||||
//file_server_root: Option <PathBuf>,
|
file_server_root: Option <PathBuf>,
|
||||||
|
|
||||||
#[structopt (long)]
|
#[structopt (long)]
|
||||||
asset_root: Option <PathBuf>,
|
asset_root: Option <PathBuf>,
|
||||||
|
@ -54,7 +54,7 @@ fn main () -> Result <(), anyhow::Error> {
|
||||||
name: opt.name.or (config_file.name).expect ("`name` must be provided in command line or config file"),
|
name: opt.name.or (config_file.name).expect ("`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).expect ("`relay_url` must be provided in command line of config file"),
|
relay_url: opt.relay_url.or (config_file.relay_url).expect ("`relay_url` must be provided in command line of config file"),
|
||||||
file_server_root: config_file.file_server_root,
|
file_server_root: opt.file_server_root.or (config_file.file_server_root),
|
||||||
};
|
};
|
||||||
|
|
||||||
if opt.print_tripcode {
|
if opt.print_tripcode {
|
||||||
|
|
Loading…
Reference in New Issue