Skip to content

Commit

Permalink
Fix broken metadata in explorer
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Cruz Viotti <[email protected]>
  • Loading branch information
jviotti committed Jan 6, 2025
1 parent f63d1a2 commit f67b35e
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions src/index/index.cc
Original file line number Diff line number Diff line change
Expand Up @@ -209,25 +209,27 @@ static auto index_main(const std::string_view &program,

std::filesystem::create_directories(output);

// Save the configuration file too
auto configuration_copy = configuration;
configuration_copy.erase("schemas");
configuration_copy.erase("pages");
auto configuration_with_defaults = configuration;

// TODO: Perform these with a Blaze helper function that applies schema
// "default"s to an instance

if (!configuration_copy.defines("title")) {
configuration_copy.assign("title",
sourcemeta::jsontoolkit::JSON{"Sourcemeta"});
if (!configuration_with_defaults.defines("title")) {
configuration_with_defaults.assign(
"title", sourcemeta::jsontoolkit::JSON{"Sourcemeta"});
}

if (!configuration_copy.defines("description")) {
configuration_copy.assign("description",
sourcemeta::jsontoolkit::JSON{
"The next-generation JSON Schema Registry"});
if (!configuration_with_defaults.defines("description")) {
configuration_with_defaults.assign(
"description", sourcemeta::jsontoolkit::JSON{
"The next-generation JSON Schema Registry"});
}

// Save the configuration file too
auto configuration_copy = configuration_with_defaults;
configuration_copy.erase("schemas");
configuration_copy.erase("pages");

std::ofstream stream{output / "configuration.json"};
sourcemeta::jsontoolkit::prettify(configuration_copy, stream);
stream << "\n";
Expand All @@ -237,13 +239,13 @@ static auto index_main(const std::string_view &program,
const auto server_url{
sourcemeta::jsontoolkit::URI{configuration.at("url").to_string()}
.canonicalize()};
const auto code{index(resolver, server_url, configuration,
const auto code{index(resolver, server_url, configuration_with_defaults,
configuration_path.parent_path(), output)};

#ifdef SOURCEMETA_REGISTRY_ENTERPRISE
if (code == EXIT_SUCCESS) {
return sourcemeta::registry::enterprise::attach(
resolver, server_url, configuration_copy,
resolver, server_url, configuration_with_defaults,
configuration_path.parent_path(), output);
}
#endif
Expand Down

0 comments on commit f67b35e

Please sign in to comment.