murmeldin/plenum-bot
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Adjust generated fields to also have 'key' access

Browse source 
This permits them to also fill in related fields if needed.
This commit is contained in:
nobody 2024-08-17 03:19:31 +02:00 committed by murmeldin
parent 77842f1f6d
commit 61eb7cc6d6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config_spec.rs
View file

@ -95,7 +95,7 @@ pub enum CfgField<'a> {
/// Empty by default, can be user-provided, or will be generated randomly. /// Empty by default, can be user-provided, or will be generated randomly.
Generated { Generated {
key: &'a str, key: &'a str,
generator: fn(config: &KV, is_dry_run: bool) -> Result<String, Box<dyn Error>>, generator: fn(key: &str, config: &KV, is_dry_run: bool) -> Result<String, Box<dyn Error>>,
generator_description: &'a str, generator_description: &'a str,
description: &'a str, description: &'a str,
}, },
@ -199,7 +199,7 @@ impl<'a> CfgField<'a> {
match self { match self {
CfgField::Silent { default, .. } => Ok(Some(default.to_string())), CfgField::Silent { default, .. } => Ok(Some(default.to_string())),
CfgField::Default { default, .. } => Ok(Some(default.to_string())), CfgField::Default { default, .. } => Ok(Some(default.to_string())),
CfgField::Generated { generator, .. } => generator(config, is_dry_run()).map(Some), CfgField::Generated { key, generator, .. } => generator(key, config, is_dry_run()).map(Some),
_ => Ok(None), _ => Ok(None),
} }
} }

2
src/hedgedoc.rs
View file

@ -96,6 +96,6 @@ impl HedgeDoc {
} }
/// For the config, make a new pad ID (by actually making a pad.) /// For the config, make a new pad ID (by actually making a pad.)
fn make_pad_id(config: &crate::KV, is_dry_run: bool) -> Result<String, Box<dyn Error>> { fn make_pad_id(key: &str, config: &crate::KV, is_dry_run: bool) -> Result<String, Box<dyn Error>> {
HedgeDoc::new(&config.get("hedgedoc-server-url").unwrap(), is_dry_run).create_pad() HedgeDoc::new(&config.get("hedgedoc-server-url").unwrap(), is_dry_run).create_pad()
} }