decrypt shortcut (#427)

Author: andiwand

cli/src/meta.cpp

@@ -22,7 +22,7 @@ int main(int argc, char **argv) {
 
   if (document_file.password_encrypted() && has_password) {
     try {
-      document_file = document_file.decrypt(password).document_file();
+      document_file = document_file.decrypt(password);
     } catch (const WrongPasswordError &) {
       std::cerr << "wrong password" << std::endl;
       return 1;

src/odr/file.cpp

@@ -247,6 +247,10 @@ DocumentMeta DocumentFile::document_meta() const {
   return m_impl->document_meta();
 }
 
+DocumentFile DocumentFile::decrypt(const std::string &password) const {
+  return DecodedFile::decrypt(password).document_file();
+}
+
 Document DocumentFile::document() const { return Document(m_impl->document()); }
 
 std::shared_ptr<internal::abstract::DocumentFile> DocumentFile::impl() const {
@@ -256,6 +260,10 @@ std::shared_ptr<internal::abstract::DocumentFile> DocumentFile::impl() const {
 PdfFile::PdfFile(std::shared_ptr<internal::abstract::PdfFile> impl)
     : DecodedFile(impl), m_impl{std::move(impl)} {}
 
+PdfFile PdfFile::decrypt(const std::string &password) const {
+  return DecodedFile::decrypt(password).pdf_file();
+}
+
 std::shared_ptr<internal::abstract::PdfFile> PdfFile::impl() const {
   return m_impl;
 }

src/odr/file.hpp

@@ -262,6 +262,8 @@ class DocumentFile final : public DecodedFile {
   [[nodiscard]] DocumentType document_type() const;
   [[nodiscard]] DocumentMeta document_meta() const;
 
+  [[nodiscard]] DocumentFile decrypt(const std::string &password) const;
+
   [[nodiscard]] Document document() const;
 
   [[nodiscard]] std::shared_ptr<internal::abstract::DocumentFile> impl() const;
@@ -275,6 +277,8 @@ class PdfFile final : public DecodedFile {
 public:
   explicit PdfFile(std::shared_ptr<internal::abstract::PdfFile>);
 
+  [[nodiscard]] PdfFile decrypt(const std::string &password) const;
+
   [[nodiscard]] std::shared_ptr<internal::abstract::PdfFile> impl() const;
 
 private:

test/src/document_test.cpp

@@ -106,11 +106,8 @@ TEST(Document, edit_ods_diff) {
       R"({"modifiedText":{"/child:0/row:0/child:0/child:0/child:0":"Page 1 hi","/child:1/row:0/child:0/child:0/child:0":"Page 2 hihi","/child:2/row:0/child:0/child:0/child:0":"Page 3 hihihi","/child:3/row:0/child:0/child:0/child:0":"Page 4 hihihihi","/child:4/row:0/child:0/child:0/child:0":"Page 5 hihihihihi"}})";
   DocumentFile document_file(
       TestData::test_file_path("odr-public/ods/pages.ods"));
-  document_file =
-      document_file
-          .decrypt(
-              TestData::test_file("odr-public/ods/pages.ods").password.value())
-          .document_file();
+  document_file = document_file.decrypt(
+      TestData::test_file("odr-public/ods/pages.ods").password.value());
   Document document = document_file.document();
 
   html::edit(document, diff);