Skip to content

Throw errors for some command line options values/combinations #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lonvia merged 1 commit into from
Jun 2, 2026
+14 −15
Merged

Throw errors for some command line options values/combinations #2484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions src/command-line-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,42 +137,42 @@ void check_options_non_slim(CLI::App const &app)

for (auto const &opt : slim_options) {
if (app.count(opt) > 0) {
log_warn("Ignoring option {}. Can only be used in --slim mode.",
app.get_option(opt)->get_name(false, true));
throw fmt_error("Option {} can only be used in --slim mode.",
app.get_option(opt)->get_name(false, true));
}
}
}

void check_options_output_flex(CLI::App const &app)
{
auto const ignored_options = app.get_options([](CLI::Option const *option) {
auto const bad_options = app.get_options([](CLI::Option const *option) {
return option->get_group() == "Pgsql output options" ||
option->get_name() == "--tablespace-main-data" ||
option->get_name() == "--tablespace-main-index";
});

for (auto const *opt : ignored_options) {
for (auto const *opt : bad_options) {
if (opt->count()) {
log_warn("Ignoring option {} for 'flex' output",
opt->get_name(false, true));
throw fmt_error("Option {} does not work with 'flex' output",
opt->get_name(false, true));
}
}
}

void check_options_output_null(CLI::App const &app)
{
auto const ignored_options = app.get_options([](CLI::Option const *option) {
auto const bad_options = app.get_options([](CLI::Option const *option) {
return option->get_group() == "Pgsql output options" ||
option->get_group() == "Expire options" ||
option->get_name() == "--style" ||
option->get_name() == "--disable-parallel-indexing" ||
option->get_name() == "--number-processes";
});

for (auto const *opt : ignored_options) {
for (auto const *opt : bad_options) {
if (opt->count()) {
log_warn("Ignoring option {} for 'null' output",
opt->get_name(false, true));
throw fmt_error("Option {} does not work with 'null' output",
opt->get_name(false, true));
}
}
}
Expand Down Expand Up @@ -208,8 +208,7 @@ void check_options(options_t *options)
}

if (options->cache < 0) {
options->cache = 0;
log_warn("RAM cache cannot be negative. Using 0 instead.");
throw std::runtime_error{"RAM cache cannot be negative."};
}

if (options->cache == 0) {
Expand Down Expand Up @@ -244,9 +243,9 @@ void check_options_expire(options_t *options)

if (options->expire_tiles_zoom != 0 &&
options->projection->target_srs() != PROJ_SPHERE_MERC) {
log_warn("Expire has been enabled (with -e or --expire-tiles) but "
"target SRS is not Mercator (EPSG:3857). Expire disabled!");
options->expire_tiles_zoom = 0;
throw std::runtime_error{
"Expire has been enabled (with -e or --expire-tiles) but target "
"SRS is not Mercator (EPSG:3857)"};
}
}

Expand Down
Loading