Cleanup for v5 (#408)

Author: andiwand

src/odr/exceptions.cpp

@@ -65,8 +65,6 @@ UnsupportedEndian::UnsupportedEndian()
 MsUnsupportedCryptoAlgorithm::MsUnsupportedCryptoAlgorithm()
     : std::runtime_error("unsupported crypto algorithm") {}
 
-WrongPassword::WrongPassword() : std::runtime_error("wrong password") {}
-
 UnknownDocumentType::UnknownDocumentType()
     : std::runtime_error("unknown document type") {}
 

src/odr/exceptions.hpp

@@ -137,11 +137,6 @@ struct MsUnsupportedCryptoAlgorithm final : public std::runtime_error {
   MsUnsupportedCryptoAlgorithm();
 };
 
-/// @brief Wrong password exception
-struct WrongPassword final : public std::runtime_error {
-  WrongPassword();
-};
-
 /// @brief Unknown document type exception
 struct UnknownDocumentType final : public std::runtime_error {
   UnknownDocumentType();

src/odr/html.cpp

@@ -5,6 +5,7 @@
 #include <odr/document_path.hpp>
 #include <odr/exceptions.hpp>
 #include <odr/filesystem.hpp>
+#include <odr/global_params.hpp>
 
 #include <odr/internal/html/document.hpp>
 #include <odr/internal/html/filesystem.hpp>
@@ -24,6 +25,8 @@ using namespace odr::internal;
 
 namespace odr {
 
+HtmlConfig::HtmlConfig() : resource_path{GlobalParams::odr_core_data_path()} {}
+
 Html::Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages)
     : m_file_type{file_type}, m_config{std::move(config)},
       m_pages{std::move(pages)} {}
@@ -52,23 +55,6 @@ void Html::save(const std::string &path) const {
 HtmlPage::HtmlPage(std::string name, std::string path)
     : name{std::move(name)}, path{std::move(path)} {}
 
-Html html::translate(const File &file, const std::string &output_path,
-                     const HtmlConfig &config,
-                     const PasswordCallback &password_callback) {
-  auto decoded_file = DecodedFile(file);
-
-  if (decoded_file.is_document_file()) {
-    DocumentFile document_file = decoded_file.document_file();
-    if (document_file.password_encrypted()) {
-      if (!document_file.decrypt(password_callback())) {
-        throw WrongPassword();
-      }
-    }
-  }
-
-  return translate(decoded_file, output_path, config);
-}
-
 Html html::translate(const DecodedFile &decoded_file,
                      const std::string &output_path, const HtmlConfig &config) {
   if (decoded_file.is_text_file()) {

src/odr/html.hpp

@@ -61,6 +61,8 @@ struct HtmlConfig {
   // formatting
   bool format_html{false};
   std::uint8_t html_indent{2};
+
+  HtmlConfig();
 };
 
 /// @brief HTML output.
@@ -96,27 +98,8 @@ struct HtmlPage final {
   HtmlPage(std::string name, std::string path);
 };
 
-/// @brief Callback to get the password for encrypted files.
-using PasswordCallback = std::function<std::string()>;
-
 namespace html {
 
-/// @brief Translates a file to HTML.
-///
-/// @deprecated This function is deprecated because it hides API which can be
-/// useful to the user like inspecting if a file is encrypted and if the
-/// password was wrong. Use `translate(const DecodedFile &, const std::string &,
-/// const HtmlConfig &)` instead.
-///
-/// @param file File to translate.
-/// @param output_path Path to save the HTML output.
-/// @param config Configuration for the HTML output.
-/// @param password_callback Callback to get the password for encrypted files.
-/// @return HTML output.
-[[deprecated]]
-Html translate(const File &file, const std::string &output_path,
-               const HtmlConfig &config,
-               const PasswordCallback &password_callback);
 /// @brief Translates a decoded file to HTML.
 ///
 /// @param file Decoded file to translate.

src/odr/http_server.hpp

@@ -14,7 +14,6 @@ class HtmlService;
 class HttpServer {
 public:
   struct Config {
-    std::size_t buffer_size{4096};
     std::string output_path{"/tmp"};
   };
 

src/odr/odr.hpp

@@ -19,9 +19,6 @@ class PdfFile;
 class Html;
 struct HtmlConfig;
 
-/// @brief Callback to get the password for encrypted files.
-using PasswordCallback = std::function<std::string()>;
-
 /// @brief Get the version of the Open Document Reader library.
 /// @return The version of the Open Document Reader library.
 [[nodiscard]] std::string version() noexcept;