fix editing (#448)

Author: andiwand

cli/src/server.cpp

@@ -21,6 +21,7 @@ int main(int argc, char **argv) {
   DecodePreference decode_preference;
   decode_preference.engine_priority = {
       DecoderEngine::poppler, DecoderEngine::wvware, DecoderEngine::odr};
+  decode_preference.as_file_type = FileType::zip;
 
   DecodedFile decoded_file{input, decode_preference, *logger};
 

src/odr/document_element.cpp

@@ -305,6 +305,17 @@ TextStyle ListItem::style() const {
   return exists_() ? m_element->style(m_document) : TextStyle();
 }
 
+TableRow Table::first_row() const {
+  return exists_() ? TableRow(m_document, m_element->first_row(m_document))
+                   : TableRow();
+}
+
+TableColumn Table::first_column() const {
+  return exists_()
+             ? TableColumn(m_document, m_element->first_column(m_document))
+             : TableColumn();
+}
+
 ElementRange Table::columns() const {
   return exists_() ? ElementRange(ElementIterator(
                          m_document, m_element->first_column(m_document)))

src/odr/document_element.hpp

@@ -418,6 +418,9 @@ class Table final : public TypedElement<internal::abstract::Table> {
 public:
   using TypedElement::TypedElement;
 
+  [[nodiscard]] TableRow first_row() const;
+  [[nodiscard]] TableColumn first_column() const;
+
   [[nodiscard]] ElementRange columns() const;
   [[nodiscard]] ElementRange rows() const;
 

src/odr/document_path.cpp

@@ -102,8 +102,41 @@ DocumentPath DocumentPath::extract(Element element, Element root) {
   return DocumentPath(reverse);
 }
 
-Element DocumentPath::find(Element root, const DocumentPath & /*path*/) {
-  return root; // TODO
+Element DocumentPath::find(Element root, const DocumentPath &path) {
+  Element element = root;
+
+  for (const DocumentPath::Component &c : path) {
+    std::uint32_t number = 0;
+    if (const auto child = std::get_if<DocumentPath::Child>(&c)) {
+      if (!element.first_child()) {
+        throw std::invalid_argument("child not found");
+      }
+      element = element.first_child();
+      number = child->number;
+    } else if (const auto column = std::get_if<DocumentPath::Column>(&c)) {
+      if (!element.as_table().first_column()) {
+        throw std::invalid_argument("column not found");
+      }
+      element = Element(element.as_table().first_column());
+      number = column->number;
+    } else if (const auto row = std::get_if<DocumentPath::Row>(&c)) {
+      if (!element.as_table().first_row()) {
+        throw std::invalid_argument("row not found");
+      }
+      element = Element(element.as_table().first_row());
+      number = row->number;
+    } else {
+      throw std::invalid_argument("unknown component");
+    }
+    for (std::uint32_t i = 0; i < number; ++i) {
+      if (!element.next_sibling()) {
+        throw std::invalid_argument("sibling not found");
+      }
+      element = element.next_sibling();
+    }
+  }
+
+  return element;
 }
 
 DocumentPath::DocumentPath() noexcept = default;

src/odr/html.cpp

@@ -350,6 +350,13 @@ void html::edit(const Document &document, const char *diff,
   for (const auto &[key, value] : json["modifiedText"].items()) {
     auto element =
         DocumentPath::find(document.root_element(), DocumentPath(key));
+    if (!element) {
+      throw std::invalid_argument("element with path " + key + " not found");
+    }
+    if (!element.as_text()) {
+      throw std::invalid_argument("element with path " + key +
+                                  " is not a text element");
+    }
     element.as_text().set_content(value);
   }
 }

src/odr/internal/odf/odf_element.cpp

@@ -183,30 +183,57 @@ std::string Text::content(const abstract::Document *) const {
 
 void Text::set_content(const abstract::Document *, const std::string &text) {
   auto parent = m_node.parent();
-  auto old_start = m_node;
+  auto old_first = m_node;
+  auto old_last = m_last;
+  auto new_first = old_first;
+  auto new_last = m_last;
+
+  const auto insert_pcdata = [&]() {
+    auto new_node =
+        parent.insert_child_before(pugi::xml_node_type::node_pcdata, old_first);
+    if (new_first == old_first) {
+      new_first = new_node;
+    }
+    new_last = new_node;
+    return new_node;
+  };
+  const auto insert_node = [&](const char *node) {
+    auto new_node = parent.insert_child_before(node, old_first);
+    if (new_first == old_first) {
+      new_first = new_node;
+    }
+    new_last = new_node;
+    return new_node;
+  };
 
-  for (auto &&token : util::xml::tokenize_text(text)) {
+  for (const util::xml::StringToken &token : util::xml::tokenize_text(text)) {
     switch (token.type) {
     case util::xml::StringToken::Type::none:
       break;
     case util::xml::StringToken::Type::string: {
-      auto text_node = parent.insert_child_before(
-          pugi::xml_node_type::node_pcdata, old_start);
+      auto text_node = insert_pcdata();
       text_node.text().set(token.string.c_str());
     } break;
     case util::xml::StringToken::Type::spaces: {
-      auto space_node = parent.insert_child_before("text:s", old_start);
+      auto space_node = insert_node("text:s");
       space_node.prepend_attribute("text:c").set_value(token.string.size());
     } break;
     case util::xml::StringToken::Type::tabs: {
       for (std::size_t i = 0; i < token.string.size(); ++i) {
-        parent.insert_child_before("text:tab", old_start);
+        insert_node("text:tab");
       }
     } break;
     }
   }
 
-  // TODO set first and last
+  m_node = new_first;
+  m_last = new_last;
+
+  for (auto node = old_first; node != old_last.next_sibling();) {
+    auto next = node.next_sibling();
+    parent.remove_child(node);
+    node = next;
+  }
 }
 
 TextStyle Text::style(const abstract::Document *document) const {

src/odr/internal/ooxml/text/ooxml_text_element.cpp

@@ -110,36 +110,55 @@ void Text::set_content(const abstract::Document *, const std::string &text) {
   // TODO http://officeopenxml.com/WPtextSpacing.php
   // <w:t xml:space="preserve">
   // use `xml:space`
+
   auto parent = m_node.parent();
-  auto old_start = m_node;
+  auto old_first = m_node;
+  auto old_last = m_last;
+  auto new_first = old_first;
+  auto new_last = m_last;
+
+  const auto insert_node = [&](const char *node) {
+    auto new_node = parent.insert_child_before(node, old_first);
+    if (new_first == old_first) {
+      new_first = new_node;
+    }
+    new_last = new_node;
+    return new_node;
+  };
 
-  auto tokens = util::xml::tokenize_text(text);
-  for (auto &&token : tokens) {
+  for (const util::xml::StringToken &token : util::xml::tokenize_text(text)) {
     switch (token.type) {
     case util::xml::StringToken::Type::none:
       break;
     case util::xml::StringToken::Type::string: {
-      auto text_node = parent.insert_child_before("w:t", old_start);
+      auto text_node = insert_node("w:t");
       text_node.append_child(pugi::xml_node_type::node_pcdata)
           .text()
           .set(token.string.c_str());
     } break;
     case util::xml::StringToken::Type::spaces: {
-      auto text_node = parent.insert_child_before("w:t", old_start);
+      auto text_node = insert_node("w:t");
       text_node.append_attribute("xml:space").set_value("preserve");
       text_node.append_child(pugi::xml_node_type::node_pcdata)
           .text()
           .set(token.string.c_str());
     } break;
     case util::xml::StringToken::Type::tabs: {
       for (std::size_t i = 0; i < token.string.size(); ++i) {
-        parent.insert_child_before("w:tab", old_start);
+        insert_node("w:tab");
       }
     } break;
     }
   }
 
-  // TODO remove other
+  m_node = new_first;
+  m_last = new_last;
+
+  for (auto node = old_first; node != old_last.next_sibling();) {
+    auto next = node.next_sibling();
+    parent.remove_child(node);
+    node = next;
+  }
 }
 
 TextStyle Text::style(const abstract::Document *document) const {