html document service (#385)

opendocument-app · Aug 18, 2024 · c1482dd · c1482dd
1 parent 916ec72
commit c1482dd
Show file tree

Hide file tree

Showing 8 changed files with 219 additions and 164 deletions.
diff --git a/src/odr/html_service.cpp b/src/odr/html_service.cpp
@@ -18,6 +18,14 @@ std::vector<HtmlFragment> HtmlService::fragments() const {
   return result;
 }
 
+void HtmlService::write_html_document(
+    std::ostream &os, const odr::HtmlConfig &config,
+    const odr::HtmlResourceLocator &resourceLocator) const {
+  internal::html::HtmlWriter out(os, config);
+
+  m_impl->write_html_document(out, config, resourceLocator);
+}
+
 HtmlFragment::HtmlFragment(
     std::shared_ptr<internal::abstract::HtmlFragment> impl)
     : m_impl{std::move(impl)} {}
@@ -32,4 +40,12 @@ void HtmlFragment::write_html_fragment(
   m_impl->write_html_fragment(out, config, resourceLocator);
 }
 
+void HtmlFragment::write_html_document(
+    std::ostream &os, const odr::HtmlConfig &config,
+    const odr::HtmlResourceLocator &resourceLocator) const {
+  internal::html::HtmlWriter out(os, config);
+
+  m_impl->write_html_document(out, config, resourceLocator);
+}
+
 } // namespace odr
diff --git a/src/odr/html_service.hpp b/src/odr/html_service.hpp
@@ -37,6 +37,9 @@ class HtmlService final {
 
   [[nodiscard]] std::vector<HtmlFragment> fragments() const;
 
+  void write_html_document(std::ostream &os, const HtmlConfig &config,
+                           const HtmlResourceLocator &resourceLocator) const;
+
 private:
   std::shared_ptr<internal::abstract::HtmlService> m_impl;
 };
@@ -50,6 +53,9 @@ class HtmlFragment final {
   void write_html_fragment(std::ostream &os, const HtmlConfig &config,
                            const HtmlResourceLocator &resourceLocator) const;
 
+  void write_html_document(std::ostream &os, const HtmlConfig &config,
+                           const HtmlResourceLocator &resourceLocator) const;
+
 private:
   std::shared_ptr<internal::abstract::HtmlFragment> m_impl;
 };

diff --git a/src/odr/internal/abstract/html_service.hpp b/src/odr/internal/abstract/html_service.hpp
@@ -20,6 +20,10 @@ class HtmlService {
 
   [[nodiscard]] virtual const std::vector<std::shared_ptr<HtmlFragment>> &
   fragments() const = 0;
+
+  virtual void
+  write_html_document(html::HtmlWriter &out, const HtmlConfig &config,
+                      const HtmlResourceLocator &resourceLocator) const = 0;
 };
 
 class HtmlFragment {
@@ -31,6 +35,10 @@ class HtmlFragment {
   virtual void
   write_html_fragment(html::HtmlWriter &out, const HtmlConfig &config,
                       const HtmlResourceLocator &resourceLocator) const = 0;
+
+  virtual void
+  write_html_document(html::HtmlWriter &out, const HtmlConfig &config,
+                      const HtmlResourceLocator &resourceLocator) const = 0;
 };
 
 } // namespace odr::internal::abstract

diff --git a/src/odr/internal/html/common.hpp b/src/odr/internal/html/common.hpp
@@ -31,21 +31,6 @@ std::string file_to_url(const abstract::File &file,
 HtmlResourceLocator local_resource_locator(const std::string &output_path,
                                            const HtmlConfig &config);
 
-class StaticHtmlService : public abstract::HtmlService {
-public:
-  explicit StaticHtmlService(
-      std::vector<std::shared_ptr<abstract::HtmlFragment>> fragments)
-      : m_fragments(std::move(fragments)) {}
-
-  [[nodiscard]] const std::vector<std::shared_ptr<abstract::HtmlFragment>> &
-  fragments() const override {
-    return m_fragments;
-  }
-
-private:
-  const std::vector<std::shared_ptr<abstract::HtmlFragment>> m_fragments;
-};
-
 } // namespace odr::internal::html
 
 #endif // ODR_INTERNAL_HTML_COMMON_HPP