test

Author: andiwand

CMakeLists.txt

@@ -16,6 +16,7 @@ option(ODR_CLI "enable command line interface" ON)
 option(ODR_CLANG_TIDY "Run clang-tidy static analysis" OFF)
 option(WITH_PDF2HTMLEX "Build with pdf2htmlEX" ON)
 option(WITH_WVWARE "Build with wvWare" ON)
+option(WITH_LIBMAGIC "Build with libmagic" ON)
 
 # TODO defining global compiler flags seems to be bad practice with conan
 # TODO consider using conan profiles

conanfile.py

@@ -82,7 +82,7 @@ def generate(self):
         for dep in deps:
             runenv_info.compose_env(dep.runenv_info)
         envvars = runenv_info.vars(self)
-        for v in ["PDF2HTMLEX_DATA_DIR", "POPPLER_DATA_DIR", "FONTCONFIG_PATH", "WVDATADIR"]:
+        for v in ["PDF2HTMLEX_DATA_DIR", "POPPLER_DATA_DIR", "FONTCONFIG_PATH", "WVDATADIR", "MAGIC"]:
             tc.variables[v] = envvars.get(v)
 
         tc.generate()

src/odr/global_params.cpp

@@ -41,8 +41,8 @@ const std::string &GlobalParams::pdf2htmlex_data_path() {
   return instance().m_pdf2htmlex_data_path;
 }
 
-const std::string &GlobalParams::libmagic_data_path() {
-  return instance().m_libmagic_data_path;
+const std::string &GlobalParams::libmagic_path() {
+  return instance().m_libmagic_path;
 }
 
 void GlobalParams::set_odr_core_data_path(const std::string &path) {
@@ -66,15 +66,15 @@ void GlobalParams::set_pdf2htmlex_data_path(const std::string &path) {
   instance().m_pdf2htmlex_data_path = path;
 }
 
-void GlobalParams::set_libmagic_data_path(const std::string &path) {
-  instance().m_libmagic_data_path = path;
+void GlobalParams::set_libmagic_path(const std::string &path) {
+  instance().m_libmagic_path = path;
 }
 
 GlobalParams::GlobalParams()
     : m_odr_core_data_path{internal::project_info::odr_data_path()},
       m_fontconfig_data_path{internal::project_info::fontconfig_data_path()},
       m_poppler_data_path{internal::project_info::poppler_data_path()},
       m_pdf2htmlex_data_path{internal::project_info::pdf2htmlex_data_path()},
-      m_libmagic_data_path{internal::project_info::libmagic_data_path()} {}
+      m_libmagic_path{internal::project_info::libmagic_path()} {}
 
 } // namespace odr

src/odr/global_params.hpp

@@ -10,13 +10,13 @@ class GlobalParams {
   static const std::string &fontconfig_data_path();
   static const std::string &poppler_data_path();
   static const std::string &pdf2htmlex_data_path();
-  static const std::string &libmagic_data_path();
+  static const std::string &libmagic_path();
 
   static void set_odr_core_data_path(const std::string &path);
   static void set_fontconfig_data_path(const std::string &path);
   static void set_poppler_data_path(const std::string &path);
   static void set_pdf2htmlex_data_path(const std::string &path);
-  static void set_libmagic_data_path(const std::string &path);
+  static void set_libmagic_path(const std::string &path);
 
 private:
   static GlobalParams &instance();
@@ -27,7 +27,7 @@ class GlobalParams {
   std::string m_fontconfig_data_path;
   std::string m_poppler_data_path;
   std::string m_pdf2htmlex_data_path;
-  std::string m_libmagic_data_path;
+  std::string m_libmagic_path;
 };
 
 } // namespace odr

src/odr/internal/libmagic/libmagic.cpp

@@ -29,8 +29,8 @@ magic_t get_magic_cookie() {
   if (!magic_cookie) {
     throw std::runtime_error("magic_open failed");
   }
-  if (magic_load(magic_cookie.get(),
-                 GlobalParams::libmagic_data_path().c_str()) == 0) {
+  if (magic_load(magic_cookie.get(), GlobalParams::libmagic_path().c_str()) ==
+      0) {
     return magic_cookie.get();
   }
   if (magic_load(magic_cookie.get(), nullptr) == 0) {
@@ -42,7 +42,7 @@ magic_t get_magic_cookie() {
 
 } // namespace
 
-const char *libmagic::mime_type(const std::string &path) {
+const char *libmagic::mimetype(const std::string &path) {
   const magic_t magic_cookie = get_magic_cookie();
   return magic_file(magic_cookie, path.c_str());
 }

src/odr/internal/libmagic/libmagic.hpp

@@ -3,5 +3,5 @@
 #include <string>
 
 namespace odr::internal::libmagic {
-const char *mime_type(const std::string &path);
+const char *mimetype(const std::string &path);
 }

src/odr/internal/magic.cpp

@@ -89,8 +89,8 @@ FileType magic::file_type(const File &file) {
 }
 
 std::string_view magic::mimetype(const std::string &path) {
-#ifdef ODR_USE_LIBMAGIC
-  return libmagic::mime_type(path);
+#ifdef ODR_WITH_LIBMAGIC
+  return libmagic::mimetype(path);
 #else
   return odr::mimetype_by_file_type(magic::file_type(path));
 #endif

src/odr/internal/project_info.cpp.in

@@ -52,8 +52,8 @@ const char *project_info::pdf2htmlex_data_path() noexcept{
         return "${PDF2HTMLEX_DATA_DIR}";
 }
 
-const char *project_info::libmagic_data_path() noexcept{
-        return "${LIBMAGIC_DATA_DIR}";
+const char *project_info::libmagic_path() noexcept{
+        return "${MAGIC}";
 }
 
 } // namespace odr::internal

src/odr/internal/project_info.hpp

@@ -13,6 +13,6 @@ const char *odr_data_path() noexcept;
 const char *fontconfig_data_path() noexcept;
 const char *poppler_data_path() noexcept;
 const char *pdf2htmlex_data_path() noexcept;
-const char *libmagic_data_path() noexcept;
+const char *libmagic_path() noexcept;
 
 } // namespace odr::internal::project_info

test/src/internal/magic_test.cpp

@@ -1,6 +1,7 @@
 #include <odr/file.hpp>
 
 #include <odr/internal/magic.hpp>
+#include <odr/internal/project_info.hpp>
 
 #include <test_util.hpp>
 
@@ -13,26 +14,49 @@ using namespace odr::test;
 TEST(magic, odt) {
   const File file(TestData::test_file_path("odr-public/odt/about.odt"));
   EXPECT_EQ(magic::file_type(*file.impl()), FileType::zip);
+
+  if (project_info::has_libmagic()) {
+    EXPECT_EQ(magic::mimetype(file.disk_path().value()),
+              "application/vnd.oasis.opendocument.text");
+  }
 }
 
 TEST(magic, doc) {
   const File file(TestData::test_file_path("odr-public/doc/empty.doc"));
   EXPECT_EQ(magic::file_type(*file.impl()),
             FileType::compound_file_binary_format);
+
+  if (project_info::has_libmagic()) {
+    EXPECT_EQ(magic::mimetype(file.disk_path().value()), "application/msword");
+  }
 }
 
 TEST(magic, svm) {
   const File file(TestData::test_file_path("odr-public/svm/chart-1.svm"));
   EXPECT_EQ(magic::file_type(*file.impl()), FileType::starview_metafile);
+
+  if (project_info::has_libmagic()) {
+    EXPECT_EQ(magic::mimetype(file.disk_path().value()),
+              "application/octet-stream");
+  }
 }
 
 TEST(magic, odf) {
   const File file(TestData::test_file_path("odr-private/pdf/sample.pdf"));
   EXPECT_EQ(magic::file_type(*file.impl()), FileType::portable_document_format);
+
+  if (project_info::has_libmagic()) {
+    EXPECT_EQ(magic::mimetype(file.disk_path().value()), "application/pdf");
+  }
 }
 
 TEST(magic, wpd) {
   const File file(
       TestData::test_file_path("odr-public/wpd/Sync3 Sample Page.wpd"));
   EXPECT_EQ(magic::file_type(*file.impl()), FileType::word_perfect);
+
+  if (project_info::has_libmagic()) {
+    EXPECT_EQ(magic::mimetype(file.disk_path().value()),
+              "application/vnd.wordperfect");
+  }
 }