Refactor `QPDFJob::Selection` and `Inputs`: remove `Selection::password` member …

…and replace it with a setter that directly sets `Input::password`, centralize password handling, simplify file processing, and adjust related logic in `handlePageSpecs`.

Refactor `QPDFJob::Selection` and `Inputs`: remove `Selection::password` member …
…and replace it with a setter that directly sets `Input::password`, centralize password handling, simplify file processing, and adjust related logic in `handlePageSpecs`.
m-holger
1 parent d90b4006
Showing 3 changed files with 10 additions and 18 deletions
libqpdf/QPDFJob.cc
libqpdf/QPDFJob_config.cc
libqpdf/qpdf/QPDFJob_private.hh
@@ -2405,10 +2405,6 @@ QPDFJob::Inputs::process(std::string const&amp; filename, QPDFJob::Input&amp; input)
 void
 QPDFJob::Inputs::process_all()
 {
-    for (auto& selection: selections) {
-        selection.process(*this);
-    }
-
     if (!infile_name().empty()) {
         files.erase("");
     }
@@ -2479,7 +2475,7 @@ QPDFJob::Inputs::new_selection(
     std::string const& filename, std::string const& password, std::string const& range)
 {
     auto& selection = new_selection(filename);
-    selection.password = password;
+    selection.password(password);
     selection.range = range;
 }
@@ -2501,11 +2497,13 @@ QPDFJob::Selection::filename()
 }
 void
-QPDFJob::Selection::process(QPDFJob::Inputs& in)
+QPDFJob::Selection::password(std::string password)
 {
-    if (!password.empty()) {
-        input().password = password;
+    auto& in = input();
+    if (!in.password.empty()) {
+        usage("--password already specified for this file");
     }
+    in.password = password;
 }
 // Handle all page specifications.
@@ -1025,11 +1025,7 @@ QPDFJob::PagesConfig::password(std::string const&amp; arg)
     if (config->o.m->inputs.selections.empty()) {
         usage("in --pages, --password must follow a file name");
     }
-    auto& last = config->o.m->inputs.selections.back();
-    if (!last.password.empty()) {
-        usage("--password already specified for this file");
-    }
-    last.password = arg;
+    config->o.m->inputs.selections.back().password(arg);
     return this;
 }
@@ -12,9 +12,9 @@ struct QPDFJob::Selection
 {
     Selection() = delete;
-    Selection(std::pair<const std::string, QPDFJob::Input>& entry);
+    Selection(std::pair<const std::string, Input>& entry);
-    Selection(QPDFJob::Selection const& other, int page) :
+    Selection(Selection const& other, int page) :
         in_entry(other.in_entry),
         selected_pages({page})
     {
@@ -22,11 +22,9 @@ struct QPDFJob::Selection
     QPDFJob::Input& input();
     std::string const& filename();
-
-    void process(Inputs& in);
+    void password(std::string password);
     std::pair<const std::string, QPDFJob::Input>* in_entry{nullptr};
-    std::string password;
     std::string range; // An empty range means all pages.
     std::vector<int> selected_pages;
 };