🆕 Add support for brackets in key-values

QEDK · May 29, 2021 · 1b63792 · 1b63792
1 parent 72bc899
commit 1b63792
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/ini.rs b/src/ini.rs
@@ -348,18 +348,18 @@ impl Ini {
                 continue;
             }
             match trimmed.find('[') {
-                Some(start) => match trimmed.rfind(']') {
+                Some(0) => match trimmed.rfind(']') {
                     Some(end) => {
-                        section = caser(trimmed[start + 1..end].trim());
+                        section = caser(trimmed[1..end].trim());
                     }
                     None => {
                         return Err(format!(
-                            "line {}:{}: Found opening bracket for section name but no closing bracket",
-                            num, start
+                            "line {}: Found opening bracket for section name but no closing bracket",
+                            num
                         ));
                     }
                 },
-                None => match trimmed.find(&self.delimiters[..]) {
+                Some(_) | None => match trimmed.find(&self.delimiters[..]) {
                     Some(delimiter) => match map.get_mut(&section) {
                         Some(valmap) => {
                             let key = caser(trimmed[..delimiter].trim());

diff --git a/tests/test.ini b/tests/test.ini
@@ -5,6 +5,7 @@ KFC = the secret herb is orega-
 colon:value after colon
 Empty string =
 None string
+Password=[in-brackets]
 
 	[ spacing ]
 		indented=indented

diff --git a/tests/test.rs b/tests/test.rs
@@ -13,6 +13,7 @@ fn non_cs() -> Result<(), Box<dyn Error>> {
                 colon:value after colon
 		Empty string =
 		None string
+        Password=[in-brackets]
 		[ spacing ]
 			indented=indented
 		not indented = not indented				;testcomment
@@ -116,6 +117,7 @@ fn cs() -> Result<(), Box<dyn Error>> {
                 colon:value after colon
         Empty string =
         None string
+        Password=[in-brackets]
         [ spacing ]
             indented=indented
         not indented = not indented             ;testcomment