WIP: Conditional map

See #1774

src/blocks/amd_gpu.rs

@@ -66,13 +66,13 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
 
  let info = read_gpu_info(&config.device).await?;
 
- widget.set_values(map! {
+ widget.set_values(map_required!(format, {
  "icon" => Value::icon(api.get_icon("gpu")?),
  "utilization" => Value::percents(info.utilization_percents),
  "vram_total" => Value::bytes(info.vram_total_bytes),
  "vram_used" => Value::bytes(info.vram_used_bytes),
  "vram_used_percents" => Value::percents(info.vram_used_bytes / info.vram_total_bytes * 100.0),
- });
+ }));
 
  widget.state = match info.utilization_percents {
  x if x > 90.0 => State::Critical,

src/blocks/apt.rs

@@ -131,10 +131,10 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  1 => format_singular.clone(),
  _ => format.clone(),
  });
- widget.set_values(map!(
+ widget.set_values(map_required!(format, {
  "count" => Value::number(count),
  "icon" => Value::icon(api.get_icon("update")?)
- ));
+ }));
 
  let warning = warning_updates_regex
  .as_ref()

src/blocks/backlight.rs

@@ -189,10 +189,10 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  if config.invert_icons {
  icon_value = 1.0 - icon_value;
  }
- widget.set_values(map! {
+ widget.set_values(map_required!(format, {
  "icon" => Value::icon(api.get_icon_in_progression("backlight", icon_value)?),
  "brightness" => Value::percents((brightness * 100.0).round())
- });
+ }));
  api.set_widget(widget).await?;
  }
  }

src/blocks/battery.rs

@@ -200,10 +200,12 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  ),
  };
 
- values.insert(
- "icon".into(),
- Value::icon(api.get_icon_in_progression(icon_name, icon_value)?),
- );
+ if format.contains_key("icon") {
+ values.insert(
+ "icon".into(),
+ Value::icon(api.get_icon_in_progression(icon_name, icon_value)?),
+ );
+ }
 
  widget.set_values(values);
  widget.state = state;
@@ -213,7 +215,7 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  let mut widget = Widget::new()
  .with_format(missing_format.clone())
  .with_state(State::Critical);
- widget.set_values(map!("icon" => Value::icon(api.get_icon("bat_not_available")?)));
+ widget.set_values(map_required!(missing_format, {"icon" => Value::icon(api.get_icon("bat_not_available")?)}));
  api.set_widget(widget).await?;
  }
  }

src/blocks/bluetooth.rs

@@ -108,14 +108,14 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
 
  let mut widget = Widget::new();
 
- let values = map! {
+ let values = map_required!(format, {
  "icon" => Value::icon(api.get_icon(device.icon)?),
  "name" => Value::text(device.name),
  "available" => Value::flag(),
  [if let Some(p) = device.battery_percentage] "percentage" => Value::percents(p),
  [if let Some(p) = device.battery_percentage]
  "battery_icon" => Value::icon(api.get_icon_in_progression("bat", p as f64 / 100.0)?),
- };
+ });
 
  if device.connected {
  widget.set_format(format.clone());
@@ -135,7 +135,9 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  None => {
  debug!("Showing device as unavailable");
  let mut widget = Widget::new().with_format(disconnected_format.clone());
- widget.set_values(map!("icon" => Value::icon(api.get_icon("bluetooth")?)));
+ widget.set_values(
+ map_required!(format, {"icon" => Value::icon(api.get_icon("bluetooth")?)}),
+ );
  api.set_widget(widget).await?;
  }
  }

src/blocks/music.rs

@@ -190,11 +190,11 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  Ok(Value::icon(api.get_icon(icon)?).with_instance(instance))
  };
 
- let values = map! {
+ let values = map_required!(format, {
  "icon" => Value::icon(api.get_icon("music")?),
  "next" => new_btn("music_next", NEXT_BTN, api)?,
  "prev" => new_btn("music_prev", PREV_BTN, api)?,
- };
+ });
 
  let preferred_players = match config.player.clone() {
  PlayerName::Single(name) => vec![name],
@@ -336,7 +336,9 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
  }
  None => {
  let mut widget = Widget::new().with_format(format.clone());
- widget.set_values(map!("icon" => Value::icon(api.get_icon("music")?)));
+ widget.set_values(
+ map_required!(format, {"icon" => Value::icon(api.get_icon("music")?)}),
+ );
  api.set_widget(widget).await?;
  }
  }

src/util.rs

@@ -172,6 +172,22 @@ macro_rules! map {
 
 pub use map;
 
+#[macro_export]
+macro_rules! map_required {
+ ($format: ident, {$( $([$($cond_tokens:tt)*])? $key:literal => $value:expr ),* $(,)?}) => {{
+ #[allow(unused_mut)]
+ let mut m = ::std::collections::HashMap::new();
+ $(
+ if $format.contains_key($key){
+ map!(@insert m, $key, $value $(,$($cond_tokens)*)?);
+ }
+ )*
+ m
+ }};
+}
+
+pub use map_required;
+
 macro_rules! regex {
  ($re:literal $(,)?) => {{
  static RE: once_cell::sync::OnceCell<regex::Regex> = once_cell::sync::OnceCell::new();