X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=b9d71d27338ddf6ee8cd39c93b5d01c1f36768b0;hp=673c54f7839ea0b4122875ae0c980f6b7567fd63;hb=6ebec6b3ca11a7062ae19176096b1b157275d015;hpb=963c7649da903b87637975e8c2d634da887d3109 diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 673c54f78..b9d71d273 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -33,7 +33,6 @@ #include "wx/report_problem_dialog.h" #include "wx/screens_panel.h" #include "wx/static_text.h" -#include "wx/wx_ptr.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "lib/cinema.h" @@ -47,6 +46,7 @@ #include "lib/exceptions.h" #include "lib/file_log.h" #include "lib/job_manager.h" +#include "lib/kdm_util.h" #include "lib/kdm_with_metadata.h" #include "lib/screen.h" #include "lib/send_kdm_email_job.h" @@ -166,7 +166,7 @@ public: h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ @@ -218,7 +218,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); @@ -266,15 +266,15 @@ private: void help_about () { - auto d = make_wx(this); - d->ShowModal (); + AboutDialog dialog(this); + dialog.ShowModal(); } void help_report_a_problem () { - auto d = make_wx(this, shared_ptr()); - if (d->ShowModal () == wxID_OK) { - d->report (); + ReportProblemDialog dialog(this, shared_ptr()); + if (dialog.ShowModal() == wxID_OK) { + dialog.report(); } } @@ -312,10 +312,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 (boost::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 */ @@ -354,56 +361,55 @@ private: string title; auto dkdm = std::dynamic_pointer_cast(dkdm_base); - if (dkdm) { + if (!dkdm) { + return; + } + + /* Decrypt the DKDM */ + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + title = decrypted.content_title_text (); + + /* This is the signer for our new KDMs */ + auto signer = Config::instance()->signer_chain (); + if (!signer->valid ()) { + throw InvalidSignerError (); + } - /* Decrypt the DKDM */ - dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); - title = decrypted.content_title_text (); + vector period_checks; - /* This is the signer for our new KDMs */ - auto signer = Config::instance()->signer_chain (); - if (!signer->valid ()) { - throw InvalidSignerError (); + std::function 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(""), + title, + dcp::LocalTime().as_string() + ); + + /* Add keys from the DKDM */ + for (auto const& j: decrypted.keys()) { + kdm.add_key(j); } - 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())); - - /* Make an empty KDM */ - dcp::DecryptedKDM kdm ( - begin, - end, - 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); - } - - 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; + }; + + 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() : 0, + period_checks + ); + + if (kdm) { + kdms.push_back(kdm); } } @@ -411,6 +417,21 @@ private: return; } + 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.") + ); + 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.") + ); + } + auto result = _output->make ( kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); @@ -433,6 +454,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) { @@ -510,12 +538,12 @@ private: void add_dkdm_clicked () { - auto dialog = make_wx(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); - if (!dialog->show()) { + FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); + if (!dialog.show()) { return; } - for (auto path: dialog->paths()) { + for (auto path: dialog.paths()) { add_dkdm(path); } } @@ -561,12 +589,12 @@ private: void add_dkdm_folder_clicked () { - auto d = make_wx(this); - if (d->ShowModal() != wxID_OK) { + NewDKDMFolderDialog dialog(this); + if (dialog.ShowModal() != wxID_OK) { return; } - auto new_dkdm = make_shared(wx_to_std(d->get())); + auto new_dkdm = make_shared(wx_to_std(dialog.get())); auto parent = dynamic_pointer_cast(selected_dkdm()); if (!parent) { parent = Config::instance()->dkdms (); @@ -712,13 +740,13 @@ private: return; } - auto d = make_wx( + wxFileDialog dialog( this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); - if (d->ShowModal() == wxID_OK) { - dkdm->dkdm().as_xml(wx_to_std(d->GetPath())); + if (dialog.ShowModal() == wxID_OK) { + dkdm->dkdm().as_xml(wx_to_std(dialog.GetPath())); } } @@ -770,7 +798,7 @@ private: bool OnInit () override { - wx_ptr splash; + wxSplashScreen* splash; try { wxInitAllImageHandlers ();