From 5a8f4a0c64e67e6f2874d2cdac131c9bfc82bf4d Mon Sep 17 00:00:00 2001 From: djairoh Date: Wed, 10 May 2023 16:30:55 +0200 Subject: [PATCH] small changes to config/cli --- src/structs/cli.rs | 7 ++++--- src/structs/config.rs | 25 ++++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/structs/cli.rs b/src/structs/cli.rs index ee253c7..4e5d44e 100644 --- a/src/structs/cli.rs +++ b/src/structs/cli.rs @@ -1,14 +1,15 @@ use clap::Parser; -/// Program which finds the active mpris player. +/// Program which finds the active mpris player and displays metadata about the playing piece of media. /// -/// Most configuration is done through config files. +/// This program is intended to be used with polybar. +/// as such, most configuration is done through config files. #[derive(Parser)] pub struct Cli { /// The name of the config file to use. #[arg(short = 'c', long = "config", default_value = "default")] pub config_file: String, - /// Enable debug mod. + /// Enable debug mode. /// /// This mode prints all active players to stdout, to allow one to find the appropriate player names to use in the config files. #[arg(short = 'd', long = "debug")] diff --git a/src/structs/config.rs b/src/structs/config.rs index 187d510..0032351 100644 --- a/src/structs/config.rs +++ b/src/structs/config.rs @@ -47,12 +47,12 @@ impl Default for Rating { #[derive(Serialize, Deserialize)] pub struct Config { - pub metadata_separator: String, - pub array_separator: char, - pub update_delay: u64, pub hide_output: bool, pub fuzzy: bool, pub render_prefix: bool, + pub update_delay: u64, + pub metadata_separator: String, + pub array_separator: char, pub break_character: Option, pub player_priorities: Vec, pub rating_icons: Option, @@ -63,16 +63,16 @@ pub struct Config { impl Default for Config { fn default() -> Self { Config { - update_delay: 300_u64, - metadata_separator: "|".to_owned(), - array_separator: '+', hide_output: true, fuzzy: false, render_prefix: true, - metadata_fields: Config::default_metadata_fields(), - rating_icons: Some(Rating::default()), - player_priorities: Config::default_player_priorities(), + update_delay: 300_u64, + metadata_separator: " | ".to_owned(), + array_separator: '+', break_character: Some('-'), + player_priorities: Config::default_player_priorities(), + rating_icons: Some(Rating::default()), + metadata_fields: Config::default_metadata_fields(), player_prefixes: Config::default_player_prefixes(), } } @@ -108,10 +108,13 @@ impl Config { fn default_player_prefixes() -> HashMap { let mut out: HashMap = HashMap::new(); + out.insert("chromium".to_owned(), 'g'); out.insert("Clementine".to_owned(), 'c'); - out.insert("Firefox".to_owned(), 'f'); - out.insert("Spotify".to_owned(), 's'); out.insert("default".to_owned(), '>'); + out.insert("Firefox".to_owned(), 'f'); + out.insert("mpv".to_owned(), 'm'); + out.insert("Spotify".to_owned(), 's'); + out.insert("VLC Media Player".to_owned(), 'v'); out }