X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=9adef0ab016ec42a228a2f28900bd30a606dfd54;hb=HEAD;hp=9d6fa2e8f21df8ffd44a05944d657f2bf2d643e9;hpb=788ef2cf5daf510651cc4f5eb7940d7bd0c44b76;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 9d6fa2e8f..9adef0ab0 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -22,6 +22,8 @@ #include "wx/about_dialog.h" #include "wx/dcpomatic_button.h" #include "wx/editable_list.h" +#include "wx/id.h" +#include "wx/invalid_certificate_period_dialog.h" #include "wx/file_dialog.h" #include "wx/file_picker_ctrl.h" #include "wx/full_config_dialog.h" @@ -53,6 +55,7 @@ #include #include #include +#include #include LIBDCP_DISABLE_WARNINGS #include @@ -74,6 +77,7 @@ LIBDCP_ENABLE_WARNINGS #endif +using std::dynamic_pointer_cast; using std::exception; using std::list; using std::make_shared; @@ -86,7 +90,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 @@ -94,7 +97,7 @@ using namespace dcpomatic; enum { - ID_help_report_a_problem = 1, + ID_help_report_a_problem = DCPOMATIC_MAIN_MENU, }; @@ -243,6 +246,8 @@ public: _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this)); _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this)); _dkdm_search->Bind(wxEVT_TEXT, boost::bind(&DOMFrame::dkdm_search_changed, this)); + _timing->TimingChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this)); + _output->MethodChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this)); setup_sensitivity (); @@ -289,7 +294,7 @@ private: #endif #ifdef __WXOSX__ - file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,")); #else wxMenu* edit = new wxMenu; edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); @@ -312,10 +317,17 @@ private: bool confirm_overwrite (boost::filesystem::path path) { - return confirm_dialog ( - this, - wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) - ); + if (dcp::filesystem::is_directory(path)) { + return confirm_dialog ( + this, + wxString::Format(_("Folder %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); + } else { + return confirm_dialog ( + this, + wxString::Format(_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); + } } /** @id if not nullptr this is filled in with the wxTreeItemId of the selection */ @@ -370,65 +382,56 @@ private: vector 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 make_kdm = [this, decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) { /* Make an empty KDM */ dcp::DecryptedKDM kdm ( begin, end, - decrypted.annotation_text().get_value_or (""), + _output->annotation_text(), 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() : 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(name_values, i->cinema.get(), i->cinema->emails, encrypted)); - } + return kdm; + }; - if (kdms.empty()) { - return; - } + for (auto i: _screens->screens()) { - if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OUTSIDE_CERTIFICATE) != period_checks.end()) { - error_dialog( - this, - _("Some KDMs would have validity periods which are completely outside the recipient certificate periods. Such KDMs are very unlikely to work, so will not be created.") + auto kdm = kdm_for_screen( + make_kdm, + i, + _timing->from(), + _timing->until(), + _output->formulation(), + !_output->forensic_mark_video(), + _output->forensic_mark_audio() ? boost::optional() : 0, + period_checks ); + + if (kdm) { + kdms.push_back(kdm); + } + } + + if (kdms.empty()) { return; } - if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE) != period_checks.end()) { - message_dialog( - this, - _("For some of these KDMs the recipient certificate's validity period will not cover the whole of the KDM validity period. This might cause problems with the KDMs.") - ); + if ( + find_if( + period_checks.begin(), + period_checks.end(), + [](KDMCertificatePeriod const& p) { return p.overlap != KDMCertificateOverlap::KDM_WITHIN_CERTIFICATE; } + ) != period_checks.end()) { + InvalidCertificatePeriodDialog dialog(this, period_checks); + if (dialog.ShowModal() == wxID_CANCEL) { + return; + } } auto result = _output->make ( @@ -453,6 +456,13 @@ private: wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data()) ); } + } catch (dcp::BadKDMDateError& e) { + 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 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) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -470,7 +480,7 @@ private: _dkdm->GetSelections (sel); auto group = dynamic_pointer_cast(selected_dkdm()); auto dkdm = dynamic_pointer_cast(selected_dkdm()); - _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0 && dkdm); + _create->Enable(!_screens->screens().empty() && _timing->valid() && sel.GetCount() > 0 && dkdm && _output->method_selected()); _remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root")); _export_dkdm->Enable (sel.GetCount() > 0 && dkdm); } @@ -478,6 +488,17 @@ private: void dkdm_selection_changed() { _selected_dkdm = selected_dkdm(); + if (_selected_dkdm) { + auto dkdm = std::dynamic_pointer_cast(_selected_dkdm); + if (dkdm) { + try { + dcp::DecryptedKDM decrypted(dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + if (decrypted.annotation_text()) { + _output->set_annotation_text(*decrypted.annotation_text()); + } + } catch (...) {} + } + } setup_sensitivity(); } @@ -519,6 +540,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 ()); @@ -551,6 +581,15 @@ private: dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); auto new_dkdm = make_shared(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 (selected_dkdm()); if (!group) { group = Config::instance()->dkdms (); @@ -706,12 +745,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)); @@ -790,7 +831,7 @@ private: bool OnInit () override { - wx_ptr splash; + wxSplashScreen* splash; try { wxInitAllImageHandlers ();