/*
- Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "wx/full_config_dialog.h"
+
#include "wx/about_dialog.h"
-#include "wx/report_problem_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/wx_util.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/screens_panel.h"
-#include "wx/kdm_timing_panel.h"
-#include "wx/kdm_output_panel.h"
+#include "wx/full_config_dialog.h"
#include "wx/job_view_dialog.h"
-#include "wx/file_dialog_wrapper.h"
+#include "wx/kdm_output_panel.h"
+#include "wx/kdm_timing_panel.h"
+#include "wx/nag_dialog.h"
#include "wx/new_dkdm_folder_dialog.h"
-#include "wx/editable_list.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/screens_panel.h"
#include "wx/static_text.h"
-#include "wx/dcpomatic_button.h"
-#include "wx/nag_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
+#include "lib/cinema.h"
+#include "lib/collator.h"
+#include "lib/compose.hpp"
+#include "lib/constants.h"
#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/screen.h"
+#include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/dkdm_wrapper.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/exceptions.h"
+#include "lib/screen.h"
#include "lib/send_kdm_email_job.h"
-#include "lib/compose.hpp"
-#include "lib/cinema.h"
-#include "lib/dkdm_wrapper.h"
-#include "lib/cross.h"
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "lib/decrypted_ecinema_kdm.h"
-#endif
#include <dcp/encrypted_kdm.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/exceptions.h>
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/dnd.h>
+#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/splash.h>
-#include <wx/filepicker.h>
+#include <wx/srchctrl.h>
+#include <wx/treectrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#ifdef __WXOSX__
#include <ApplicationServices/ApplicationServices.h>
#endif
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+#include <boost/bind/bind.hpp>
+#include <unordered_set>
#ifdef check
#undef check
#endif
+
using std::exception;
using std::list;
+using std::make_shared;
+using std::map;
+using std::pair;
+using std::shared_ptr;
using std::string;
+using std::unordered_set;
using std::vector;
-using std::pair;
-using std::map;
-using boost::shared_ptr;
using boost::bind;
using boost::optional;
using boost::ref;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
+
enum {
ID_help_report_a_problem = 1,
};
+
class DOMFrame : public wxFrame
{
public:
explicit DOMFrame (wxString const & title)
- : wxFrame (0, -1, title)
- , _config_dialog (0)
- , _job_view (0)
+ : wxFrame (nullptr, -1, title)
+ , _config_dialog (nullptr)
+ , _job_view (nullptr)
{
#if defined(DCPOMATIC_WINDOWS)
if (Config::instance()->win32_console ()) {
}
#endif
- wxMenuBar* bar = new wxMenuBar;
+ auto bar = new wxMenuBar;
setup_menu (bar);
SetMenuBar (bar);
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
*/
- wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
- wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
+ auto overall_panel = new wxPanel (this, wxID_ANY);
+ auto main_sizer = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
- wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
+ auto horizontal = new wxBoxSizer (wxHORIZONTAL);
+ auto left = new wxBoxSizer (wxVERTICAL);
+ auto right = new wxBoxSizer (wxVERTICAL);
horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 2);
horizontal->Add (right, 1, wxEXPAND);
wxFont subheading_font (*wxNORMAL_FONT);
subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
- wxStaticText* h = new StaticText (overall_panel, _("Screens"));
+ auto h = new StaticText (overall_panel, _("Screens"));
h->SetFont (subheading_font);
- left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
_screens = new ScreensPanel (overall_panel);
left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
h = new StaticText (overall_panel, S_("KDM|Timing"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+ right->Add (h);
_timing = new KDMTimingPanel (overall_panel);
right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
h = new StaticText (overall_panel, _("DKDM"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
- wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
+ 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__
+ /* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */
+ _dkdm_search->ShowCancelButton (true);
+#endif
+
+ 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_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
- wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL);
+ _dkdm->SetDropTarget(new DKDMDropTarget(this));
+ dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ 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..."));
_export_dkdm = new Button (overall_panel, _("Export..."));
dkdm_buttons->Add (_export_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
- right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+ right->Add (dkdm_sizer, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
- add_dkdm_view (Config::instance()->dkdms());
+ update_dkdm_view();
h = new StaticText (overall_panel, _("Output"));
h->SetFont (subheading_font);
- right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
- /* XXX: hard-coded non-interop here */
- _output = new KDMOutputPanel (overall_panel, false);
+ right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
+ _output = new KDMOutputPanel (overall_panel);
right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
_create = new Button (overall_panel, _("Create KDMs"));
_screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
_create->Bind (wxEVT_BUTTON, bind (&DOMFrame::create_kdms, this));
- _dkdm->Bind (wxEVT_TREE_SEL_CHANGED, boost::bind (&DOMFrame::setup_sensitivity, this));
+ _dkdm->Bind(wxEVT_TREE_SEL_CHANGED, boost::bind(&DOMFrame::dkdm_selection_changed, this));
_dkdm->Bind (wxEVT_TREE_BEGIN_DRAG, boost::bind (&DOMFrame::dkdm_begin_drag, this, _1));
_dkdm->Bind (wxEVT_TREE_END_DRAG, boost::bind (&DOMFrame::dkdm_end_drag, this, _1));
+ _dkdm->Bind(wxEVT_TREE_ITEM_EXPANDED, boost::bind(&DOMFrame::dkdm_expanded, this, _1));
+ _dkdm->Bind(wxEVT_TREE_ITEM_COLLAPSED, boost::bind(&DOMFrame::dkdm_collapsed, this, _1));
_add_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_clicked, this));
_add_dkdm_folder->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_folder_clicked, this));
_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));
setup_sensitivity ();
+
+ dcpomatic_log = make_shared<FileLog>(State::write_path("kdm.log"));
}
private:
void help_about ()
{
- AboutDialog* d = new AboutDialog (this);
- d->ShowModal ();
- d->Destroy ();
+ AboutDialog dialog(this);
+ dialog.ShowModal();
}
void help_report_a_problem ()
{
- ReportProblemDialog* 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)
{
- wxMenu* file = new wxMenu;
+ auto file = new wxMenu;
#ifdef __WXOSX__
file->Append (wxID_EXIT, _("&Exit"));
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 0 this is filled in with the wxTreeItemId of the selection */
- shared_ptr<DKDMBase> selected_dkdm (wxTreeItemId* id = 0) const
+ /** @id if not nullptr this is filled in with the wxTreeItemId of the selection */
+ shared_ptr<DKDMBase> selected_dkdm (wxTreeItemId* id = nullptr) const
{
wxArrayTreeItemIds selections;
_dkdm->GetSelections (selections);
if (id) {
*id = 0;
}
- return shared_ptr<DKDMBase> ();
+ return {};
}
if (id) {
*id = selections[0];
}
- DKDMMap::const_iterator i = _dkdm_id.find (selections[0]);
+ auto i = _dkdm_id.find (selections[0]);
if (i == _dkdm_id.end()) {
- return shared_ptr<DKDMBase> ();
+ return {};
}
return i->second;
void create_kdms ()
{
try {
- shared_ptr<DKDMBase> dkdm_base = selected_dkdm ();
+ auto dkdm_base = selected_dkdm ();
if (!dkdm_base) {
return;
}
- list<KDMWithMetadataPtr> screen_kdms;
+ list<KDMWithMetadataPtr> kdms;
string title;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- shared_ptr<ECinemaDKDM> ecinema_dkdm = boost::dynamic_pointer_cast<ECinemaDKDM> (dkdm_base);
- if (ecinema_dkdm) {
- DecryptedECinemaKDM decrypted (ecinema_dkdm->dkdm(), Config::instance()->decryption_chain()->key().get());
- title = decrypted.name ();
-
- BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
-
- if (!i->recipient) {
- continue;
- }
-
- DecryptedECinemaKDM kdm (
- decrypted.id(),
- decrypted.name(),
- decrypted.key(),
- dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
- );
-
- dcp::NameFormat::Map name_values;
- name_values['c'] = i->cinema->name;
- name_values['s'] = i->name;
-
- /* Encrypt */
- screen_kdms.push_back (
- KDMWithMetadataPtr(
- new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get()))
- )
- );
- }
+ auto dkdm = std::dynamic_pointer_cast<DKDM>(dkdm_base);
+ 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 ();
}
-#endif
- shared_ptr<DKDM> dkdm = boost::dynamic_pointer_cast<DKDM> (dkdm_base);
- if (dkdm) {
+ vector<KDMCertificatePeriod> period_checks;
- /* Decrypt the DKDM */
- dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get());
- title = decrypted.content_title_text ();
+ 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()
+ );
- /* This is the signer for our new KDMs */
- shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
- if (!signer->valid ()) {
- throw InvalidSignerError ();
+ /* Add keys from the DKDM */
+ for (auto const& j: decrypted.keys()) {
+ kdm.add_key(j);
}
- BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
-
- if (!i->recipient) {
- continue;
- }
-
- /* Make an empty KDM */
- dcp::DecryptedKDM kdm (
- dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- decrypted.annotation_text().get_value_or (""),
- decrypted.content_title_text(),
- dcp::LocalTime().as_string()
- );
-
- /* Add keys from the DKDM */
- BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) {
- kdm.add_key (j);
- }
-
- dcp::NameFormat::Map name_values;
- name_values['c'] = i->cinema->name;
- name_values['s'] = i->name;
-
- /* Encrypt */
- screen_kdms.push_back (
- KDMWithMetadataPtr(
- new DCPKDMWithMetadata(
- name_values,
- i->cinema,
- kdm.encrypt(
- signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
- !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
- )
- )
- )
- );
+ 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 (screen_kdms.empty()) {
+ if (kdms.empty()) {
return;
}
- pair<shared_ptr<Job>, int> result = _output->make (
- screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
+ 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)
);
if (result.first) {
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) {
_output->setup_sensitivity ();
wxArrayTreeItemIds sel;
_dkdm->GetSelections (sel);
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
- shared_ptr<DKDM> dkdm = dynamic_pointer_cast<DKDM>(selected_dkdm());
- _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0);
+ 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);
_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();
+ setup_sensitivity();
+ }
+
+ void dkdm_expanded(wxTreeEvent& ev)
+ {
+ if (_ignore_expand) {
+ return;
+ }
+
+ auto iter = _dkdm_id.find(ev.GetItem());
+ if (iter != _dkdm_id.end()) {
+ _expanded_dkdm_groups.insert(iter->second);
+ }
+ }
+
+ void dkdm_collapsed(wxTreeEvent& ev)
+ {
+ auto iter = _dkdm_id.find(ev.GetItem());
+ if (iter != _dkdm_id.end()) {
+ _expanded_dkdm_groups.erase(iter->second);
+ }
+ }
+
void dkdm_begin_drag (wxTreeEvent& ev)
{
ev.Allow ();
void dkdm_end_drag (wxTreeEvent& ev)
{
- DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ());
- DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ());
+ auto from = _dkdm_id.find (_dkdm->GetSelection ());
+ auto to = _dkdm_id.find (ev.GetItem ());
if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) {
return;
}
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (to->second);
+ auto group = dynamic_pointer_cast<DKDMGroup> (to->second);
if (!group) {
group = to->second->parent();
}
DCPOMATIC_ASSERT (from->second->parent ());
from->second->parent()->remove (from->second);
- add_dkdm_model (from->second, group, dynamic_pointer_cast<DKDM>(to->second));
+ add_dkdm(from->second, group, dynamic_pointer_cast<DKDM>(to->second));
- _dkdm->Delete (from->first);
- _dkdm_id.erase (from->first);
- add_dkdm_view (from->second, dynamic_pointer_cast<DKDM>(to->second) ? to->first : optional<wxTreeItemId>());
+ update_dkdm_view();
}
void add_dkdm_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file"));
- if (d->ShowModal() == wxID_OK) {
- shared_ptr<const dcp::CertificateChain> chain = Config::instance()->decryption_chain();
- DCPOMATIC_ASSERT (chain->key());
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- try {
- cxml::Document test_doc;
- string const xml_string = dcp::file_to_string (wx_to_std(d->GetPath()), MAX_KDM_SIZE);
- test_doc.read_string (xml_string);
- if (test_doc.root_name() == "ECinemaSecurityMessage") {
- EncryptedECinemaKDM ekdm(xml_string);
- /* Decrypt the DKDM to make sure that we can */
- DecryptedECinemaKDM dkdm(ekdm, chain->key().get());
-
- shared_ptr<DKDMBase> new_dkdm(new ECinemaDKDM(ekdm));
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
- if (!group) {
- group = Config::instance()->dkdms();
- }
- add_dkdm_model (new_dkdm, group);
- add_dkdm_view (new_dkdm);
- d->Destroy ();
- return;
- }
- } catch (KDMError& e) {
- error_dialog (
- this, "Could not read file as a KDM. Perhaps it is badly formatted, created with the wrong certificate, or not a KDM at all.",
- std_to_wx(e.what())
- );
- d->Destroy ();
- return;
- } 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())
- );
- d->Destroy ();
- return;
- }
-#endif
+ FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
+ if (!dialog.show()) {
+ return;
+ }
- try {
- dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE));
- /* Decrypt the DKDM to make sure that we can */
- dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
+ for (auto path: dialog.paths()) {
+ add_dkdm(path);
+ }
+ }
- shared_ptr<DKDMBase> new_dkdm(new DKDM(ekdm));
- shared_ptr<DKDMGroup> group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm ());
- if (!group) {
- group = Config::instance()->dkdms ();
- }
- add_dkdm_model (new_dkdm, group);
- add_dkdm_view (new_dkdm);
- } 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())
- );
+ void add_dkdm(boost::filesystem::path path)
+ {
+ auto chain = Config::instance()->decryption_chain();
+ DCPOMATIC_ASSERT (chain->key());
+
+ 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())
+ );
}
- d->Destroy ();
+
+ update_dkdm_view();
}
void add_dkdm_folder_clicked ()
{
- NewDKDMFolderDialog* d = new NewDKDMFolderDialog (this);
- if (d->ShowModal() == wxID_OK) {
- shared_ptr<DKDMBase> new_dkdm (new DKDMGroup (wx_to_std (d->get ())));
- shared_ptr<DKDMGroup> parent = dynamic_pointer_cast<DKDMGroup> (selected_dkdm ());
- if (!parent) {
- parent = Config::instance()->dkdms ();
+ 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 ();
+ }
+ add_dkdm(new_dkdm, parent);
+ update_dkdm_view();
+ }
+
+ void update_dkdm_view()
+ {
+ _dkdm->DeleteAllItems();
+ _dkdm_id.clear();
+ add_dkdm_to_view(Config::instance()->dkdms());
+ if (_selected_dkdm) {
+ auto selection_in_id_map = std::find_if(_dkdm_id.begin(), _dkdm_id.end(), [this](pair<wxTreeItemId, shared_ptr<DKDMBase>> const& entry) {
+ return entry.second == _selected_dkdm;
+ });
+ if (selection_in_id_map != _dkdm_id.end()) {
+ _dkdm->SelectItem(selection_in_id_map->first);
}
- add_dkdm_model (new_dkdm, parent);
- add_dkdm_view (new_dkdm);
}
- d->Destroy ();
}
- /** @param dkdm Thing to add.
- * @param parent Parent group, or 0.
- */
- void add_dkdm_view (shared_ptr<DKDMBase> base, optional<wxTreeItemId> previous = optional<wxTreeItemId>())
+ /** @return true if this thing or any of its children match a search string */
+ bool matches(shared_ptr<DKDMBase> base, string const& search)
+ {
+ if (search.empty()) {
+ return true;
+ }
+
+ auto name = base->name();
+ transform(name.begin(), name.end(), name.begin(), ::tolower);
+ if (name.find(search) != string::npos) {
+ return true;
+ }
+
+ auto group = dynamic_pointer_cast<DKDMGroup>(base);
+ if (!group) {
+ return false;
+ }
+
+ auto const children = group->children();
+ return std::any_of(children.begin(), children.end(), [this, search](shared_ptr<DKDMBase> child) {
+ return matches(child, search);
+ });
+ }
+
+ /** Add DKDMs to the view that match the current search */
+ void add_dkdm_to_view(shared_ptr<DKDMBase> base)
{
+ auto search = wx_to_std(_dkdm_search->GetValue());
+ transform(search.begin(), search.end(), search.begin(), ::tolower);
+
+ optional<wxTreeItemId> group_to_expand;
+
if (!base->parent()) {
/* This is the root group */
_dkdm_id[_dkdm->AddRoot("root")] = base;
} else {
/* Add base to the view */
wxTreeItemId added;
- if (previous) {
- added = _dkdm->InsertItem(dkdm_to_id(base->parent()), *previous, std_to_wx(base->name()));
- } else {
- added = _dkdm->AppendItem(dkdm_to_id(base->parent()), std_to_wx(base->name()));
+ auto parent_id = dkdm_to_id(base->parent());
+ added = _dkdm->AppendItem(parent_id, std_to_wx(base->name()));
+ /* Expand the group (later) if it matches the search or it was manually expanded */
+ if (!search.empty() || _expanded_dkdm_groups.find(base) != _expanded_dkdm_groups.end()) {
+ group_to_expand = added;
}
_dkdm_id[added] = base;
}
/* Add children */
- shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (base);
- if (g) {
- BOOST_FOREACH (shared_ptr<DKDMBase> i, g->children()) {
- add_dkdm_view (i);
+ auto group = dynamic_pointer_cast<DKDMGroup>(base);
+ if (group) {
+ auto children = group->children();
+ children.sort(
+ [this](shared_ptr<DKDMBase> a, shared_ptr<DKDMBase> b) { return _collator.compare(a->name(), b->name()) < 0; }
+ );
+
+ for (auto i: children) {
+ if (matches(i, search)) {
+ add_dkdm_to_view(i);
+ }
}
}
+
+ if (group_to_expand) {
+ _ignore_expand = true;
+ _dkdm->Expand(*group_to_expand);
+ _ignore_expand = false;
+ }
}
/** @param group Group to add dkdm to */
- void add_dkdm_model (shared_ptr<DKDMBase> dkdm, shared_ptr<DKDMGroup> group, shared_ptr<DKDM> previous = shared_ptr<DKDM> ())
+ void add_dkdm(shared_ptr<DKDMBase> dkdm, shared_ptr<DKDMGroup> group, shared_ptr<DKDM> previous = shared_ptr<DKDM>())
{
group->add (dkdm, previous);
/* We're messing with a Config-owned object here, so tell it that something has changed.
wxTreeItemId dkdm_to_id (shared_ptr<DKDMBase> dkdm)
{
- for (DKDMMap::iterator i = _dkdm_id.begin(); i != _dkdm_id.end(); ++i) {
- if (i->second == dkdm) {
- return i->first;
+ for (auto const& i: _dkdm_id) {
+ if (i.second == dkdm) {
+ return i.first;
}
}
DCPOMATIC_ASSERT (false);
void remove_dkdm_clicked ()
{
- shared_ptr<DKDMBase> removed = selected_dkdm ();
+ auto removed = selected_dkdm ();
if (!removed) {
return;
}
}
_dkdm->Delete (dkdm_to_id (removed));
- shared_ptr<DKDMGroup> dkdms = Config::instance()->dkdms ();
+ auto dkdms = Config::instance()->dkdms ();
dkdms->remove (removed);
Config::instance()->changed ();
}
void export_dkdm_clicked ()
{
- shared_ptr<DKDMBase> removed = selected_dkdm ();
+ auto removed = selected_dkdm ();
if (!removed) {
return;
}
- shared_ptr<DKDM> dkdm = dynamic_pointer_cast<DKDM>(removed);
+ auto dkdm = dynamic_pointer_cast<DKDM>(removed);
if (!dkdm) {
return;
}
- wxFileDialog* 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()
+ {
+ update_dkdm_view();
}
wxPreferencesEditor* _config_dialog;
ScreensPanel* _screens;
KDMTimingPanel* _timing;
wxTreeCtrl* _dkdm;
- typedef std::map<wxTreeItemId, boost::shared_ptr<DKDMBase> > DKDMMap;
+ wxSearchCtrl* _dkdm_search;
+ typedef std::map<wxTreeItemId, std::shared_ptr<DKDMBase>> DKDMMap;
DKDMMap _dkdm_id;
+ /* Keep a separate track of the selected DKDM so that when a search happens, and some things
+ * get removed from the view, we can restore the selection when they are re-added.
+ */
+ shared_ptr<DKDMBase> _selected_dkdm;
+ /* Keep expanded groups for the same reason */
+ unordered_set<shared_ptr<DKDMBase>> _expanded_dkdm_groups;
+ /* true if we are "artificially" expanding a group because it contains something found
+ * in a search.
+ */
+ bool _ignore_expand = false;
wxButton* _add_dkdm;
wxButton* _add_dkdm_folder;
wxButton* _remove_dkdm;
wxButton* _create;
KDMOutputPanel* _output;
JobViewDialog* _job_view;
+ Collator _collator;
};
+
/** @class App
* @brief The magic App class for wxWidgets.
*/
public:
App ()
: wxApp ()
- , _frame (0)
+ , _frame (nullptr)
{}
private:
- bool OnInit ()
+ bool OnInit () override
{
- wxSplashScreen* splash = 0;
+ wxSplashScreen* splash;
try {
wxInitAllImageHandlers ();
- Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1));
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
splash = maybe_show_splash ();
unsetenv ("UBUNTU_MENUPROXY");
#endif
-#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+ make_foreground_application ();
#endif
dcpomatic_setup_path_encoding ();
_frame->Maximize ();
if (splash) {
splash->Destroy ();
- splash = 0;
+ splash = nullptr;
}
_frame->Show ();
}
/* An unhandled exception has occurred inside the main event loop */
- bool OnExceptionInMainLoop ()
+ bool OnExceptionInMainLoop () override
{
try {
throw;
);
} catch (exception& e) {
error_dialog (
- 0,
+ nullptr,
wxString::Format (
_("An exception occurred: %s.\n\n") + " " + REPORT_PROBLEM,
- std_to_wx (e.what ())
+ std_to_wx(e.what())
)
);
} catch (...) {
return false;
}
- void OnUnhandledException ()
+ void OnUnhandledException () override
{
- error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
+ error_dialog (nullptr, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
}
void idle ()
signal_manager->ui_idle ();
}
- void config_failed_to_load ()
+ void config_failed_to_load(Config::LoadFailure what)
{
- message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ report_config_load_failure(_frame, what);
}
void config_warning (string m)
{
- message_dialog (_frame, std_to_wx (m));
+ message_dialog (_frame, std_to_wx(m));
}
DOMFrame* _frame;
projects / dcpomatic.git / blobdiff