Add merge-json

Author: franzpoeschel

CMakeLists.txt

@@ -713,6 +713,7 @@ set(openPMD_TEST_NAMES
 set(openPMD_CLI_TOOL_NAMES
     ls
     convert-toml-json
+    merge-json
 )
 set(openPMD_PYTHON_CLI_TOOL_NAMES
     pipe

include/openPMD/cli/convert-toml-json.hpp

@@ -59,6 +59,15 @@ struct switch_::other_type<json::SupportedLanguages::TOML>
 template <typename FromFormatToFormat>
 class convert_json_toml
 {
+    static void print(toml::value &val)
+    {
+        namespace json = openPMD::json;
+        std::cout << json::format_toml(val);
+    }
+    static void print(nlohmann::json const &val)
+    {
+        std::cout << val << '\n';
+    }
     static void
     with_parsed_cmdline_args(openPMD::json::ParsedConfig parsed_config)
     {
@@ -68,13 +77,17 @@ class convert_json_toml
         {
             using SL = json::SupportedLanguages;
         case SL::JSON: {
-            auto asToml = json::jsonToToml(config);
-            std::cout << json::format_toml(asToml);
+            auto for_print =
+                FromFormatToFormat::template call<SL::JSON>(std::move(config));
+            print(for_print);
+        }
+        break;
+        case SL::TOML: {
+            auto for_print =
+                FromFormatToFormat::template call<SL::TOML>(std::move(config));
+            print(for_print);
         }
         break;
-        case SL::TOML:
-            std::cout << config << '\n';
-            break;
         }
     }
 

src/cli/convert-toml-json.cpp

@@ -17,6 +17,6 @@ equivalently from TOML to JSON.
 
 int main(int argc, char const **argv)
 {
-    convert_json_toml<from_format_to_format::ID>::run_application(
+    convert_json_toml<from_format_to_format::switch_>::run_application(
         argc, argv, print_help_message);
 }

src/cli/merge-json.cpp

@@ -0,0 +1,22 @@
+#include "openPMD/cli/convert-toml-json.hpp"
+
+void print_help_message(char const *program_name)
+{
+    std::cout << "Usage: " << std::string(program_name) << R"( [json_or_toml]+
+'json_or_toml' can be a JSON or TOML dataset specified inline or a reference
+to a file prepended by an '@'.
+Inline datasets will be interpreted as JSON if they start with an '{', as TOML
+otherwise. Datasets from a file will be interpreted as JSON or TOML depending
+on the file ending '.json' or '.toml' respectively.
+Inline dataset specifications can be replaced by input read from stdin.
+
+If the JSON/TOML files are mixed, then the output type (JSON or TOML) will be
+determined by the type of the first file.
+)";
+}
+
+int main(int argc, char const **argv)
+{
+    convert_json_toml<from_format_to_format::ID>::run_application(
+        argc, argv, print_help_message);
+}