dub-mirrors/mirage-config
1
0
Fork 0
mirror of https://github.com/mbierlee/mirage-config.git synced 2024-11-15 04:44:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for relative nesting in sections

Browse source
This commit is contained in:
Mike Bierlee 2022-10-11 21:13:51 +03:00
parent 089e42a2bf
commit 0b0b3108b1
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/mirage/keyvalue.d
View file

@ -13,7 +13,7 @@ module mirage.keyvalue;
import mirage.config : ConfigFactory, ConfigDictionary, ConfigNode, ValueNode, ObjectNode, ConfigCreationException; import mirage.config : ConfigFactory, ConfigDictionary, ConfigNode, ValueNode, ObjectNode, ConfigCreationException;
import std.string : lineSplitter, strip, startsWith, endsWith, split, indexOf; import std.string : lineSplitter, strip, startsWith, endsWith, split, indexOf, join;
import std.array : array; import std.array : array;
import std.exception : enforce; import std.exception : enforce;
import std.conv : to; import std.conv : to;
@ -64,7 +64,13 @@ class KeyValueConfigFactory(
processedLine = processedLine.strip; processedLine = processedLine.strip;
if (supportSections && processedLine.startsWith('[') && processedLine.endsWith(']')) { if (supportSections && processedLine.startsWith('[') && processedLine.endsWith(']')) {
section = processedLine[1 .. $ - 1] ~ '.'; auto parsedSection = processedLine[1 .. $ - 1];
if (parsedSection.startsWith('.')) {
section ~= parsedSection;
} else {
section = parsedSection;
}
continue; continue;
} }
@ -77,7 +83,8 @@ class KeyValueConfigFactory(
.to!string ~ "): " ~ processedLine); .to!string ~ "): " ~ processedLine);
enforce!ConfigCreationException(parts.length == 2, "Missing value assignment (L" ~ index.to!string ~ "): " ~ processedLine); enforce!ConfigCreationException(parts.length == 2, "Missing value assignment (L" ~ index.to!string ~ "): " ~ processedLine);
properties.set(section ~ parts[0].strip, parts[1].strip); auto key = [section, parts[0].strip].join('.');
properties.set(key, parts[1].strip);
} }
return properties; return properties;
@ -178,6 +185,9 @@ version (unittest) {
host=localhost host=localhost
port=2873 port=2873
[.toaster]
color=chrome
[server.middleware] ; Stuff that handles the http protocol [server.middleware] ; Stuff that handles the http protocol
protocolServer = netty protocolServer = netty
@ -188,6 +198,7 @@ version (unittest) {
assert(config.get("applicationName") == "test me!"); assert(config.get("applicationName") == "test me!");
assert(config.get("server.host") == "localhost"); assert(config.get("server.host") == "localhost");
assert(config.get("server.port") == "2873"); assert(config.get("server.port") == "2873");
assert(config.get("server.toaster.color") == "chrome");
assert(config.get("server.middleware.protocolServer") == "netty"); assert(config.get("server.middleware.protocolServer") == "netty");
assert(config.get("database.driver.id") == "PostgresDriver"); assert(config.get("database.driver.id") == "PostgresDriver");
} }