conf: impl DotAddressable for NotificationsSettings
parent
1ac3a7a903
commit
65357625ea
|
@ -894,7 +894,7 @@ mod dotaddressable {
|
||||||
"accounts" => self.accounts.lookup(field, tail),
|
"accounts" => self.accounts.lookup(field, tail),
|
||||||
"pager" => self.pager.lookup(field, tail),
|
"pager" => self.pager.lookup(field, tail),
|
||||||
"listing" => self.listing.lookup(field, tail),
|
"listing" => self.listing.lookup(field, tail),
|
||||||
"notifications" => Err(MeliError::new("unimplemented")),
|
"notifications" => self.notifications.lookup(field, tail),
|
||||||
"shortcuts" => self.shortcuts.lookup(field, tail),
|
"shortcuts" => self.shortcuts.lookup(field, tail),
|
||||||
"tags" => Err(MeliError::new("unimplemented")),
|
"tags" => Err(MeliError::new("unimplemented")),
|
||||||
"composing" => Err(MeliError::new("unimplemented")),
|
"composing" => Err(MeliError::new("unimplemented")),
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use super::default_vals::{internal_value_false, none, true_val};
|
use super::default_vals::{internal_value_false, none, true_val};
|
||||||
|
use super::DotAddressable;
|
||||||
|
use melib::{MeliError, Result, ToggleFlag};
|
||||||
|
|
||||||
/// Settings for the notifications function.
|
/// Settings for the notifications function.
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
@ -39,7 +41,7 @@ pub struct NotificationsSettings {
|
||||||
#[serde(default = "none", alias = "xbiff-file-path")]
|
#[serde(default = "none", alias = "xbiff-file-path")]
|
||||||
pub xbiff_file_path: Option<String>,
|
pub xbiff_file_path: Option<String>,
|
||||||
#[serde(default = "internal_value_false", alias = "play-sound")]
|
#[serde(default = "internal_value_false", alias = "play-sound")]
|
||||||
pub play_sound: super::ToggleFlag,
|
pub play_sound: ToggleFlag,
|
||||||
#[serde(default = "none", alias = "sound-file")]
|
#[serde(default = "none", alias = "sound-file")]
|
||||||
pub sound_file: Option<String>,
|
pub sound_file: Option<String>,
|
||||||
}
|
}
|
||||||
|
@ -50,8 +52,29 @@ impl Default for NotificationsSettings {
|
||||||
enable: true,
|
enable: true,
|
||||||
script: None,
|
script: None,
|
||||||
xbiff_file_path: None,
|
xbiff_file_path: None,
|
||||||
play_sound: super::ToggleFlag::InternalVal(false),
|
play_sound: ToggleFlag::InternalVal(false),
|
||||||
sound_file: None,
|
sound_file: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
impl DotAddressable for NotificationsSettings {
|
||||||
|
fn lookup(&self, parent_field: &str, path: &[&str]) -> Result<String> {
|
||||||
|
match path.first() {
|
||||||
|
Some(field) => {
|
||||||
|
let tail = &path[1..];
|
||||||
|
match *field {
|
||||||
|
"enable" => self.enable.lookup(field, tail),
|
||||||
|
"script" => self.script.lookup(field, tail),
|
||||||
|
"xbiff_file_path" => self.xbiff_file_path.lookup(field, tail),
|
||||||
|
"play_sound" => self.play_sound.lookup(field, tail),
|
||||||
|
"sound_file" => self.sound_file.lookup(field, tail),
|
||||||
|
other => Err(MeliError::new(format!(
|
||||||
|
"{} has no field named {}",
|
||||||
|
parent_field, other
|
||||||
|
))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ pub struct NotificationsSettingsOverride {
|
||||||
pub xbiff_file_path: Option<Option<String>>,
|
pub xbiff_file_path: Option<Option<String>>,
|
||||||
#[serde(alias = "play-sound")]
|
#[serde(alias = "play-sound")]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub play_sound: Option<super::ToggleFlag>,
|
pub play_sound: Option<ToggleFlag>,
|
||||||
#[serde(alias = "sound-file")]
|
#[serde(alias = "sound-file")]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub sound_file: Option<Option<String>>,
|
pub sound_file: Option<Option<String>>,
|
||||||
|
|
Loading…
Reference in New Issue