refactor: ini format parser

Intended to be easier to grok and match the same flow as other format parsers.

Signed-off-by: Brennan Kinney <[email protected]>

Author: polarathene

src/file/format/ini.rs

@@ -3,35 +3,45 @@ use std::error::Error;
 use ini::Ini;
 
 use crate::map::Map;
-use crate::value::{Value, ValueKind};
+use crate::value::{Table, Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
 ) -> Result<Map<String, Value>, Box<dyn Error + Send + Sync>> {
-    let mut map: Map<String, Value> = Map::new();
-    let i = Ini::load_from_str(text)?;
-    for (sec, prop) in i.iter() {
-        match sec {
-            Some(sec) => {
-                let mut sec_map: Map<String, Value> = Map::new();
-                for (k, v) in prop.iter() {
-                    sec_map.insert(
-                        k.to_owned(),
-                        Value::new(uri, ValueKind::String(v.to_owned())),
-                    );
-                }
-                map.insert(sec.to_owned(), Value::new(uri, ValueKind::Table(sec_map)));
-            }
-            None => {
-                for (k, v) in prop.iter() {
-                    map.insert(
-                        k.to_owned(),
-                        Value::new(uri, ValueKind::String(v.to_owned())),
-                    );
-                }
-            }
-        }
+    let value = from_ini(uri, Ini::load_from_str(text)?);
+
+    match value.kind {
+        ValueKind::Table(map) => Ok(map),
+
+        _ => Ok(Map::new()),
+    }
+}
+
+fn from_ini(
+    uri: Option<&String>,
+    data: Ini,
+) -> Value {
+    let mut map = Map::new();
+
+    let mut sections: Map<Option<&str>, Table> = data.into_iter().map(|(section, props)| {(
+        section,
+        props.iter().map(|(k, v)| {(
+            k.to_owned(),
+            Value::new(uri, ValueKind::String(v.to_owned())),
+        )}).collect()
+    )}).collect();
+
+    // These (optional) properties should exist top-level alongside sections:
+    if let Some(sectionless) = sections.remove(&None) {
+        map.extend(sectionless);
     }
-    Ok(map)
+
+    // Wrap each section Table into Value for merging into `map`:
+    map.extend(sections.into_iter().map(|(k,v)| {(
+        k.unwrap_or_default().to_owned(),
+        Value::new(uri, ValueKind::Table(v)),
+    )}));
+
+    Value::new(uri, ValueKind::Table(map))
 }