diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-08-19 13:32:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 16:32:33 -0400 |
| commit | 4b03b4b0b0a3c716bd834a24e79466586ba9a156 (patch) | |
| tree | 93013003d4b5c8d7c9aa7dd965e83d981a5a71fd /src/options.rs | |
| parent | f6aa8e5d1dfab64848ec2bac2c2b56e10f856b0f (diff) | |
refactor: Refactor code, add new tests
Refactor code so we use a lib, allowing for easier testing. Adds additional tests for layouts.
Diffstat (limited to 'src/options.rs')
| -rw-r--r-- | src/options.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/options.rs b/src/options.rs index e9fb4a29..d772ed9e 100644 --- a/src/options.rs +++ b/src/options.rs @@ -10,7 +10,7 @@ use crate::{ use layout_options::*; -mod layout_options; +pub mod layout_options; #[derive(Default, Deserialize)] pub struct Config { @@ -68,7 +68,7 @@ pub struct ConfigColours { pub fn build_app( matches: &clap::ArgMatches<'static>, config: &Config, widget_layout: &BottomLayout, - default_widget_id: u64, + default_widget_id: u64, default_widget_type_option: &Option<BottomWidgetType>, ) -> error::Result<App> { use BottomWidgetType::*; let autohide_time = get_autohide_time(&matches, &config); @@ -96,7 +96,6 @@ pub fn build_app( None }; - let (default_widget_type_option, _) = get_default_widget_and_count(matches, config)?; let mut initial_widget_id: u64 = default_widget_id; let mut initial_widget_type = Proc; let is_custom_layout = config.row.is_some(); @@ -252,7 +251,7 @@ pub fn build_app( pub fn get_widget_layout( matches: &clap::ArgMatches<'static>, config: &Config, -) -> error::Result<(BottomLayout, u64)> { +) -> error::Result<(BottomLayout, u64, Option<BottomWidgetType>)> { let left_legend = get_use_left_legend(matches, config); let (default_widget_type, mut default_widget_count) = get_default_widget_and_count(matches, config)?; @@ -311,7 +310,7 @@ pub fn get_widget_layout( } }; - Ok((bottom_layout, default_widget_id)) + Ok((bottom_layout, default_widget_id, default_widget_type)) } fn get_update_rate_in_milliseconds( |