commit 5191bae9d11562c826c6c1f719815548894def3a
author Zane Shelley <zshelle@us.ibm.com> Wed Aug 04 22:48:28 2021 -0500
committer Zane Shelley <zshelle@us.ibm.com> Thu Aug 05 14:42:26 2021 -0500
tree 56edca87d457c9c3444c67e9fbfd4db9c265f92f
parent e5411f0f4d862fac11a9a32cac058a438ef5ed54

Util functions to validate JSON and find data files

Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: Ifc1537f7c8eabab08690d5a74023377572564895

util/data_file.cpp

diff --git a/util/data_file.cpp b/util/data_file.cpp
new file mode 100644
index 0000000..14266ca
--- /dev/null
+++ b/util/data_file.cpp
@@ -0,0 +1,44 @@
+#include <util/data_file.hpp>
+#include <valijson/adapters/nlohmann_json_adapter.hpp>
+#include <valijson/schema.hpp>
+#include <valijson/schema_parser.hpp>
+#include <valijson/validator.hpp>
+
+#include <regex>
+
+namespace fs = std::filesystem;
+
+namespace util
+{
+
+void findFiles(const fs::path& i_dirPath, const std::string& i_matchString,
+               std::vector<fs::path>& o_foundPaths)
+{
+    if (fs::exists(i_dirPath))
+    {
+        std::regex search{i_matchString};
+        for (const auto& file : fs::directory_iterator(i_dirPath))
+        {
+            std::string path = file.path().string();
+            if (std::regex_search(path, search))
+            {
+                o_foundPaths.emplace_back(file.path());
+            }
+        }
+    }
+}
+
+bool validateJson(const nlohmann::json& i_schema, const nlohmann::json& i_json)
+{
+    valijson::Schema schema;
+    valijson::SchemaParser parser;
+    valijson::adapters::NlohmannJsonAdapter schemaAdapter(i_schema);
+    parser.populateSchema(schemaAdapter, schema);
+
+    valijson::Validator validator;
+    valijson::adapters::NlohmannJsonAdapter targetAdapter(i_json);
+
+    return validator.validate(schema, targetAdapter, nullptr);
+}
+
+} // namespace util

util/data_file.hpp

diff --git a/util/data_file.hpp b/util/data_file.hpp
new file mode 100644
index 0000000..52e8a2e
--- /dev/null
+++ b/util/data_file.hpp
@@ -0,0 +1,27 @@
+#include <nlohmann/json.hpp>
+
+#include <filesystem>
+
+namespace util
+{
+
+/**
+ * @brief Returns a list of files in the given directory, matching the given
+ *        search string.
+ * @param i_dirPath     The target directory.
+ * @param i_matchString Matching search pattern.
+ * @param o_foundPaths  The returned list of found file paths.
+ */
+void findFiles(const std::filesystem::path& i_dirPath,
+               const std::string& i_matchString,
+               std::vector<std::filesystem::path>& o_foundPaths);
+
+/**
+ * @brief  Validates the given JSON file against the given schema.
+ * @param  i_schema Target schema document.
+ * @param  i_json   Target JSON file.
+ * @return True, if validation successful. False, otherwise.
+ */
+bool validateJson(const nlohmann::json& i_schema, const nlohmann::json& i_json);
+
+} // namespace util

util/meson.build

diff --git a/util/meson.build b/util/meson.build
index 4e559d4..d72f515 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -1,5 +1,6 @@
 # Source files.
 util_src = files(
+    'data_file.cpp',
     'dbus.cpp',
     'ffdc_file.cpp',
     'pdbg.cpp',