fix; cleanup

andiwand · andiwand · commit 0b17685e5e1c · 2025-10-19T15:11:08.000+02:00
diff --git a/src/odr/internal/abstract/file.hpp b/src/odr/internal/abstract/file.hpp
@@ -34,11 +34,11 @@ class DecodedFile {
 
   [[nodiscard]] virtual std::shared_ptr<File> file() const noexcept = 0;
 
+  [[nodiscard]] virtual DecoderEngine decoder_engine() const noexcept = 0;
   [[nodiscard]] virtual FileType file_type() const noexcept = 0;
   [[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 FileMeta file_meta() const noexcept = 0;
 
   [[nodiscard]] virtual bool password_encrypted() const noexcept {
     return false;
@@ -100,6 +100,9 @@ class PdfFile : public DecodedFile {
   [[nodiscard]] FileCategory file_category() const noexcept final {
     return FileCategory::document;
   }
+  [[nodiscard]] std::string_view mimetype() const noexcept final {
+    return "application/pdf";
+  }
 };
 
 } // namespace odr::internal::abstract
diff --git a/src/odr/internal/cfb/cfb_file.cpp b/src/odr/internal/cfb/cfb_file.cpp
@@ -12,23 +12,22 @@ std::shared_ptr<abstract::File> CfbFile::file() const noexcept {
   return m_cfb->file();
 }
 
-FileType CfbFile::file_type() const noexcept {
-  return FileType::compound_file_binary_format;
-}
-
-FileMeta CfbFile::file_meta() const noexcept {
-  return {FileType::compound_file_binary_format, "application/x-cfb", false,
-          std::nullopt};
-}
-
 DecoderEngine CfbFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType CfbFile::file_type() const noexcept {
+  return FileType::compound_file_binary_format;
+}
+
 std::string_view CfbFile::mimetype() const noexcept {
   return "application/x-cfb";
 }
 
+FileMeta CfbFile::file_meta() const noexcept {
+  return {file_type(), mimetype(), false, std::nullopt};
+}
+
 bool CfbFile::is_decodable() const noexcept { return true; }
 
 std::shared_ptr<abstract::Archive> CfbFile::archive() const {
diff --git a/src/odr/internal/cfb/cfb_file.hpp b/src/odr/internal/cfb/cfb_file.hpp
@@ -23,10 +23,10 @@ class CfbFile final : public abstract::ArchiveFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 
diff --git a/src/odr/internal/csv/csv_file.cpp b/src/odr/internal/csv/csv_file.cpp
@@ -16,18 +16,18 @@ std::shared_ptr<abstract::File> CsvFile::file() const noexcept {
   return m_file->file();
 }
 
-FileType CsvFile::file_type() const noexcept {
-  return FileType::comma_separated_values;
-}
-
 DecoderEngine CsvFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType CsvFile::file_type() const noexcept {
+  return FileType::comma_separated_values;
+}
+
 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};
+  return {file_type(), mimetype(), false, std::nullopt};
 }
 
 bool CsvFile::is_decodable() const noexcept { return false; }
diff --git a/src/odr/internal/csv/csv_file.hpp b/src/odr/internal/csv/csv_file.hpp
@@ -14,10 +14,10 @@ class CsvFile final : public abstract::TextFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 
diff --git a/src/odr/internal/json/json_file.cpp b/src/odr/internal/json/json_file.cpp
@@ -16,23 +16,22 @@ std::shared_ptr<abstract::File> JsonFile::file() const noexcept {
   return m_file->file();
 }
 
-FileType JsonFile::file_type() const noexcept {
-  return FileType::javascript_object_notation;
-}
-
-FileMeta JsonFile::file_meta() const noexcept {
-  return {FileType::javascript_object_notation, "application/json", false,
-          std::nullopt};
-}
-
 DecoderEngine JsonFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType JsonFile::file_type() const noexcept {
+  return FileType::javascript_object_notation;
+}
+
 std::string_view JsonFile::mimetype() const noexcept {
   return "application/json";
 }
 
+FileMeta JsonFile::file_meta() const noexcept {
+  return {file_type(), mimetype(), false, std::nullopt};
+}
+
 bool JsonFile::is_decodable() const noexcept { return false; }
 
 } // namespace odr::internal::json
diff --git a/src/odr/internal/json/json_file.hpp b/src/odr/internal/json/json_file.hpp
@@ -14,10 +14,10 @@ class JsonFile final : public abstract::TextFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] bool is_decodable() const noexcept override;
 
diff --git a/src/odr/internal/libmagic/libmagic.cpp b/src/odr/internal/libmagic/libmagic.cpp
@@ -2,6 +2,8 @@
 
 #include <odr/global_params.hpp>
 
+#include <memory>
+
 #include <magic.h>
 
 namespace odr::internal {
diff --git a/src/odr/internal/odf/odf_file.cpp b/src/odr/internal/odf/odf_file.cpp
@@ -36,20 +36,20 @@ std::shared_ptr<abstract::File> OpenDocumentFile::file() const noexcept {
   return {};
 }
 
-FileType OpenDocumentFile::file_type() const noexcept {
-  return m_file_meta.type;
-}
-
-FileMeta OpenDocumentFile::file_meta() const noexcept { return m_file_meta; }
-
 DecoderEngine OpenDocumentFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType OpenDocumentFile::file_type() const noexcept {
+  return m_file_meta.type;
+}
+
 std::string_view OpenDocumentFile::mimetype() const noexcept {
   return m_file_meta.mimetype;
 }
 
+FileMeta OpenDocumentFile::file_meta() const noexcept { return m_file_meta; }
+
 DocumentType OpenDocumentFile::document_type() const {
   return m_file_meta.document_meta.value().document_type;
 }
diff --git a/src/odr/internal/odf/odf_file.hpp b/src/odr/internal/odf/odf_file.hpp
@@ -25,10 +25,10 @@ class OpenDocumentFile final : public virtual abstract::DocumentFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] DocumentType document_type() const override;
   [[nodiscard]] DocumentMeta document_meta() const override;
diff --git a/src/odr/internal/oldms/oldms_file.cpp b/src/odr/internal/oldms/oldms_file.cpp
@@ -60,20 +60,20 @@ std::shared_ptr<abstract::File> LegacyMicrosoftFile::file() const noexcept {
   return {};
 }
 
-FileType LegacyMicrosoftFile::file_type() const noexcept {
-  return m_file_meta.type;
-}
-
-FileMeta LegacyMicrosoftFile::file_meta() const noexcept { return m_file_meta; }
-
 DecoderEngine LegacyMicrosoftFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType LegacyMicrosoftFile::file_type() const noexcept {
+  return m_file_meta.type;
+}
+
 std::string_view LegacyMicrosoftFile::mimetype() const noexcept {
   return m_file_meta.mimetype;
 }
 
+FileMeta LegacyMicrosoftFile::file_meta() const noexcept { return m_file_meta; }
+
 DocumentType LegacyMicrosoftFile::document_type() const {
   return m_file_meta.document_meta.value().document_type;
 }
diff --git a/src/odr/internal/oldms/oldms_file.hpp b/src/odr/internal/oldms/oldms_file.hpp
@@ -22,10 +22,10 @@ class LegacyMicrosoftFile final : public abstract::DocumentFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] DocumentType document_type() const override;
   [[nodiscard]] DocumentMeta document_meta() const override;
diff --git a/src/odr/internal/oldms_wvware/wvware_oldms_file.cpp b/src/odr/internal/oldms_wvware/wvware_oldms_file.cpp
@@ -83,22 +83,22 @@ WvWareLegacyMicrosoftFile::file() const noexcept {
   return m_file;
 }
 
-FileType WvWareLegacyMicrosoftFile::file_type() const noexcept {
-  return FileType::legacy_word_document;
-}
-
-FileMeta WvWareLegacyMicrosoftFile::file_meta() const noexcept {
-  return m_file_meta;
-}
-
 DecoderEngine WvWareLegacyMicrosoftFile::decoder_engine() const noexcept {
   return DecoderEngine::wvware;
 }
 
+FileType WvWareLegacyMicrosoftFile::file_type() const noexcept {
+  return FileType::legacy_word_document;
+}
+
 std::string_view WvWareLegacyMicrosoftFile::mimetype() const noexcept {
   return "application/msword";
 }
 
+FileMeta WvWareLegacyMicrosoftFile::file_meta() const noexcept {
+  return m_file_meta;
+}
+
 DocumentType WvWareLegacyMicrosoftFile::document_type() const {
   return DocumentType::text;
 }
diff --git a/src/odr/internal/oldms_wvware/wvware_oldms_file.hpp b/src/odr/internal/oldms_wvware/wvware_oldms_file.hpp
@@ -23,10 +23,10 @@ class WvWareLegacyMicrosoftFile final : public abstract::DocumentFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] DocumentType document_type() const override;
   [[nodiscard]] DocumentMeta document_meta() const override;
diff --git a/src/odr/internal/ooxml/ooxml_file.cpp b/src/odr/internal/ooxml/ooxml_file.cpp
@@ -29,20 +29,20 @@ std::shared_ptr<abstract::File> OfficeOpenXmlFile::file() const noexcept {
   return {};
 }
 
-FileType OfficeOpenXmlFile::file_type() const noexcept {
-  return m_file_meta.type;
-}
-
-FileMeta OfficeOpenXmlFile::file_meta() const noexcept { return m_file_meta; }
-
 DecoderEngine OfficeOpenXmlFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
+FileType OfficeOpenXmlFile::file_type() const noexcept {
+  return m_file_meta.type;
+}
+
 std::string_view OfficeOpenXmlFile::mimetype() const noexcept {
   return m_file_meta.mimetype;
 }
 
+FileMeta OfficeOpenXmlFile::file_meta() const noexcept { return m_file_meta; }
+
 DocumentType OfficeOpenXmlFile::document_type() const {
   return m_file_meta.document_meta.value().document_type;
 }
diff --git a/src/odr/internal/ooxml/ooxml_file.hpp b/src/odr/internal/ooxml/ooxml_file.hpp
@@ -24,10 +24,10 @@ class OfficeOpenXmlFile final : public abstract::DocumentFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept override;
 
-  [[nodiscard]] FileType file_type() const noexcept override;
-  [[nodiscard]] FileMeta file_meta() const noexcept override;
   [[nodiscard]] DecoderEngine decoder_engine() const noexcept override;
+  [[nodiscard]] FileType file_type() const noexcept override;
   [[nodiscard]] std::string_view mimetype() const noexcept override;
+  [[nodiscard]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] DocumentType document_type() const override;
   [[nodiscard]] DocumentMeta document_meta() const override;
diff --git a/src/odr/internal/pdf/pdf_file.cpp b/src/odr/internal/pdf/pdf_file.cpp
@@ -11,15 +11,11 @@ std::shared_ptr<abstract::File> PdfFile::file() const noexcept {
   return m_file;
 }
 
-FileMeta PdfFile::file_meta() const noexcept { return m_file_meta; }
-
 DecoderEngine PdfFile::decoder_engine() const noexcept {
   return DecoderEngine::odr;
 }
 
-std::string_view PdfFile::mimetype() const noexcept {
-  return "application/pdf";
-}
+FileMeta PdfFile::file_meta() const noexcept { return m_file_meta; }
 
 bool PdfFile::password_encrypted() const noexcept { return false; }
 
diff --git a/src/odr/internal/pdf/pdf_file.hpp b/src/odr/internal/pdf/pdf_file.hpp
@@ -10,9 +10,8 @@ class PdfFile final : public abstract::PdfFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() 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]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] bool password_encrypted() const noexcept override;
   [[nodiscard]] EncryptionState encryption_state() const noexcept override;
diff --git a/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp b/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp
@@ -66,15 +66,11 @@ std::shared_ptr<abstract::File> PopplerPdfFile::file() const noexcept {
   return m_file;
 }
 
-FileMeta PopplerPdfFile::file_meta() const noexcept { return m_file_meta; }
-
 DecoderEngine PopplerPdfFile::decoder_engine() const noexcept {
   return DecoderEngine::poppler;
 }
 
-std::string_view PopplerPdfFile::mimetype() const noexcept {
-  return "application/pdf";
-}
+FileMeta PopplerPdfFile::file_meta() const noexcept { return m_file_meta; }
 
 bool PopplerPdfFile::password_encrypted() const noexcept {
   return m_encryption_state == EncryptionState::encrypted ||
diff --git a/src/odr/internal/pdf_poppler/poppler_pdf_file.hpp b/src/odr/internal/pdf_poppler/poppler_pdf_file.hpp
@@ -15,9 +15,8 @@ class PopplerPdfFile final : public abstract::PdfFile {
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() 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]] FileMeta file_meta() const noexcept override;
 
   [[nodiscard]] bool password_encrypted() const noexcept override;
   [[nodiscard]] EncryptionState encryption_state() const noexcept override;
diff --git a/src/odr/internal/svm/svm_file.cpp b/src/odr/internal/svm/svm_file.cpp
diff --git a/src/odr/internal/svm/svm_file.hpp b/src/odr/internal/svm/svm_file.hpp
diff --git a/src/odr/internal/text/text_file.cpp b/src/odr/internal/text/text_file.cpp
diff --git a/src/odr/internal/text/text_file.hpp b/src/odr/internal/text/text_file.hpp
diff --git a/src/odr/internal/zip/zip_file.cpp b/src/odr/internal/zip/zip_file.cpp
diff --git a/src/odr/internal/zip/zip_file.hpp b/src/odr/internal/zip/zip_file.hpp

Original file line number	Diff line number	Diff line change
`@@ -36,20 +36,20 @@ std::shared_ptr<abstract::File> OpenDocumentFile::file() const noexcept {`
`36`	`36`	`return {};`
`37`	`37`	`}`
`38`	`38`
`39`		`-FileType OpenDocumentFile::file_type() const noexcept {`
`40`		`- return m_file_meta.type;`
`41`		`-}`
`42`		`-`
`43`		`-FileMeta OpenDocumentFile::file_meta() const noexcept { return m_file_meta; }`
`44`		`-`
`45`	`39`	`DecoderEngine OpenDocumentFile::decoder_engine() const noexcept {`
`46`	`40`	`return DecoderEngine::odr;`
`47`	`41`	`}`
`48`	`42`
	`43`	`+FileType OpenDocumentFile::file_type() const noexcept {`
	`44`	`+ return m_file_meta.type;`
	`45`	`+}`
	`46`	`+`
`49`	`47`	`std::string_view OpenDocumentFile::mimetype() const noexcept {`
`50`	`48`	`return m_file_meta.mimetype;`
`51`	`49`	`}`
`52`	`50`
	`51`	`+FileMeta OpenDocumentFile::file_meta() const noexcept { return m_file_meta; }`
	`52`	`+`
`53`	`53`	`DocumentType OpenDocumentFile::document_type() const {`
`54`	`54`	`return m_file_meta.document_meta.value().document_type;`
`55`	`55`	`}`