eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Style

Browse source
This commit is contained in:
Eelco Dolstra 2021-07-12 17:17:13 +02:00
parent e06c272c12
commit 02dff9e529
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libstore/parsed-derivations.cc
View file

@ -126,6 +126,7 @@ bool ParsedDerivation::substitutesAllowed() const
} }
static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*"); static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*");
std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths) std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths)
{ {
auto structuredAttrs = getStructuredAttrs(); auto structuredAttrs = getStructuredAttrs();
@ -135,9 +136,8 @@ std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & s
/* Add an "outputs" object containing the output paths. */ /* Add an "outputs" object containing the output paths. */
nlohmann::json outputs; nlohmann::json outputs;
for (auto & i : drv.outputs) { for (auto & i : drv.outputs)
outputs[i.first] = hashPlaceholder(i.first); outputs[i.first] = hashPlaceholder(i.first);
}
json["outputs"] = outputs; json["outputs"] = outputs;
/* Handle exportReferencesGraph. */ /* Handle exportReferencesGraph. */
@ -165,7 +165,7 @@ std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & s
namely, strings, integers, nulls, Booleans, and arrays and namely, strings, integers, nulls, Booleans, and arrays and
objects consisting entirely of those values. (So nested objects consisting entirely of those values. (So nested
arrays or objects are not supported.) */ arrays or objects are not supported.) */
std::string writeStructuredAttrsShell(nlohmann::json & json) std::string writeStructuredAttrsShell(const nlohmann::json & json)
{ {
auto handleSimpleType = [](const nlohmann::json & value) -> std::optional<std::string> { auto handleSimpleType = [](const nlohmann::json & value) -> std::optional<std::string> {
@ -189,42 +189,40 @@ std::string writeStructuredAttrsShell(nlohmann::json & json)
std::string jsonSh; std::string jsonSh;
for (auto i = json.begin(); i != json.end(); ++i) { for (auto & [key, value] : json.items()) {
if (!std::regex_match(i.key(), shVarName)) continue; if (!std::regex_match(key, shVarName)) continue;
auto & value = i.value();
auto s = handleSimpleType(value); auto s = handleSimpleType(value);
if (s) if (s)
jsonSh += fmt("declare %s=%s\n", i.key(), *s); jsonSh += fmt("declare %s=%s\n", key, *s);
else if (value.is_array()) { else if (value.is_array()) {
std::string s2; std::string s2;
bool good = true; bool good = true;
for (auto i = value.begin(); i != value.end(); ++i) { for (auto & value2 : value) {
auto s3 = handleSimpleType(i.value()); auto s3 = handleSimpleType(value2);
if (!s3) { good = false; break; } if (!s3) { good = false; break; }
s2 += *s3; s2 += ' '; s2 += *s3; s2 += ' ';
} }
if (good) if (good)
jsonSh += fmt("declare -a %s=(%s)\n", i.key(), s2); jsonSh += fmt("declare -a %s=(%s)\n", key, s2);
} }
else if (value.is_object()) { else if (value.is_object()) {
std::string s2; std::string s2;
bool good = true; bool good = true;
for (auto i = value.begin(); i != value.end(); ++i) { for (auto & [key2, value2] : value.items()) {
auto s3 = handleSimpleType(i.value()); auto s3 = handleSimpleType(value2);
if (!s3) { good = false; break; } if (!s3) { good = false; break; }
s2 += fmt("[%s]=%s ", shellEscape(i.key()), *s3); s2 += fmt("[%s]=%s ", shellEscape(key2), *s3);
} }
if (good) if (good)
jsonSh += fmt("declare -A %s=(%s)\n", i.key(), s2); jsonSh += fmt("declare -A %s=(%s)\n", key, s2);
} }
} }

2
src/libstore/parsed-derivations.hh
View file

@ -40,6 +40,6 @@ public:
std::optional<nlohmann::json> prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths); std::optional<nlohmann::json> prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths);
}; };
std::string writeStructuredAttrsShell(nlohmann::json & json); std::string writeStructuredAttrsShell(const nlohmann::json & json);
} }