Warnings for command line options only allowed in slim mode

Author: joto

src/command-line-parser.cpp

@@ -27,6 +27,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
@@ -128,6 +129,25 @@ void print_version()
 #endif
 }
 
+static void check_options_non_slim(CLI::App const &app)
+{
+    std::array<std::string, 7> const slim_options = {
+        "--flat-nodes",
+        "--middle-database-format",
+        "--middle-schema",
+        "--middle-with-nodes",
+        "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data",
+        "--tablespace-slim-index"};
+
+    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));
+        }
+    }
+}
+
 static void check_options_output_flex(CLI::App const &app)
 {
     auto const ignored_options = app.get_options([](CLI::Option const *option) {
@@ -221,10 +241,6 @@ static void check_options(options_t *options)
                      "processing a lot.");
         }
     }
-
-    if (!options->slim && !options->flat_node_file.empty()) {
-        log_warn("Ignoring --flat-nodes/-F setting in non-slim mode");
-    }
 }
 
 static void check_options_expire(options_t *options) {
@@ -687,6 +703,10 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (!options.slim) {
+        check_options_non_slim(app);
+    }
+
     if (options.output_backend == "flex") {
         check_options_output_flex(app);
     } else if (options.output_backend == "gazetteer") {