More simplifications in IniFile

aslze · Jun 8, 2024 · 30d77b1 · 30d77b1
1 parent 205eed8
commit 30d77b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/include/asl/IniFile.h b/include/asl/IniFile.h
@@ -137,6 +137,10 @@ class ASL_API IniFile
 	{
 		return _sections[_currentTitle][String(index + 1) << '\\' << field];
 	}
+	/**
+	Returns the names of sections in the file
+	*/
+	Array<String> sectionNames() const { return _sections.keys(); }
 
 	/**
 	Returns all keys and values as a map with keys as "section/key"

diff --git a/src/IniFile.cpp b/src/IniFile.cpp
@@ -16,7 +16,9 @@ IniFile::IniFile(const String& fname, bool shouldwrite)
 	if(!file) {
 		return;
 	}
+	_lines.reserve(16);
 	_ok = true;
+	Section* cursection = &_sections[NOSECTION];
 	while(!file.end())
 	{
 		String line=file.readLine();
@@ -37,9 +39,7 @@ IniFile::IniFile(const String& fname, bool shouldwrite)
 			if(end < 0)
 				continue;
 			String name = line.substring(1, end);
-			_currentTitle = name;
-			if (!_sections.has(_currentTitle))
-				_sections[_currentTitle] = Section();
+			cursection = &_sections[name];
 		}
 		else if(line[i0] != '#' && line[i0] > 47 && line[i0] != ';')
 		{
@@ -60,15 +60,16 @@ IniFile::IniFile(const String& fname, bool shouldwrite)
 				}
 			String key = line.substring(0,i);
 			String value = line.substring(i+1);
-			_sections[_currentTitle][key.trim().replaceme('/', '\\')] = value.trim();
+			(*cursection)[key.trim().replaceme('/', '\\')] = value.trim();
 		}
 	}
 	_currentTitle = NOSECTION;
 	for(int i=_lines.length()-1; i>0 && _lines[i][0] == '\0'; i--)
 	{
 		_lines.resize(_lines.length()-1);
 	}
-
+	if (_sections[NOSECTION].length() == 0)
+		_sections.remove(NOSECTION);
 }
 
 IniFile::Section& IniFile::section(const String& name)

diff --git a/tests/unittests.cpp b/tests/unittests.cpp
@@ -60,11 +60,12 @@ ASL_TEST(File)
 ASL_TEST(IniFile)
 {
 	{
+		TextFile("config.ini").write(""); // clear before
 		IniFile file("config.ini");
 		file["global"] = "global value";
 		file["sec1/field1"] = "value1";
 		file.set("sec1/field2", "value2");
-		file["sec2/field"] = "value3";
+		file.set("sec2/field", "value3");
 	}
 	{
 		IniFile file("config.ini");
@@ -80,6 +81,8 @@ ASL_TEST(IniFile)
 		Dic<> all = file.values();
 		ASL_ASSERT(all["sec1/field1"] == "value1");
 		ASL_ASSERT(file.values("sec1")["field1"] == "value1");
+
+		ASL_ASSERT(file.sectionNames().length() == 3);
 	}
 }
 
@@ -192,6 +195,8 @@ String join(const Array<String>& a)
 ASL_TEST(Array)
 {
 	Array<int> a;
+	a.reserve(4);
+	ASL_ASSERT(a.length() == 0);
 	a << 3 << -5 << 10 << 0;
 
 	ASL_ASSERT(a.length() == 4);