#include "wx/about_dialog.h"
#include "wx/dcpomatic_button.h"
#include "wx/editable_list.h"
+#include "wx/file_dialog.h"
#include "wx/file_picker_ctrl.h"
#include "wx/full_config_dialog.h"
#include "wx/job_view_dialog.h"
#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/scope_guard.h"
#include "lib/screen.h"
#include "lib/send_kdm_email_job.h"
#include <dcp/encrypted_kdm.h>
#include <dcp/exceptions.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
+#include <wx/dnd.h>
#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/splash.h>
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__
right->Add(_dkdm_search, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ class DKDMDropTarget : public wxFileDropTarget
+ {
+ public:
+ DKDMDropTarget(DOMFrame* frame)
+ : _frame(frame)
+ {}
+
+ bool OnDropFiles(wxCoord, wxCoord, wxArrayString const& filenames) override
+ {
+ for (size_t i = 0; i < filenames.GetCount(); ++i) {
+ _frame->add_dkdm(boost::filesystem::path(wx_to_std(filenames[0])));
+ }
+
+ return true;
+ }
+
+ private:
+ DOMFrame* _frame;
+ };
+
auto dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
_dkdm = new wxTreeCtrl (
overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
);
+ _dkdm->SetDropTarget(new DKDMDropTarget(this));
dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
- wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL);
+ auto dkdm_buttons = new wxBoxSizer(wxVERTICAL);
_add_dkdm = new Button (overall_panel, _("Add..."));
dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
_add_dkdm_folder = new Button (overall_panel, _("Add folder..."));
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);
void help_about ()
{
- auto d = new AboutDialog (this);
- d->ShowModal ();
- d->Destroy ();
+ AboutDialog dialog(this);
+ dialog.ShowModal();
}
void help_report_a_problem ()
{
- auto d = new ReportProblemDialog (this, shared_ptr<Film>());
- if (d->ShowModal () == wxID_OK) {
- d->report ();
+ ReportProblemDialog dialog(this, shared_ptr<Film>());
+ if (dialog.ShowModal() == wxID_OK) {
+ dialog.report();
}
- d->Destroy ();
}
void setup_menu (wxMenuBar* m)
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 */
string title;
auto dkdm = std::dynamic_pointer_cast<DKDM>(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<KDMCertificatePeriod> period_checks;
- /* This is the signer for our new KDMs */
- auto signer = Config::instance()->signer_chain ();
- if (!signer->valid ()) {
- throw InvalidSignerError ();
+ 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(""),
+ 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<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);
}
}
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)
);
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) {
void add_dkdm_clicked ()
{
- auto d = new wxFileDialog(
- this,
- _("Select DKDM file"),
- wxEmptyString,
- wxEmptyString,
- wxT("XML files|*.xml|All files|*.*"),
- wxFD_MULTIPLE
- );
-
- ScopeGuard sg = [d]() { d->Destroy(); };
-
- if (d->ShowModal() != wxID_OK) {
+ FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
+ if (!dialog.show()) {
return;
}
+ for (auto path: dialog.paths()) {
+ add_dkdm(path);
+ }
+ }
+
+ void add_dkdm(boost::filesystem::path path)
+ {
auto chain = Config::instance()->decryption_chain();
DCPOMATIC_ASSERT (chain->key());
- wxArrayString paths;
- d->GetPaths(paths);
- for (unsigned int i = 0; i < paths.GetCount(); ++i) {
- try {
- dcp::EncryptedKDM ekdm(dcp::file_to_string(wx_to_std(paths[i]), MAX_KDM_SIZE));
- /* Decrypt the DKDM to make sure that we can */
- dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
-
- auto new_dkdm = make_shared<DKDM>(ekdm);
- auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
- if (!group) {
- group = Config::instance()->dkdms ();
- }
- add_dkdm(new_dkdm, group);
- } catch (dcp::KDMFormatError& e) {
- error_dialog (
- this,
- _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all."),
- std_to_wx(e.what())
- );
- return;
- } catch (dcp::KDMDecryptionError &) {
- error_dialog (
- this,
- _("Could not decrypt the DKDM. Perhaps it was not created with the correct certificate.")
- );
- } catch (dcp::MiscError& e) {
- error_dialog (
- this,
- _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."),
- std_to_wx(e.what())
- );
+ try {
+ dcp::EncryptedKDM ekdm(dcp::file_to_string(path, MAX_KDM_SIZE));
+ /* Decrypt the DKDM to make sure that we can */
+ dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
+
+ auto new_dkdm = make_shared<DKDM>(ekdm);
+ auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
+ if (!group) {
+ group = Config::instance()->dkdms ();
}
+ add_dkdm(new_dkdm, group);
+ } catch (dcp::KDMFormatError& e) {
+ error_dialog (
+ this,
+ _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all."),
+ std_to_wx(e.what())
+ );
+ return;
+ } catch (dcp::KDMDecryptionError &) {
+ error_dialog (
+ this,
+ _("Could not decrypt the DKDM. Perhaps it was not created with the correct certificate.")
+ );
+ } catch (dcp::MiscError& e) {
+ error_dialog (
+ this,
+ _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."),
+ std_to_wx(e.what())
+ );
}
+
update_dkdm_view();
}
void add_dkdm_folder_clicked ()
{
- auto d = new NewDKDMFolderDialog (this);
- if (d->ShowModal() == wxID_OK) {
- auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(d->get()));
- auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
- if (!parent) {
- parent = Config::instance()->dkdms ();
- }
- add_dkdm(new_dkdm, parent);
- update_dkdm_view();
+ NewDKDMFolderDialog dialog(this);
+ if (dialog.ShowModal() != wxID_OK) {
+ return;
+ }
+
+ auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(dialog.get()));
+ auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
+ if (!parent) {
+ parent = Config::instance()->dkdms ();
}
- d->Destroy ();
+ add_dkdm(new_dkdm, parent);
+ update_dkdm_view();
}
void update_dkdm_view()
return;
}
- auto d = new wxFileDialog (
+ 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()));
}
- d->Destroy ();
}
void dkdm_search_changed()
bool OnInit () override
{
- wxSplashScreen* splash = nullptr;
+ wxSplashScreen* splash;
try {
wxInitAllImageHandlers ();
projects / dcpomatic.git / blobdiff