html service everything

Author: andiwand

cli/src/translate.cpp

@@ -1,5 +1,6 @@
 #include <odr/file.hpp>
 #include <odr/html.hpp>
+#include <odr/html_service.hpp>
 
 #include <iostream>
 #include <string>
@@ -33,7 +34,8 @@ int main(int argc, char **argv) {
   HtmlConfig config;
   config.editable = true;
 
-  html::translate(decoded_file, output, config);
+  HtmlService service = html::translate(decoded_file, output, config);
+  Html html = service.bring_offline(output);
 
   return 0;
 }

src/odr/html.cpp

@@ -6,6 +6,7 @@
 #include <odr/exceptions.hpp>
 #include <odr/filesystem.hpp>
 #include <odr/global_params.hpp>
+#include <odr/html_service.hpp>
 
 #include <odr/internal/html/document.hpp>
 #include <odr/internal/html/filesystem.hpp>
@@ -27,36 +28,19 @@ 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)} {}
+Html::Html(HtmlConfig config, std::vector<HtmlPage> pages)
+    : m_config{std::move(config)}, m_pages{std::move(pages)} {}
 
-Html::Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages,
-           Document document)
-    : m_file_type{file_type}, m_config{std::move(config)},
-      m_pages{std::move(pages)}, m_document{std::move(document)} {}
-
-FileType Html::file_type() const { return m_file_type; }
+const HtmlConfig &Html::config() { return m_config; }
 
 const std::vector<HtmlPage> &Html::pages() const { return m_pages; }
 
-void Html::edit(const char *diff) {
-  if (m_document) {
-    html::edit(*m_document, diff);
-  }
-}
-
-void Html::save(const std::string &path) const {
-  if (m_document) {
-    m_document->save(path);
-  }
-}
-
 HtmlPage::HtmlPage(std::string name, std::string path)
     : name{std::move(name)}, path{std::move(path)} {}
 
-Html html::translate(const DecodedFile &decoded_file,
-                     const std::string &output_path, const HtmlConfig &config) {
+HtmlService html::translate(const DecodedFile &decoded_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   if (decoded_file.is_text_file()) {
     return translate(decoded_file.text_file(), output_path, config);
   } else if (decoded_file.is_image_file()) {
@@ -72,67 +56,74 @@ Html html::translate(const DecodedFile &decoded_file,
   throw UnsupportedFileType(decoded_file.file_type());
 }
 
-Html html::translate(const TextFile &text_file, const std::string &output_path,
-                     const HtmlConfig &config) {
+HtmlService html::translate(const TextFile &text_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   std::filesystem::create_directories(output_path);
-  return internal::html::translate_text_file(text_file, output_path, config);
+  return internal::html::create_text_service(text_file, output_path, config);
 }
 
-Html html::translate(const ImageFile &image_file,
-                     const std::string &output_path, const HtmlConfig &config) {
+HtmlService html::translate(const ImageFile &image_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   std::filesystem::create_directories(output_path);
-  return internal::html::translate_image_file(image_file, output_path, config);
+  return internal::html::create_image_service(image_file, output_path, config);
 }
 
-Html html::translate(const ArchiveFile &archive_file,
-                     const std::string &output_path, const HtmlConfig &config) {
+HtmlService html::translate(const ArchiveFile &archive_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   return translate(archive_file.archive(), output_path, config);
 }
 
-Html html::translate(const DocumentFile &document_file,
-                     const std::string &output_path, const HtmlConfig &config) {
+HtmlService html::translate(const DocumentFile &document_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   auto document_file_impl = document_file.impl();
 
 #ifdef ODR_WITH_WVWARE
   if (auto wv_document_file =
           std::dynamic_pointer_cast<internal::WvWareLegacyMicrosoftFile>(
               document_file_impl)) {
     std::filesystem::create_directories(output_path);
-    return internal::html::translate_wvware_oldms_file(*wv_document_file,
+    return internal::html::create_wvware_oldms_service(*wv_document_file,
                                                        output_path, config);
   }
 #endif
 
   return translate(document_file.document(), output_path, config);
 }
 
-Html html::translate(const PdfFile &pdf_file, const std::string &output_path,
-                     const HtmlConfig &config) {
+HtmlService html::translate(const PdfFile &pdf_file,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   auto pdf_file_impl = pdf_file.impl();
 
 #ifdef ODR_WITH_PDF2HTMLEX
   if (auto poppler_pdf_file =
           std::dynamic_pointer_cast<internal::PopplerPdfFile>(pdf_file_impl)) {
     std::filesystem::create_directories(output_path);
-    return internal::html::translate_poppler_pdf_file(*poppler_pdf_file,
+    return internal::html::create_poppler_pdf_service(*poppler_pdf_file,
                                                       output_path, config);
   }
 #endif
 
-  return internal::html::translate_pdf_file(pdf_file, output_path, config);
+  return internal::html::create_pdf_service(pdf_file, output_path, config);
 }
 
-Html html::translate(const Archive &archive, const std::string &output_path,
-                     const HtmlConfig &config) {
+HtmlService html::translate(const Archive &archive,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   std::filesystem::create_directories(output_path);
-  return internal::html::translate_filesystem(
-      FileType::unknown, archive.filesystem(), output_path, config);
+  return internal::html::create_filesystem_service(archive.filesystem(),
+                                                   output_path, config);
 }
 
-Html html::translate(const Document &document, const std::string &output_path,
-                     const HtmlConfig &config) {
+HtmlService html::translate(const Document &document,
+                            const std::string &output_path,
+                            const HtmlConfig &config) {
   std::filesystem::create_directories(output_path);
-  return internal::html::translate_document(document, output_path, config);
+  return internal::html::create_document_service(document, output_path, config);
 }
 
 void html::edit(const Document &document, const char *diff) {

src/odr/html.hpp

@@ -12,6 +12,7 @@
 namespace odr {
 class Archive;
 struct HtmlPage;
+class HtmlService;
 
 /// @brief HTML table gridlines.
 enum class HtmlTableGridlines {
@@ -64,25 +65,17 @@ struct HtmlConfig {
 
 /// @brief HTML output.
 ///
-/// Represents the output of a translated file to HTML. Also allows for editing
-/// and saving the output.
+/// Represents the output of a translated file to HTML.
 class Html final {
 public:
-  Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages);
-  Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages,
-       Document document);
+  Html(HtmlConfig config, std::vector<HtmlPage> pages);
 
-  [[nodiscard]] FileType file_type() const;
+  [[nodiscard]] const HtmlConfig &config();
   [[nodiscard]] const std::vector<HtmlPage> &pages() const;
 
-  void edit(const char *diff);
-  void save(const std::string &path) const;
-
 private:
-  FileType m_file_type;
   HtmlConfig m_config;
   std::vector<HtmlPage> m_pages;
-  std::optional<Document> m_document;
 };
 
 /// @brief HTML page.
@@ -103,66 +96,66 @@ namespace html {
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const DecodedFile &file, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const DecodedFile &file, const std::string &output_path,
+                      const HtmlConfig &config);
 
 /// @brief Translates a text file to HTML.
 ///
 /// @param text_file Text file to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const TextFile &text_file, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const TextFile &text_file, const std::string &output_path,
+                      const HtmlConfig &config);
 /// @brief Translates an image file to HTML.
 ///
 /// @param image_file Image file to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const ImageFile &image_file, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const ImageFile &image_file,
+                      const std::string &output_path, const HtmlConfig &config);
 /// @brief Translates an archive to HTML.
 ///
 /// @param archive Archive file to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const ArchiveFile &archive_file, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const ArchiveFile &archive_file,
+                      const std::string &output_path, const HtmlConfig &config);
 /// @brief Translates a document to HTML.
 ///
 /// @param document_file Document file to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const DocumentFile &document_file,
-               const std::string &output_path, const HtmlConfig &config);
+HtmlService translate(const DocumentFile &document_file,
+                      const std::string &output_path, const HtmlConfig &config);
 /// @brief Translates a PDF file to HTML.
 ///
 /// @param pdf_file PDF file to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const PdfFile &pdf_file, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const PdfFile &pdf_file, const std::string &output_path,
+                      const HtmlConfig &config);
 
 /// @brief Translates an archive to HTML.
 ///
 /// @param archive Archive to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const Archive &archive, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const Archive &archive, const std::string &output_path,
+                      const HtmlConfig &config);
 /// @brief Translates a document to HTML.
 ///
 /// @param document Document to translate.
 /// @param output_path Path to save the HTML output.
 /// @param config Configuration for the HTML output.
 /// @return HTML output.
-Html translate(const Document &document, const std::string &output_path,
-               const HtmlConfig &config);
+HtmlService translate(const Document &document, const std::string &output_path,
+                      const HtmlConfig &config);
 
 /// @brief Edits a document with a diff.
 ///

src/odr/html_service.cpp

@@ -1,8 +1,12 @@
 #include <odr/html_service.hpp>
 
 #include <odr/internal/abstract/html_service.hpp>
+#include <odr/internal/common/path.hpp>
 #include <odr/internal/html/html_writer.hpp>
 
+#include <odr/exceptions.hpp>
+
+#include <fstream>
 #include <iostream>
 
 namespace odr {
@@ -42,6 +46,57 @@ HtmlResources HtmlService::write_html(const std::string &path,
   return m_impl->write_html(path, writer);
 }
 
+Html HtmlService::bring_offline(const std::string &output_path) const {
+  return bring_offline(output_path, list_views());
+}
+
+Html HtmlService::bring_offline(const std::string &output_path,
+                                const std::vector<HtmlView> &views) const {
+  std::vector<HtmlPage> pages;
+
+  HtmlResources resources;
+
+  for (const auto &view : views) {
+    std::filesystem::create_directories(
+        std::filesystem::path(view.path()).parent_path());
+    std::ofstream ostream(view.path(), std::ios::out);
+    if (!ostream.is_open()) {
+      throw FileWriteError();
+    }
+
+    HtmlResources view_resources = view.write_html(ostream);
+    resources.insert(resources.end(), view_resources.begin(),
+                     view_resources.end());
+
+    pages.emplace_back(view.name(), view.path());
+  }
+
+  {
+    auto it = std::unique(resources.begin(), resources.end(),
+                          [](const auto &lhs, const auto &rhs) {
+                            return lhs.first.path() == rhs.first.path();
+                          });
+    resources.erase(it, resources.end());
+  }
+
+  for (const auto &[resource, location] : resources) {
+    if (!location.has_value()) {
+      continue;
+    }
+    auto path = odr::internal::common::Path(output_path)
+                    .join(odr::internal::common::Path(*location));
+
+    std::filesystem::create_directories(path.parent().path());
+    std::ofstream ostream(path.path(), std::ios::out);
+    if (!ostream.is_open()) {
+      throw FileWriteError();
+    }
+    resource.write_resource(ostream);
+  }
+
+  return {config(), std::move(pages)};
+}
+
 const std::shared_ptr<internal::abstract::HtmlService> &
 HtmlService::impl() const {
   return m_impl;
@@ -63,6 +118,38 @@ HtmlResources HtmlView::write_html(std::ostream &out) const {
   return m_impl->write_html(writer);
 }
 
+Html HtmlView::bring_offline(const std::string &output_path) const {
+  HtmlResources resources;
+
+  {
+    std::filesystem::create_directories(
+        std::filesystem::path(path()).parent_path());
+    std::ofstream ostream(path(), std::ios::out);
+    if (!ostream.is_open()) {
+      throw FileWriteError();
+    }
+
+    resources = write_html(ostream);
+  }
+
+  for (const auto &[resource, location] : resources) {
+    if (!location.has_value()) {
+      continue;
+    }
+    auto path = odr::internal::common::Path(output_path)
+                    .join(odr::internal::common::Path(*location));
+
+    std::filesystem::create_directories(path.parent().path());
+    std::ofstream ostream(path.path(), std::ios::out);
+    if (!ostream.is_open()) {
+      throw FileWriteError();
+    }
+    resource.write_resource(ostream);
+  }
+
+  return {config(), {{name(), path()}}};
+}
+
 const std::shared_ptr<internal::abstract::HtmlView> &HtmlView::impl() const {
   return m_impl;
 }