Merge #99: fix(conf): fix the ambigity when we get a list of confs

00968b6 fix(conf): fix the ambigity when we get a list of confs (Vincenzo Palazzo)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: a35fd09e66afa17f22012f817a6077c3422fc6159224b4eaf318b059340a8a1dbf2ca9d97cb0cd5dc9c38122db78fc5936d6074c1ca0fe3d6f6b747b5ecdd816

conf/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.0.3
+
+## Fixed
+- fix the ambigity when we get a list of confs ([commit](https://github.com/laanwj/cln4rust/commit/4e32e0a4c7d8c9e97c552d632fc04696972fdee3)). @vincenzopalazzo 23-05-2023
+
+
 # v0.0.2
 
 ## Fixed

conf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clightningrpc-conf"
-version = "0.0.2"
+version = "0.0.3"
 edition = "2021"
 authors = ["Vincenzo Palazzo <[email protected]>"]
 license = "CC0-1.0"

conf/changelog.json

@@ -1,10 +1,10 @@
 {
   "package_name": "conf",
-  "version": "v0.0.2",
+  "version": "v0.0.3",
   "api": {
     "name": "github",
     "repository": "laanwj/rust-clightning-rpc",
-    "branch": "master"
+    "branch": "macros/conf-fix"
   },
   "generation_method": {
     "name": "semver-v2",

conf/src/lib.rs

@@ -8,6 +8,7 @@ mod parser;
 
 use file::{File, SyncFile};
 
+#[derive(Debug)]
 pub struct ParsingError {
     pub core: u64,
     pub cause: String,
@@ -22,6 +23,12 @@ impl From<io::Error> for ParsingError {
     }
 }
 
+impl std::fmt::Display for ParsingError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.cause)
+    }
+}
+
 pub trait SyncCLNConf {
     fn parse(&mut self) -> Result<(), ParsingError>;
 }
@@ -78,17 +85,48 @@ impl CLNConf {
         Ok(())
     }
 
-    pub fn get_conf(&self, key: &str) -> Option<Vec<String>> {
+    /// Get a unique field with the specified key, if there are multiple definition
+    /// the function return an error.
+    ///
+    /// In the case of multiple definition of the same key you would like to use `get_confs`.
+    pub fn get_conf(&self, key: &str) -> Result<Option<String>, ParsingError> {
+        let mut results = vec![];
+        if let Some(fields) = self.fields.get(key) {
+            results.append(&mut fields.clone());
+        }
+        for include in &self.includes {
+            let fields = include.get_confs(key);
+            if !fields.is_empty() {
+                results.append(&mut fields.clone());
+            }
+        }
+        if results.is_empty() {
+            return Ok(None);
+        }
+
+        if results.len() > 1 {
+            return Err(ParsingError {
+                core: 1,
+                cause: "mutiple field with the `{key}`".to_owned(),
+            });
+        }
+        Ok(Some(results.first().unwrap().clone()))
+    }
+
+    /// Return a list of values with the specified key, if no
+    /// item is found, return an empity vector.
+    pub fn get_confs(&self, key: &str) -> Vec<String> {
         let mut results = vec![];
         if let Some(fields) = self.fields.get(key) {
             results.append(&mut fields.clone());
         }
         for include in &self.includes {
-            if let Some(fields) = include.get_conf(key) {
+            let fields = include.get_confs(key);
+            if !fields.is_empty() {
                 results.append(&mut fields.clone());
             }
         }
-        Some(results)
+        results
     }
 
     pub fn add_subconf(&mut self, conf: CLNConf) -> Result<(), ParsingError> {