technofab/tmux-copyrat
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/tmux-copyrat.git synced 2025-12-16 01:43:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: refactor config

Browse source
This commit is contained in:
graelo 2021-03-21 11:32:57 +01:00
parent 2b331c2862
commit a26a4a56d8
4 changed files with 65 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/config/basic.rs
View file

@ -1,6 +1,4 @@
use clap::Clap;
use std::collections::HashMap;
use std::path;
use std::str::FromStr;
use crate::{
@ -46,6 +44,10 @@ pub struct Config {
#[clap(short, long)]
pub unique_hint: bool,
/// Move focus back to first/last match.
#[clap(short = 'w', long)]
pub focus_wrap_around: bool,
#[clap(flatten)]
pub colors: ui::colors::UiColors,
@ -53,10 +55,6 @@ pub struct Config {
#[clap(long, arg_enum, default_value = "leading")]
pub hint_alignment: ui::HintAlignment,
/// Move focus back to first/last match.
#[clap(long)]
pub focus_wrap_around: bool,
/// Optional hint styling.
///
/// Underline or surround the hint for increased visibility.
@ -68,10 +66,6 @@ pub struct Config {
#[clap(long, default_value = "{}",
parse(try_from_str = parse_chars))]
pub hint_surroundings: (char, char),
/// Optional target path where to store the selected matches.
#[clap(short = 'o', long = "output", parse(from_os_str))]
pub target_path: Option<path::PathBuf>,
}
/// Type introduced due to parsing limitation,
@ -100,53 +94,10 @@ impl FromStr for HintStyleArg {
/// Try to parse a `&str` into a tuple of `char`s.
fn parse_chars(src: &str) -> Result<(char, char), error::ParseError> {
if src.len() != 2 {
if src.chars().count() != 2 {
return Err(error::ParseError::ExpectedSurroundingPair);
}
let chars: Vec<char> = src.chars().collect();
Ok((chars[0], chars[1]))
}
impl Config {
/// Try parsing provided options, and update self with the valid values.
pub fn merge_map(
&mut self,
options: &HashMap<String, String>,
) -> Result<(), error::ParseError> {
for (name, value) in options {
match name.as_ref() {
"@copyrat-alphabet" => {
self.alphabet = alphabet::parse_alphabet(value)?;
}
"@copyrat-pattern-name" => {
self.named_patterns = vec![regexes::parse_pattern_name(value)?]
}
"@copyrat-custom-pattern" => self.custom_patterns = vec![String::from(value)],
"@copyrat-reverse" => {
self.reverse = value.parse::<bool>()?;
}
"@copyrat-unique-hint" => {
self.unique_hint = value.parse::<bool>()?;
}
"@copyrat-match-fg" => self.colors.match_fg = ui::colors::parse_color(value)?,
"@copyrat-match-bg" => self.colors.match_bg = ui::colors::parse_color(value)?,
"@copyrat-focused-fg" => self.colors.focused_fg = ui::colors::parse_color(value)?,
"@copyrat-focused-bg" => self.colors.focused_bg = ui::colors::parse_color(value)?,
"@copyrat-hint-fg" => self.colors.hint_fg = ui::colors::parse_color(value)?,
"@copyrat-hint-bg" => self.colors.hint_bg = ui::colors::parse_color(value)?,
"@copyrat-hint-alignment" => {
self.hint_alignment = ui::HintAlignment::from_str(&value)?
}
"@copyrat-hint-style" => self.hint_style = Some(HintStyleArg::from_str(&value)?),
// Ignore unknown options.
_ => (),
}
}
Ok(())
}
}