#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"
#include <dcp/encrypted_kdm.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/exceptions.h>
+#include <dcp/filesystem.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/dnd.h>
#endif
+using std::dynamic_pointer_cast;
using std::exception;
using std::list;
using std::make_shared;
using boost::bind;
using boost::optional;
using boost::ref;
-using std::dynamic_pointer_cast;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
enum {
- ID_help_report_a_problem = 1,
+ ID_help_report_a_problem = DCPOMATIC_MAIN_MENU,
};
_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 ();
#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"));
bool confirm_overwrite (boost::filesystem::path path)
{
- if (boost::filesystem::is_directory(path)) {
+ 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())
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 = [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<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;
+ };
- 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<int>() : 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 (
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) {
_dkdm->GetSelections (sel);
auto group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
auto dkdm = dynamic_pointer_cast<DKDM>(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);
}
void dkdm_selection_changed()
{
_selected_dkdm = selected_dkdm();
+ if (_selected_dkdm) {
+ auto dkdm = std::dynamic_pointer_cast<DKDM>(_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();
}
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 ());
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 ();
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));
bool OnInit () override
{
- wx_ptr<wxSplashScreen> splash;
+ wxSplashScreen* splash;
try {
wxInitAllImageHandlers ();
projects / dcpomatic.git / blobdiff