wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00
Code Activity

Simplify registerInputScheme()

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-05 08:35:59 +02:00
parent e7c0906521
commit 93844a5998
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libfetchers/fetchers.cc
View file

@ -12,24 +12,26 @@ namespace nix::fetchers {
using InputSchemeMap = std::map<std::string_view, std::shared_ptr<InputScheme>>; using InputSchemeMap = std::map<std::string_view, std::shared_ptr<InputScheme>>;
std::unique_ptr<InputSchemeMap> inputSchemes = nullptr; static InputSchemeMap & inputSchemes()
{
static InputSchemeMap inputSchemeMap;
return inputSchemeMap;
}
void registerInputScheme(std::shared_ptr<InputScheme> && inputScheme) void registerInputScheme(std::shared_ptr<InputScheme> && inputScheme)
{ {
if (!inputSchemes)
inputSchemes = std::make_unique<InputSchemeMap>();
auto schemeName = inputScheme->schemeName(); auto schemeName = inputScheme->schemeName();
if (inputSchemes->count(schemeName) > 0) if (!inputSchemes().emplace(schemeName, std::move(inputScheme)).second)
throw Error("Input scheme with name %s already registered", schemeName); throw Error("Input scheme with name %s already registered", schemeName);
inputSchemes->insert_or_assign(schemeName, std::move(inputScheme));
} }
nlohmann::json dumpRegisterInputSchemeInfo() { nlohmann::json dumpRegisterInputSchemeInfo()
{
using nlohmann::json; using nlohmann::json;
auto res = json::object(); auto res = json::object();
for (auto & [name, scheme] : *inputSchemes) { for (auto & [name, scheme] : inputSchemes()) {
auto & r = res[name] = json::object(); auto & r = res[name] = json::object();
r["allowedAttrs"] = scheme->allowedAttrs(); r["allowedAttrs"] = scheme->allowedAttrs();
} }
@ -57,7 +59,7 @@ Input Input::fromURL(
const Settings & settings, const Settings & settings,
const ParsedURL & url, bool requireTree) const ParsedURL & url, bool requireTree)
{ {
for (auto & [_, inputScheme] : *inputSchemes) { for (auto & [_, inputScheme] : inputSchemes()) {
auto res = inputScheme->inputFromURL(settings, url, requireTree); auto res = inputScheme->inputFromURL(settings, url, requireTree);
if (res) { if (res) {
experimentalFeatureSettings.require(inputScheme->experimentalFeature()); experimentalFeatureSettings.require(inputScheme->experimentalFeature());
@ -91,8 +93,8 @@ Input Input::fromAttrs(const Settings & settings, Attrs && attrs)
}; };
std::shared_ptr<InputScheme> inputScheme = ({ std::shared_ptr<InputScheme> inputScheme = ({
auto i = inputSchemes->find(schemeName); auto i = get(inputSchemes(), schemeName);
i == inputSchemes->end() ? nullptr : i->second; i ? *i : nullptr;
}); });
if (!inputScheme) return raw(); if (!inputScheme) return raw();