Don't show warning when only removing an empty DKDM folder (#2541).

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 0d79d67a88245c02f75420bc0e485b5ad2b0e3f5..6628c2b3f6734def9a9908fe6de7e9a0da2254ab 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -74,6 +74,7 @@ LIBDCP_ENABLE_WARNINGS
 #endif
 
 
+using std::dynamic_pointer_cast;
 using std::exception;
 using std::list;
 using std::make_shared;
@@ -86,7 +87,6 @@ using std::vector;
 using boost::bind;
 using boost::optional;
 using boost::ref;
-using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -377,46 +377,40 @@ private:
 
                        vector<KDMCertificatePeriod> period_checks;
 
-                       for (auto i: _screens->screens()) {
-
-                               if (!i->recipient) {
-                                       continue;
-                               }
-
-                               dcp::LocalTime begin(_timing->from(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
-                               dcp::LocalTime end(_timing->until(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
-
-                               period_checks.push_back(check_kdm_and_certificate_validity_periods(*i->recipient, begin, end));
-
+                       std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) {
                                /* Make an empty KDM */
                                dcp::DecryptedKDM kdm (
                                        begin,
                                        end,
-                                       decrypted.annotation_text().get_value_or (""),
+                                       decrypted.annotation_text().get_value_or(""),
                                        title,
                                        dcp::LocalTime().as_string()
                                        );
 
                                /* Add keys from the DKDM */
                                for (auto const& j: decrypted.keys()) {
-                                       kdm.add_key (j);
+                                       kdm.add_key(j);
                                }
 
-                               auto const encrypted = kdm.encrypt(
-                                               signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
-                                               !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
-                                               );
-
-                               dcp::NameFormat::Map name_values;
-                               name_values['c'] = i->cinema->name;
-                               name_values['s'] = i->name;
-                               name_values['f'] = title;
-                               name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-                               name_values['e'] = end.date() + " " + end.time_of_day(true, false);
-                               name_values['i'] = encrypted.cpl_id ();
-
-                               /* Encrypt */
-                               kdms.push_back (make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema->emails, encrypted));
+                               return kdm;
+                       };
+
+                       for (auto i: _screens->screens()) {
+
+                               auto kdm = kdm_for_screen(
+                                       make_kdm,
+                                       i,
+                                       _timing->from(),
+                                       _timing->until(),
+                                       _output->formulation(),
+                                       !_output->forensic_mark_video(),
+                                       _output->forensic_mark_audio() ? boost::optional<int>() : 0,
+                                       period_checks
+                                       );
+
+                               if (kdm) {
+                                       kdms.push_back(kdm);
+                               }
                        }
 
                        if (kdms.empty()) {
@@ -464,7 +458,7 @@ private:
                        if (e.starts_too_early()) {
                                error_dialog(this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
                        } else {
-                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
                        }
                        return;
                } catch (dcp::NotEncryptedError& e) {
@@ -533,6 +527,15 @@ private:
                        group = to->second->parent();
                }
 
+               /* Check we're not adding a group to one of its children */
+               auto to_parent = group;
+               while (to_parent) {
+                       if (from->second == to_parent) {
+                               return;
+                       }
+                       to_parent = to_parent->parent();
+               }
+
                DCPOMATIC_ASSERT (group);
                DCPOMATIC_ASSERT (from->second->parent ());
 
@@ -565,6 +568,15 @@ private:
                        dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
 
                        auto new_dkdm = make_shared<DKDM>(ekdm);
+
+                       if (Config::instance()->dkdms()->contains(new_dkdm->dkdm().id())) {
+                               error_dialog(
+                                       this,
+                                       wxString::Format(_("DKDM %s is already in the DKDM list and will not be added again."), std_to_wx(new_dkdm->dkdm().id()))
+                                       );
+                               return;
+                       }
+
                        auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
                        if (!group) {
                                group = Config::instance()->dkdms ();
@@ -720,12 +732,14 @@ private:
                        return;
                }
 
-               if (NagDialog::maybe_nag (
-                           this, Config::NAG_DELETE_DKDM,
-                           _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
-                             "Are you sure?"),
-                           true)) {
-                       return;
+               if (removed->contains_dkdm()) {
+                       if (NagDialog::maybe_nag(
+                                   this, Config::NAG_DELETE_DKDM,
+                                   _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
+                                     "Are you sure?"),
+                                   true)) {
+                               return;
+                       }
                }
 
                _dkdm->Delete (dkdm_to_id (removed));
@@ -804,7 +818,7 @@ private:
 
        bool OnInit () override
        {
-               wx_ptr<wxSplashScreen> splash;
+               wxSplashScreen* splash;
 
                try {
                        wxInitAllImageHandlers ();