max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 23:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change implementation of optionalValueAt

Browse source
This commit is contained in:
HaeNoe 2024-04-14 22:35:51 +02:00
parent aa438b8fba
commit bb939d3772
No known key found for this signature in database
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libutil/json-utils.cc
View file

@ -30,14 +30,12 @@ const nlohmann::json & valueAt(
return map.at(key); return map.at(key);
} }
std::optional<nlohmann::json> optionalValueAt(const nlohmann::json & value, const std::string & key) std::optional<nlohmann::json> optionalValueAt(const nlohmann::json::object_t & map, const std::string & key)
{ {
try { if (!map.contains(key))
auto & v = valueAt(value, key);
return v.get<nlohmann::json>();
} catch (...) {
return std::nullopt; return std::nullopt;
}
return std::optional { map.at(key) };
} }

2
src/libutil/json-utils.hh
View file

@ -23,7 +23,7 @@ const nlohmann::json & valueAt(
const nlohmann::json::object_t & map, const nlohmann::json::object_t & map,
const std::string & key); const std::string & key);
std::optional<nlohmann::json> optionalValueAt(const nlohmann::json & value, const std::string & key); std::optional<nlohmann::json> optionalValueAt(const nlohmann::json::object_t & value, const std::string & key);
/** /**
* Downcast the json object, failing with a nice error if the conversion fails. * Downcast the json object, failing with a nice error if the conversion fails.