diff options
author | Jeff Zhao <jeff.no.zhao@gmail.com> | 2024-02-28 16:21:58 -0500 |
---|---|---|
committer | Jeff Zhao <jeff.no.zhao@gmail.com> | 2024-02-28 16:21:58 -0500 |
commit | dfbf093611d77e5d95c34f11a496f7f2001273ab (patch) | |
tree | a89d22b24d752a01c7f245a5654030777a00b84b /src/config/clean/app/config.rs | |
parent | 83bde18aca7078b846f2fc6bbe0f718c4e8c9aec (diff) | |
parent | 0796039c8a135951e1bff3654cd7a2dc8039c0fe (diff) |
Merge branch 'main' of github.com:kamiyaa/joshuto
Diffstat (limited to 'src/config/clean/app/config.rs')
-rw-r--r-- | src/config/clean/app/config.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/config/clean/app/config.rs b/src/config/clean/app/config.rs index 0995e8d..ee3a24b 100644 --- a/src/config/clean/app/config.rs +++ b/src/config/clean/app/config.rs @@ -2,9 +2,8 @@ use std::collections::HashMap; use crate::{ config::{ - parse_config_or_default, raw::app::{AppConfigRaw, CustomCommand}, - TomlConfigFile, + ConfigType, TomlConfigFile, }, error::AppResult, }; @@ -22,6 +21,7 @@ pub struct AppConfig { pub watch_files: bool, pub custom_commands: Vec<CustomCommand>, pub focus_on_create: bool, + pub mouse_support: bool, pub cmd_aliases: HashMap<String, String>, pub _display_options: DisplayOption, pub _preview_options: PreviewOption, @@ -71,8 +71,10 @@ impl std::default::Default for AppConfig { } impl TomlConfigFile for AppConfig { - fn get_config(file_name: &str) -> Self { - parse_config_or_default::<AppConfigRaw, AppConfig>(file_name) + type Raw = AppConfigRaw; + + fn get_type() -> ConfigType { + ConfigType::App } } @@ -85,6 +87,7 @@ impl From<AppConfigRaw> for AppConfig { watch_files: raw.watch_files, cmd_aliases: raw.cmd_aliases, focus_on_create: raw.focus_on_create, + mouse_support: raw.mouse_support, _display_options: DisplayOption::from(raw.display_options), _preview_options: PreviewOption::from(raw.preview_options), _search_options: SearchOption::from(raw.search_options), |