diff options
| -rw-r--r-- | lib/generators.nix | 29 | ||||
| -rw-r--r-- | lib/tests.nix | 16 |
2 files changed, 41 insertions, 4 deletions
diff --git a/lib/generators.nix b/lib/generators.nix index 27d4142e8d9a..2c0cf5775f47 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -17,7 +17,29 @@ in rec { - /* Generates an INI-style config file from an + /* Generate a line of key k and value v, separated by + * character sep. If sep appears in k, it is escaped. + * Helper for synaxes with different separators. + * + * mkKeyValueLine ":" "f:oo" "bar" + * > "f\:oo:bar" + */ + mkKeyValueLine = sep: k: v: + "${libStr.escape [sep] k}${sep}${toString v}"; + + + /* Generate a key-value-style config file from an attrset. + * + * mkKeyValue is the same as in toINI. + */ + toKeyValue = { + mkKeyValue ? mkKeyValueLine "=" + }: attrs: + let mkLine = k: v: mkKeyValue k v + "\n"; + in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); + + + /* Generate an INI-style config file from an * attrset of sections to an attrset of key-value pairs. * * generators.toINI {} { @@ -41,17 +63,16 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}") + mkKeyValue ? mkKeyValueLine "=" }: attrsOfAttrs: let # map function to string for each key val mapAttrsToStringsSep = sep: mapFn: attrs: libStr.concatStringsSep sep (libAttr.mapAttrsToList mapFn attrs); - mkLine = k: v: mkKeyValue k v + "\n"; mkSection = sectName: sectValues: '' [${mkSectionName sectName}] - '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues); + '' + toKeyValue { inherit mkKeyValue; } sectValues; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/lib/tests.nix b/lib/tests.nix index d59814987ed6..afbaf11a7f7b 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -135,6 +135,22 @@ runTests { # these tests assume attributes are converted to lists # in alphabetical order + testMkKeyValueLine = { + expr = generators.mkKeyValueLine ":" "f:oo" "bar"; + expected = ''f\:oo:bar''; + }; + + testToKeyValue = { + expr = generators.toKeyValue {} { + key = "value"; + "other=key" = "baz"; + }; + expected = '' + key=value + other\=key=baz + ''; + }; + testToINIEmpty = { expr = generators.toINI {} {}; expected = ""; |