revert some interface changes; fix downstream test

Author: andiwand

src/odr/internal/util/odr_meta_util.cpp

@@ -11,8 +11,8 @@ nlohmann::json meta_to_json(const FileMeta &meta) {
   nlohmann::json result;
 
   result["fileType"] = odr::file_type_to_string(meta.type);
-  result["fileCategory"] = odr::file_category_to_string(
-      odr::get_file_category_by_file_type(meta.type));
+  result["fileCategory"] =
+      odr::file_category_to_string(odr::file_category_by_file_type(meta.type));
   result["isEncrypted"] = meta.password_encrypted;
 
   if (meta.document_meta) {

src/odr/odr.cpp

@@ -16,7 +16,7 @@ std::string odr::get_commit() noexcept {
 }
 
 odr::FileType
-odr::get_file_type_by_file_extension(const std::string &extension) noexcept {
+odr::file_type_by_file_extension(const std::string &extension) noexcept {
   if (extension == "zip") {
     return FileType::zip;
   } else if (extension == "cfb") {
@@ -70,7 +70,7 @@ odr::get_file_type_by_file_extension(const std::string &extension) noexcept {
 }
 
 odr::FileCategory
-odr::get_file_category_by_file_type(const FileType type) noexcept {
+odr::file_category_by_file_type(const FileType type) noexcept {
   switch (type) {
   case FileType::zip:
   case FileType::compound_file_binary_format:
@@ -204,7 +204,7 @@ std::string odr::decoder_engine_to_string(const DecoderEngine engine) {
   throw UnknownDecoderEngine();
 }
 
-odr::DecoderEngine odr::get_decoder_engine_by_name(const std::string &name) {
+odr::DecoderEngine odr::decoder_engine_by_name(const std::string &name) {
   if (name == "odr") {
     return DecoderEngine::odr;
   } else if (name == "poppler") {

src/odr/odr.hpp

@@ -23,12 +23,11 @@ enum class DocumentType;
 /// @param extension The file extension.
 /// @return The file type.
 [[nodiscard]] FileType
-get_file_type_by_file_extension(const std::string &extension) noexcept;
+file_type_by_file_extension(const std::string &extension) noexcept;
 /// @brief Get the file category by the file type.
 /// @param type The file type.
 /// @return The file category.
-[[nodiscard]] FileCategory
-get_file_category_by_file_type(FileType type) noexcept;
+[[nodiscard]] FileCategory file_category_by_file_type(FileType type) noexcept;
 /// @brief Get the file type as a string.
 /// @param type The file type.
 /// @return The file type as a string.
@@ -49,8 +48,7 @@ get_file_category_by_file_type(FileType type) noexcept;
 /// @brief Get the decoder engine by the name.
 /// @param engine The name of the decoder engine.
 /// @return The decoder engine.
-[[nodiscard]] DecoderEngine
-get_decoder_engine_by_name(const std::string &engine);
+[[nodiscard]] DecoderEngine decoder_engine_by_name(const std::string &engine);
 
 /// @brief Determine the file types by the file path.
 /// @param path The file path.

test/downstream/main.cpp

@@ -3,6 +3,6 @@
 #include <iostream>
 
 int main(void) {
-  std::cout << "odr version=\"" << odr::version() << "\' "
-            << "commit=\'" << odr::commit() << "\"" << std::endl;
+  std::cout << "odr version=\"" << odr::get_version() << "\' "
+            << "commit=\'" << odr::get_commit() << "\"" << std::endl;
 }

test/src/test_util.cpp

@@ -23,8 +23,8 @@ namespace {
 
 TestFile get_test_file(const std::string &root_path,
                        std::string absolute_path) {
-  const FileType type = odr::get_file_type_by_file_extension(
-      common::Path(absolute_path).extension());
+  const FileType type =
+      odr::file_type_by_file_extension(common::Path(absolute_path).extension());
 
   std::string short_path = absolute_path.substr(root_path.size() + 1);
 
@@ -55,7 +55,7 @@ std::vector<TestFile> get_test_files(const std::string &root_path,
     for (const auto &row : csv::CSVReader(index_path)) {
       std::string absolute_path = input_path + "/" + row["path"].get<>();
       std::string short_path = absolute_path.substr(root_path.size() + 1);
-      FileType type = odr::get_file_type_by_file_extension(row["type"].get<>());
+      FileType type = odr::file_type_by_file_extension(row["type"].get<>());
       std::optional<std::string> password = row["encrypted"].get<>() == "yes"
                                                 ? row["password"].get<>()
                                                 : std::optional<std::string>();