more mimetypes

Author: andiwand

src/odr/file.cpp

@@ -6,6 +6,7 @@
 
 #include <odr/internal/abstract/file.hpp>
 #include <odr/internal/common/file.hpp>
+#include <odr/internal/magic.hpp>
 #include <odr/internal/open_strategy.hpp>
 #include <odr/internal/util/file_util.hpp>
 #include <odr/internal/util/stream_util.hpp>
@@ -27,6 +28,12 @@ FileMeta::FileMeta(const FileType type, const bool password_encrypted,
     : type{type}, password_encrypted{password_encrypted},
       document_meta{document_meta} {}
 
+FileMeta::FileMeta(const FileType type, const std::string_view mimetype,
+                   const bool password_encrypted,
+                   const std::optional<DocumentMeta> document_meta)
+    : type{type}, mimetype{mimetype}, password_encrypted{password_encrypted},
+      document_meta{document_meta} {}
+
 File::File() = default;
 
 File::File(std::shared_ptr<internal::abstract::File> impl)
@@ -66,6 +73,12 @@ std::vector<FileType> DecodedFile::list_file_types(const std::string &path,
       std::make_shared<internal::DiskFile>(path), logger);
 }
 
+std::string_view DecodedFile::mimetype(const std::string &path,
+                                       Logger &logger) {
+  (void)logger;
+  return internal::magic::mimetype(path);
+}
+
 std::vector<DecoderEngine>
 DecodedFile::list_decoder_engines(const FileType as) {
   return internal::open_strategy::list_decoder_engines(as);

src/odr/file.hpp

@@ -5,6 +5,7 @@
 #include <memory>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace odr::internal::abstract {
@@ -140,10 +141,14 @@ struct DocumentMeta final {
 /// @brief Meta information about a file.
 struct FileMeta final {
   FileMeta();
+  [[deprecated]]
   FileMeta(FileType type, bool password_encrypted,
            std::optional<DocumentMeta> document_meta);
+  FileMeta(FileType type, std::string_view mimetype, bool password_encrypted,
+           std::optional<DocumentMeta> document_meta);
 
   FileType type{FileType::unknown};
+  std::string_view mimetype;
   bool password_encrypted{false};
   std::optional<DocumentMeta> document_meta;
 };
@@ -175,9 +180,12 @@ class File final {
 /// @brief Represents a decoded file.
 class DecodedFile {
 public:
-  static std::vector<FileType> list_file_types(const std::string &path,
-                                               Logger &logger = Logger::null());
-  static std::vector<DecoderEngine> list_decoder_engines(FileType as);
+  [[nodiscard]] static std::vector<FileType>
+  list_file_types(const std::string &path, Logger &logger = Logger::null());
+  [[nodiscard]] static std::vector<DecoderEngine>
+  list_decoder_engines(FileType as);
+  [[nodiscard]] static std::string_view
+  mimetype(const std::string &path, Logger &logger = Logger::null());
 
   explicit DecodedFile(std::shared_ptr<internal::abstract::DecodedFile> impl);
   explicit DecodedFile(const File &file, Logger &logger = Logger::null());

src/odr/internal/abstract/file.hpp

@@ -38,6 +38,7 @@ class DecodedFile {
   [[nodiscard]] virtual FileCategory file_category() const noexcept = 0;
   [[nodiscard]] virtual FileMeta file_meta() const noexcept = 0;
   [[nodiscard]] virtual DecoderEngine decoder_engine() const noexcept = 0;
+  [[nodiscard]] virtual std::string_view mimetype() const noexcept = 0;
 
   [[nodiscard]] virtual bool password_encrypted() const noexcept {
     return false;

src/odr/internal/cfb/cfb_file.cpp

@@ -17,15 +17,18 @@ FileType CfbFile::file_type() const noexcept {
 }
 
 FileMeta CfbFile::file_meta() const noexcept {
-  FileMeta meta;
-  meta.type = file_type();
-  return meta;
+  return {FileType::compound_file_binary_format, "application/x-cfb", false,
+          std::nullopt};
 }
 
 DecoderEngine CfbFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+std::string_view CfbFile::mimetype() const noexcept {
+  return "application/x-cfb";
+}
+
 bool CfbFile::is_decodable() const noexcept { return true; }
 
 std::shared_ptr<abstract::Archive> CfbFile::archive() const {

src/odr/internal/cfb/cfb_file.hpp

@@ -26,6 +26,7 @@ class CfbFile final : public abstract::ArchiveFile {
   [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] std::string_view mimetype() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 

src/odr/internal/common/image_file.cpp

@@ -20,6 +20,8 @@ DecoderEngine ImageFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+std::string_view ImageFile::mimetype() const noexcept { return ""; }
+
 bool ImageFile::is_decodable() const noexcept { return false; }
 
 std::shared_ptr<abstract::Image> ImageFile::image() const {

src/odr/internal/common/image_file.hpp

@@ -13,6 +13,7 @@ class ImageFile final : public abstract::ImageFile {
   [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] std::string_view mimetype() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 

src/odr/internal/csv/csv_file.cpp

@@ -20,14 +20,16 @@ FileType CsvFile::file_type() const noexcept {
   return FileType::comma_separated_values;
 }
 
-FileMeta CsvFile::file_meta() const noexcept {
-  return {FileType::comma_separated_values, false, {}};
-}
-
 DecoderEngine CsvFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+std::string_view CsvFile::mimetype() const noexcept { return "text/csv"; }
+
+FileMeta CsvFile::file_meta() const noexcept {
+  return {FileType::comma_separated_values, "text/csv", false, std::nullopt};
+}
+
 bool CsvFile::is_decodable() const noexcept { return false; }
 
 } // namespace odr::internal::csv

src/odr/internal/csv/csv_file.hpp

@@ -17,6 +17,7 @@ class CsvFile final : public abstract::TextFile {
   [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] std::string_view mimetype() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 

src/odr/internal/json/json_file.cpp

@@ -21,13 +21,18 @@ FileType JsonFile::file_type() const noexcept {
 }
 
 FileMeta JsonFile::file_meta() const noexcept {
-  return {FileType::javascript_object_notation, false, {}};
+  return {FileType::javascript_object_notation, "application/json", false,
+          std::nullopt};
 }
 
 DecoderEngine JsonFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+std::string_view JsonFile::mimetype() const noexcept {
+  return "application/json";
+}
+
 bool JsonFile::is_decodable() const noexcept { return false; }
 
 } // namespace odr::internal::json