diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2024-01-13 05:11:59 +0000 |
|---|---|---|
| committer | Sven-Hendrik Haase <svenstaro@gmail.com> | 2024-01-13 05:11:59 +0000 |
| commit | 562b62a0b638d2ca0731f83476a2e5f74757962a (patch) | |
| tree | 2073b8249218f86e95d57b7734310495cb7db109 /src/config.rs | |
| parent | Fix formatting (diff) | |
| download | miniserve-562b62a0b638d2ca0731f83476a2e5f74757962a.tar.gz miniserve-562b62a0b638d2ca0731f83476a2e5f74757962a.zip | |
Clean up default order function
I removed the stringly typing as we already have enums for this that we can make use of.
Diffstat (limited to '')
| -rw-r--r-- | src/config.rs | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/config.rs b/src/config.rs index 491ac40..bfe916b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -52,10 +52,10 @@ pub struct MiniserveConfig { pub show_hidden: bool, /// Default sorting method - pub default_sorting_method: Option<SortingMethod>, + pub default_sorting_method: SortingMethod, /// Default sorting order - pub default_sorting_order: Option<SortingOrder>, + pub default_sorting_order: SortingOrder, /// Route prefix; Either empty or prefixed with slash pub route_prefix: String, @@ -272,24 +272,6 @@ impl MiniserveConfig { .transpose()? .unwrap_or_default(); - let default_sorting_method: Option<SortingMethod> = match args - .default_sorting_method - .to_owned() - .parse::<SortingMethod>() - { - Ok(value) => Some(value), - Err(_) => None, - }; - - let default_sorting_order: Option<SortingOrder> = match args - .default_sorting_order - .to_owned() - .parse::<SortingOrder>() - { - Ok(value) => Some(value), - Err(_) => None, - }; - Ok(MiniserveConfig { verbose: args.verbose, path: args.path.unwrap_or_else(|| PathBuf::from(".")), @@ -299,8 +281,8 @@ impl MiniserveConfig { path_explicitly_chosen, no_symlinks: args.no_symlinks, show_hidden: args.hidden, - default_sorting_method, - default_sorting_order, + default_sorting_method: args.default_sorting_method, + default_sorting_order: args.default_sorting_order, route_prefix, favicon_route, css_route, |