See #4 - v1.0.5.2 Added support for quoted values which can contain c…

…omment's starting characters.
MarioZ · Feb 23, 2016 · 2a974a2 · 2a974a2
1 parent 26bbefa
commit 2a974a2
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 12 deletions.
diff --git a/MadMilkman.Ini.Tests/BugFixes.cs b/MadMilkman.Ini.Tests/BugFixes.cs
@@ -102,5 +102,17 @@ public void Bug2()
             CollectionAssert.AreEqual(new string[] { "", "", "" }, deserializeObj.EmptyArray);
             CollectionAssert.IsEmpty(deserializeObj.EmptyList);
         }
+
+        [Test]
+        public void Bug3()
+        {
+            string iniFileContent = "[sektion]" + Environment.NewLine +
+                                    "key=\"Data Source=server;Initial Catalog=catalog;Integrated Security=SSPI\"";
+            IniFile file = IniUtilities.LoadIniFileContent(iniFileContent, new IniOptions());
+
+            IniKey key = file.Sections["sektion"].Keys["key"];
+            Assert.AreEqual("\"Data Source=server;Initial Catalog=catalog;Integrated Security=SSPI\"", key.Value);
+            Assert.IsNull(key.LeadingComment.Text);
+        }
     }
 }
diff --git a/MadMilkman.Ini.Tests/IniFileReadTests.cs b/MadMilkman.Ini.Tests/IniFileReadTests.cs
@@ -282,5 +282,26 @@ public void ReadSectionEdgeCasesTest()
             Assert.AreEqual("[;]", file.Sections[6].Name);
             Assert.AreEqual(string.Empty, file.Sections[6].LeadingComment.Text);
         }
+
+        [Test]
+        public void ReadQuotedValue()
+        {
+            string iniFileContent = "key1 = \"Test;Test\"" + Environment.NewLine +
+                                    "key2 = \"Test;Test\";" + Environment.NewLine +
+                                    "key3 = \"Test;Test" + Environment.NewLine +
+                                    "key4 = \"Test;Test;Test\"Test;Test;Test";
+
+            IniFile file = IniUtilities.LoadIniFileContent(iniFileContent, new IniOptions());
+            IniSection section = file.Sections[0];
+
+            Assert.AreEqual("\"Test;Test\"", file.Sections[0].Keys[0].Value);
+            Assert.IsNull(file.Sections[0].Keys[0].LeadingComment.Text);
+            Assert.AreEqual("\"Test;Test\"", file.Sections[0].Keys[1].Value);
+            Assert.AreEqual(string.Empty, file.Sections[0].Keys[1].LeadingComment.Text);
+            Assert.AreEqual("\"Test", file.Sections[0].Keys[2].Value);
+            Assert.AreEqual("Test", file.Sections[0].Keys[2].LeadingComment.Text);
+            Assert.AreEqual("\"Test;Test;Test\"Test", file.Sections[0].Keys[3].Value);
+            Assert.AreEqual("Test;Test", file.Sections[0].Keys[3].LeadingComment.Text);
+        }
     }
 }
diff --git a/MadMilkman.Ini.zip b/MadMilkman.Ini.zip
diff --git a/MadMilkman.Ini/IniReaderWriter/IniReader.cs b/MadMilkman.Ini/IniReaderWriter/IniReader.cs
@@ -152,37 +152,45 @@ private void ReadKey(int leftIndention, string line, IniFile file)
 
                 this.currentSection.Keys.Add(currentKey);
 
-                this.ReadKeyValueAndLeadingComment(line.Substring(++keyDelimiterIndex).TrimStart(), currentKey);
+                this.ReadValue(line.Substring(++keyDelimiterIndex).TrimStart(), currentKey);
             }
 
             this.currentTrailingComment = null;
         }
 
-        private void ReadKeyValueAndLeadingComment(string lineLeftover, IniKey key)
+        private void ReadValue(string lineLeftover, IniKey key)
         {
-            /* REMARKS:  First occurrence of comment's starting character (e.g. ';') defines key's value.
-             *          
-             * CONSIDER: Implement a support for quoted values, thus enabling them to contain comment's starting characters. */
-
             int valueEndIndex = lineLeftover.IndexOf((char)this.options.CommentStarter);
 
             if (valueEndIndex == -1)
                 key.Value = lineLeftover.TrimEnd();
-
             else if (valueEndIndex == 0)
                 key.Value = key.LeadingComment.Text = string.Empty;
+            else
+                this.ReadValueLeadingComment(lineLeftover, valueEndIndex, key);
+        }
+
+        /* MZ(2016-02-23): Added support for quoted values which can contain comment's starting characters. */
+        private void ReadValueLeadingComment(string lineLeftover, int potentialCommentIndex, IniKey key)
+        {
+            int quoteEndIndex = lineLeftover.IndexOf('"', 1);
+            if (lineLeftover[0] == '"' && quoteEndIndex != -1)
+                while (quoteEndIndex > potentialCommentIndex && potentialCommentIndex != -1)
+                    potentialCommentIndex = lineLeftover.IndexOf((char)this.options.CommentStarter, ++potentialCommentIndex);
 
+            if (potentialCommentIndex == -1)
+                key.Value = lineLeftover.TrimEnd();
             else
             {
-                key.LeadingComment.Text = lineLeftover.Substring(valueEndIndex + 1);
+                key.LeadingComment.Text = lineLeftover.Substring(potentialCommentIndex + 1);
 
                 // The amount of 'whitespace' characters between key's value and comment's starting character.
                 int leftIndention = 0;
-                while (lineLeftover[--valueEndIndex] == ' ' || lineLeftover[valueEndIndex] == '\t')
+                while (lineLeftover[--potentialCommentIndex] == ' ' || lineLeftover[potentialCommentIndex] == '\t')
                     leftIndention++;
 
                 key.LeadingComment.LeftIndentation = leftIndention;
-                key.Value = lineLeftover.Substring(0, ++valueEndIndex);
+                key.Value = lineLeftover.Substring(0, ++potentialCommentIndex);
             }
         }
     }

diff --git a/MadMilkman.Ini/Properties/AssemblyInfo.cs b/MadMilkman.Ini/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("MadMilkman")]
 [assembly: AssemblyProduct("MadMilkman.Ini")]
-[assembly: AssemblyCopyright("Copyright © MadMilkman 2015")]
+[assembly: AssemblyCopyright("Copyright © MadMilkman")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyVersion("1.0.5.1")]
+[assembly: AssemblyVersion("1.0.5.2")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/RELEASENOTES b/RELEASENOTES
@@ -1,3 +1,4 @@
+[1.0.5.2]  Added support for quoted values which can contain comment's starting characters.
 [1.0.5.1]  Fixed issue with NULL array and list when deserializing object.
 
 [1.0.5.0]  NEW RELEASE