Merge pull request #859 from stavrosfa/fix/ini-file-parser

Configure a FileDataIniParser to handle duplicate keys

Author: stavrosfa

C7/Animations/AnimationManager.cs

@@ -63,7 +63,7 @@ public AnimationManager(AudioStreamPlayer audioPlayer) {
 	public IniData getINIData(string pathKey) {
 		if (!iniDatas.TryGetValue(pathKey, out IniData tr)) {
 			string fullPath = Util.Civ3MediaPath(pathKey);
-			tr = new FileIniDataParser().ReadFile(fullPath);
+			tr = C7Engine.Util.GetFileIniDataParser().ReadFile(fullPath);
 			iniDatas.Add(pathKey, tr);
 		}
 		return tr;

C7Engine/C7Settings.cs

@@ -1,17 +1,14 @@
-using System.IO;
+using IniParser.Model;
 using IniParser.Exceptions;
 
 namespace C7Engine {
-	using IniParser;
-	using IniParser.Model;
-
 	public class C7Settings {
 		private const string SETTINGS_FILE_NAME = "C7.ini";
 		public static IniData settings;
 
 		public static void LoadSettings() {
 			try {
-				settings = new FileIniDataParser().ReadFile(SETTINGS_FILE_NAME);
+				settings = Util.GetFileIniDataParser().ReadFile(SETTINGS_FILE_NAME);
 			} catch (ParsingException) {
 				//First run.  The file doesn't exist.  That's okay.  We'll use sensible defaults.
 				settings = new IniData();
@@ -20,7 +17,7 @@ public static void LoadSettings() {
 		}
 
 		public static void SaveSettings() {
-			new FileIniDataParser().WriteFile(SETTINGS_FILE_NAME, settings);
+			Util.GetFileIniDataParser().WriteFile(SETTINGS_FILE_NAME, settings);
 		}
 
 		public static void SetValue(string section, string key, string value) {

C7Engine/Util.cs

@@ -0,0 +1,22 @@
+using IniParser;
+
+namespace C7Engine;
+
+public static class Util {
+	private static FileIniDataParser fileIniDataParser;
+
+	public static FileIniDataParser GetFileIniDataParser() {
+		if (fileIniDataParser != null) return fileIniDataParser;
+
+		FileIniDataParser parser = new FileIniDataParser();
+		// The default behaviour of the parser is to throw an exception
+		// when it finds duplicate keys (e.x. Tank.ini has 'DEAD' two times in [Sound Effects])
+		// so, we want to allow it so that it doesn't crash
+		parser.Parser.Configuration.AllowDuplicateKeys = true;
+		// but we only want to keep the last value we encounter
+		parser.Parser.Configuration.OverrideDuplicateKeys = true;
+
+		fileIniDataParser = parser;
+		return parser;
+	}
+}