wvware images (#442)

Author: andiwand

src/odr/internal/common/file.cpp

@@ -10,15 +10,14 @@
 
 namespace odr::internal {
 
-DiskFile::DiskFile(const char *path) : DiskFile{Path(path)} {}
+DiskFile::DiskFile(const char *path) : DiskFile{AbsPath(path)} {}
 
-DiskFile::DiskFile(const std::string &path) : DiskFile{Path(path)} {}
+DiskFile::DiskFile(const std::string &path) : DiskFile{AbsPath(path)} {}
 
-DiskFile::DiskFile(Path path) {
-  if (!std::filesystem::is_regular_file(path.path())) {
+DiskFile::DiskFile(AbsPath path) : m_path{std::move(path)} {
+  if (!std::filesystem::is_regular_file(m_path.path())) {
     throw FileNotFound();
   }
-  m_path = AbsPath(std::filesystem::absolute(path.path()));
 }
 
 FileLocation DiskFile::location() const noexcept { return FileLocation::disk; }

src/odr/internal/common/file.hpp

@@ -17,7 +17,7 @@ class DiskFile : public abstract::File {
 public:
   explicit DiskFile(const char *path);
   explicit DiskFile(const std::string &path);
-  explicit DiskFile(Path path);
+  explicit DiskFile(AbsPath path);
 
   [[nodiscard]] FileLocation location() const noexcept final;
   [[nodiscard]] std::size_t size() const final;

src/odr/internal/common/path.cpp

@@ -324,6 +324,10 @@ Path::Iterator Path::Iterator::operator++(int) {
   return old;
 }
 
+AbsPath AbsPath::current_working_directory() {
+  return AbsPath(std::filesystem::current_path());
+}
+
 AbsPath::AbsPath() noexcept : Path("/") {}
 
 AbsPath::AbsPath(const char *c_string) : Path(c_string) {

src/odr/internal/common/path.hpp

@@ -109,6 +109,8 @@ class Path {
 
 class AbsPath final : public Path {
 public:
+  static AbsPath current_working_directory();
+
   AbsPath() noexcept;
   explicit AbsPath(const char *c_string);
   explicit AbsPath(const std::string &string);

src/odr/internal/common/temporary_file.cpp

@@ -13,7 +13,8 @@ TemporaryDiskFile::TemporaryDiskFile(const char *path) : DiskFile{path} {}
 TemporaryDiskFile::TemporaryDiskFile(const std::string &path)
     : DiskFile{path} {}
 
-TemporaryDiskFile::TemporaryDiskFile(const Path &path) : DiskFile{path} {}
+TemporaryDiskFile::TemporaryDiskFile(AbsPath path)
+    : DiskFile{std::move(path)} {}
 
 TemporaryDiskFile::TemporaryDiskFile(const TemporaryDiskFile &) = default;
 
@@ -31,7 +32,7 @@ TemporaryDiskFile::operator=(TemporaryDiskFile &&) noexcept = default;
 
 const TemporaryDiskFileFactory &TemporaryDiskFileFactory::system_default() {
   static TemporaryDiskFileFactory instance(
-      Path(std::filesystem::temp_directory_path()),
+      AbsPath(std::filesystem::temp_directory_path()),
       default_random_file_name_generator());
   return instance;
 }
@@ -42,7 +43,7 @@ TemporaryDiskFileFactory::default_random_file_name_generator() {
 }
 
 TemporaryDiskFileFactory::TemporaryDiskFileFactory(
-    Path directory, RandomFileNameGenerator random_file_name_generator)
+    AbsPath directory, RandomFileNameGenerator random_file_name_generator)
     : m_directory{std::move(directory)},
       m_random_file_name_generator{std::move(random_file_name_generator)} {}
 
@@ -53,7 +54,7 @@ TemporaryDiskFileFactory::copy(const abstract::File &file) const {
 
 TemporaryDiskFile TemporaryDiskFileFactory::copy(std::istream &in) const {
   std::fstream file;
-  Path file_path;
+  AbsPath file_path;
 
   while (true) {
     std::string file_name = m_random_file_name_generator();

src/odr/internal/common/temporary_file.hpp

@@ -11,7 +11,7 @@ class TemporaryDiskFile final : public DiskFile {
 public:
   explicit TemporaryDiskFile(const char *path);
   explicit TemporaryDiskFile(const std::string &path);
-  explicit TemporaryDiskFile(const Path &path);
+  explicit TemporaryDiskFile(AbsPath path);
   TemporaryDiskFile(const TemporaryDiskFile &);
   TemporaryDiskFile(TemporaryDiskFile &&) noexcept;
   ~TemporaryDiskFile() override;
@@ -27,14 +27,14 @@ class TemporaryDiskFileFactory final {
   static RandomFileNameGenerator default_random_file_name_generator();
 
   explicit TemporaryDiskFileFactory(
-      Path directory, RandomFileNameGenerator random_file_name_generator =
-                          default_random_file_name_generator());
+      AbsPath directory, RandomFileNameGenerator random_file_name_generator =
+                             default_random_file_name_generator());
 
   [[nodiscard]] TemporaryDiskFile copy(const abstract::File &file) const;
   [[nodiscard]] TemporaryDiskFile copy(std::istream &in) const;
 
 private:
-  Path m_directory;
+  AbsPath m_directory;
   RandomFileNameGenerator m_random_file_name_generator;
 };
 

src/odr/internal/html/document.cpp

@@ -45,7 +45,7 @@ void front(const Document &document, const WritingState &state) {
   }
 
   auto odr_css_file = File(
-      Path(state.config().resource_path).join(RelPath("odr.css")).string());
+      AbsPath(state.config().resource_path).join(RelPath("odr.css")).string());
   odr::HtmlResource odr_css_resource =
       html::HtmlResource::create(HtmlResourceType::css, "text/css", "odr.css",
                                  "odr.css", odr_css_file, true, false, true);
@@ -62,7 +62,7 @@ void front(const Document &document, const WritingState &state) {
 
   if (document.document_type() == DocumentType::spreadsheet) {
     auto odr_spreadsheet_css_file =
-        File(Path(state.config().resource_path)
+        File(AbsPath(state.config().resource_path)
                  .join(RelPath("odr_spreadsheet.css"))
                  .string());
     odr::HtmlResource odr_spreadsheet_css_resource = html::HtmlResource::create(
@@ -122,8 +122,8 @@ void back(const Document &document, const WritingState &state) {
     out.write_element_end("div");
   }
 
-  auto odr_js_file =
-      File(Path(state.config().resource_path).join(RelPath("odr.js")).string());
+  auto odr_js_file = File(
+      AbsPath(state.config().resource_path).join(RelPath("odr.js")).string());
   odr::HtmlResource odr_js_resource = html::HtmlResource::create(
       HtmlResourceType::js, "text/javascript", "odr.js", "odr.js", odr_js_file,
       true, false, true);

src/odr/internal/html/pdf2htmlex_wrapper.cpp

@@ -5,7 +5,6 @@
 #include <odr/global_params.hpp>
 #include <odr/html.hpp>
 
-#include <odr/internal/html/common.hpp>
 #include <odr/internal/html/html_service.hpp>
 #include <odr/internal/html/html_writer.hpp>
 #include <odr/internal/pdf_poppler/poppler_pdf_file.hpp>