From c4a8a9a789c7d7fb33f0b561086aba3c3399676f Mon Sep 17 00:00:00 2001 From: Vincenzo Palazzo Date: Fri, 24 Feb 2023 17:07:42 +0100 Subject: [PATCH] fix(conf): take into count inclue and comments Signed-off-by: Vincenzo Palazzo --- conf/src/lib.rs | 74 ++++++++++++++++++++++++++++++++++------------ conf/src/parser.rs | 14 +++++++-- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/conf/src/lib.rs b/conf/src/lib.rs index 85b053c..b3fb964 100644 --- a/conf/src/lib.rs +++ b/conf/src/lib.rs @@ -36,7 +36,7 @@ pub struct CLNConf { /// /// `plugin=path/to/bin` is parser as /// `key=value`. - pub filed: MultiMap, + pub fields: MultiMap, /// other conf file included. pub includes: Vec>, path: String, @@ -48,7 +48,7 @@ impl CLNConf { /// file manager. pub fn new(path: String, create_if_missing: bool) -> Self { CLNConf { - filed: MultiMap::new(), + fields: MultiMap::new(), includes: Vec::new(), path, create_if_missing, @@ -61,7 +61,7 @@ impl CLNConf { } pub fn add_conf(&mut self, key: &str, val: &str) { - self.filed.insert(key.to_owned(), val.to_owned()); + self.fields.insert(key.to_owned(), val.to_owned()); } pub fn add_subconf(&mut self, conf: CLNConf) { @@ -87,8 +87,8 @@ impl SyncCLNConf for CLNConf { impl fmt::Display for CLNConf { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let mut content = String::new(); - for field in self.filed.keys() { - let values = self.filed.get_vec(field).unwrap(); + for field in self.fields.keys() { + let values = self.fields.get_vec(field).unwrap(); for value in values { content += format!("{field}={value}\n").as_str(); } @@ -137,13 +137,13 @@ mod tests { let path = build_file("plugin=foo\nnetwork=bitcoin"); assert!(path.is_ok()); let path = path.unwrap(); - let mut conf = CLNConf::new(path.to_string()); + let mut conf = CLNConf::new(path.to_string(), false); let result = conf.parse(); assert!(result.is_ok()); - assert_eq!(conf.filed.keys().len(), 2); + assert_eq!(conf.fields.keys().len(), 2); - assert!(conf.filed.contains_key("plugin")); - assert!(conf.filed.contains_key("network")); + assert!(conf.fields.contains_key("plugin")); + assert!(conf.fields.contains_key("network")); cleanup_file(path.as_str()); } @@ -151,19 +151,19 @@ mod tests { #[test] fn flush_conf_one() { let path = get_conf_path(); - let mut conf = CLNConf::new(path.to_string()); + let mut conf = CLNConf::new(path.to_string(), false); conf.add_conf("plugin", "/some/path"); conf.add_conf("network", "bitcoin"); let result = conf.flush(); assert!(result.is_ok()); - let mut conf = CLNConf::new(path.to_string()); + let mut conf = CLNConf::new(path.to_string(), false); let result = conf.parse(); assert!(result.is_ok()); - assert_eq!(conf.filed.keys().len(), 2); + assert_eq!(conf.fields.keys().len(), 2); println!("{:?}", conf); - assert!(conf.filed.contains_key("plugin")); - assert!(conf.filed.contains_key("network")); + assert!(conf.fields.contains_key("plugin")); + assert!(conf.fields.contains_key("network")); cleanup_file(path.as_str()); } @@ -171,20 +171,56 @@ mod tests { #[test] fn flush_conf_two() { let path = get_conf_path(); - let mut conf = CLNConf::new(path.to_string()); + let mut conf = CLNConf::new(path.to_string(), false); conf.add_conf("plugin", "/some/path"); conf.add_conf("plugin", "foo"); conf.add_conf("network", "bitcoin"); let result = conf.flush(); assert!(result.is_ok()); - let mut conf = CLNConf::new(path.to_string()); + let mut conf = CLNConf::new(path.to_string(), false); let result = conf.parse(); assert!(result.is_ok()); - assert_eq!(conf.filed.get_vec("plugin").unwrap().len(), 2); + assert_eq!(conf.fields.get_vec("plugin").unwrap().len(), 2); println!("{:?}", conf); - assert!(conf.filed.contains_key("plugin")); - assert!(conf.filed.contains_key("network")); + assert!(conf.fields.contains_key("plugin")); + assert!(conf.fields.contains_key("network")); + + cleanup_file(path.as_str()); + } + + #[test] + fn flush_conf_with_comments() { + let path = build_file("# this is just a commit\nplugin=foo\nnetwork=bitcoin"); + assert!(path.is_ok()); + let path = path.unwrap(); + let mut conf = CLNConf::new(path.to_string(), false); + let result = conf.parse(); + assert!(result.is_ok()); + assert_eq!(conf.fields.keys().len(), 2); + + assert!(conf.fields.contains_key("plugin")); + assert!(conf.fields.contains_key("network")); + + cleanup_file(path.as_str()); + } + + #[test] + fn flush_conf_with_includes() { + let subpath = get_conf_path(); + let conf = CLNConf::new(subpath.clone(), false); + assert!(conf.flush().is_ok()); + + let path = build_file(format!("# this is just a commit\nplugin=foo\nnetwork=bitcoin\ninclude {subpath}").as_str()); + assert!(path.is_ok(), "{}", format!("{:?}", path)); + let path = path.unwrap(); + let mut conf = CLNConf::new(path.to_string(), false); + let result = conf.parse(); + assert!(result.is_ok(), "{}", result.unwrap_err().cause); + assert_eq!(conf.fields.keys().len(), 2); + + assert!(conf.fields.contains_key("plugin")); + assert!(conf.fields.contains_key("network")); cleanup_file(path.as_str()); } diff --git a/conf/src/parser.rs b/conf/src/parser.rs index 49ebc8f..a1da180 100644 --- a/conf/src/parser.rs +++ b/conf/src/parser.rs @@ -38,6 +38,13 @@ impl Parser { .collect(); let mut words = vec![]; for line in lines { + if line.starts_with("#") { + continue; + } + if line.starts_with("include") { + words.push(line); + continue; + } let mut key_val: Vec = line.split('=').map(|it| it.to_string()).collect(); words.append(&mut key_val); } @@ -68,14 +75,15 @@ impl Parser { conf: &mut CLNConf, ) -> Result<(), ParsingError> { let key = stream.advance().to_owned(); - let value = stream.advance().to_owned(); - if key == "include" { - let mut subconf = CLNConf::new(value, false); + if key.starts_with("include") { + let value = key.strip_prefix("include ").unwrap().trim(); + let mut subconf = CLNConf::new(value.to_owned(), false); if let Err(err) = subconf.parse() { return Err(err); } conf.add_subconf(subconf); } else { + let value = stream.advance().to_owned(); conf.add_conf(&key, &value); } Ok(())