X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=30f2e0b827f9b3b999a5897c66b9fe76d7a2aee0;hb=6cf33e764f10f94efaf507f3c5ee53f9c04194ba;hp=874573ce282582d0cc82fcf118f901d12d9f942e;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 874573ce2..30f2e0b82 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2019 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,60 +18,64 @@ */ -#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_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/compose.hpp" #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_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" +#include "lib/util.h" #include #include #include -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS -#include +#include +LIBDCP_DISABLE_WARNINGS +#include #include #include -#include -DCPOMATIC_ENABLE_WARNINGS +#include +#include +LIBDCP_ENABLE_WARNINGS #ifdef __WXOSX__ #include #endif #include -#include #ifdef check #undef check #endif + using std::exception; using std::list; -using std::string; -using std::vector; -using std::pair; +using std::make_shared; using std::map; +using std::pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; using boost::optional; using boost::ref; @@ -81,17 +85,19 @@ 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 ()) { @@ -113,7 +119,7 @@ public: } #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -125,12 +131,12 @@ public: /* 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); @@ -138,23 +144,23 @@ public: 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_SIZER_Y_GAP * 2); + 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 ); @@ -175,9 +181,8 @@ public: 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_SIZER_Y_GAP * 2); + _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new Button (overall_panel, _("Create KDMs")); @@ -200,6 +205,8 @@ public: _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this)); setup_sensitivity (); + + dcpomatic_log = make_shared(State::write_path("kdm.log")); } private: @@ -219,14 +226,14 @@ private: void help_about () { - AboutDialog* d = new AboutDialog (this); + auto d = new AboutDialog (this); d->ShowModal (); d->Destroy (); } void help_report_a_problem () { - ReportProblemDialog* d = new ReportProblemDialog (this, shared_ptr ()); + auto d = new ReportProblemDialog (this, shared_ptr()); if (d->ShowModal () == wxID_OK) { d->report (); } @@ -235,7 +242,7 @@ private: void setup_menu (wxMenuBar* m) { - wxMenu* file = new wxMenu; + auto file = new wxMenu; #ifdef __WXOSX__ file->Append (wxID_EXIT, _("&Exit")); @@ -289,7 +296,7 @@ private: *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 (); } @@ -300,7 +307,7 @@ private: void create_kdms () { try { - shared_ptr dkdm_base = selected_dkdm (); + auto dkdm_base = selected_dkdm (); if (!dkdm_base) { return; } @@ -308,7 +315,7 @@ private: list kdms; string title; - shared_ptr dkdm = std::dynamic_pointer_cast (dkdm_base); + auto dkdm = std::dynamic_pointer_cast(dkdm_base); if (dkdm) { /* Decrypt the DKDM */ @@ -316,12 +323,12 @@ private: title = decrypted.content_title_text (); /* This is the signer for our new KDMs */ - shared_ptr signer = Config::instance()->signer_chain (); + auto signer = Config::instance()->signer_chain (); if (!signer->valid ()) { throw InvalidSignerError (); } - BOOST_FOREACH (shared_ptr i, _screens->screens()) { + for (auto i: _screens->screens()) { if (!i->recipient) { continue; @@ -335,16 +342,16 @@ private: begin, end, decrypted.annotation_text().get_value_or (""), - decrypted.content_title_text(), + title, dcp::LocalTime().as_string() ); /* Add keys from the DKDM */ - BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) { + for (auto const& j: decrypted.keys()) { kdm.add_key (j); } - dcp::EncryptedKDM const encrypted = kdm.encrypt( + 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 ); @@ -358,11 +365,7 @@ private: name_values['i'] = encrypted.cpl_id (); /* Encrypt */ - kdms.push_back ( - KDMWithMetadataPtr( - new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, encrypted) - ) - ); + kdms.push_back (make_shared(name_values, i->cinema.get(), i->cinema->emails, encrypted)); } } @@ -370,7 +373,7 @@ private: return; } - pair, int> result = _output->make ( + auto result = _output->make ( kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); @@ -407,9 +410,9 @@ private: _output->setup_sensitivity (); wxArrayTreeItemIds sel; _dkdm->GetSelections (sel); - shared_ptr group = dynamic_pointer_cast(selected_dkdm()); - shared_ptr dkdm = dynamic_pointer_cast(selected_dkdm()); - _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0); + auto group = dynamic_pointer_cast(selected_dkdm()); + auto dkdm = dynamic_pointer_cast(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); } @@ -421,13 +424,13 @@ private: 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 group = dynamic_pointer_cast (to->second); + auto group = dynamic_pointer_cast (to->second); if (!group) { group = to->second->parent(); } @@ -445,41 +448,53 @@ private: void add_dkdm_clicked () { - wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); + auto d = new wxFileDialog( + this, + _("Select DKDM file"), + wxEmptyString, + wxEmptyString, + wxT("XML files|*.xml|All files|*.*"), + wxFD_MULTIPLE + ); + if (d->ShowModal() == wxID_OK) { - shared_ptr chain = Config::instance()->decryption_chain(); + auto chain = Config::instance()->decryption_chain(); DCPOMATIC_ASSERT (chain->key()); - 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()); - - shared_ptr new_dkdm(new DKDM(ekdm)); - shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); - if (!group) { - group = Config::instance()->dkdms (); + 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(ekdm); + auto group = dynamic_pointer_cast (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()) + ); } - 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()) - ); } } d->Destroy (); @@ -487,10 +502,10 @@ private: void add_dkdm_folder_clicked () { - NewDKDMFolderDialog* d = new NewDKDMFolderDialog (this); + auto d = new NewDKDMFolderDialog (this); if (d->ShowModal() == wxID_OK) { - shared_ptr new_dkdm (new DKDMGroup (wx_to_std (d->get ()))); - shared_ptr parent = dynamic_pointer_cast (selected_dkdm ()); + auto new_dkdm = make_shared(wx_to_std(d->get())); + auto parent = dynamic_pointer_cast(selected_dkdm()); if (!parent) { parent = Config::instance()->dkdms (); } @@ -520,9 +535,9 @@ private: } /* Add children */ - shared_ptr g = dynamic_pointer_cast (base); + auto g = dynamic_pointer_cast(base); if (g) { - BOOST_FOREACH (shared_ptr i, g->children()) { + for (auto i: g->children()) { add_dkdm_view (i); } } @@ -540,9 +555,9 @@ private: wxTreeItemId dkdm_to_id (shared_ptr 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); @@ -550,7 +565,7 @@ private: void remove_dkdm_clicked () { - shared_ptr removed = selected_dkdm (); + auto removed = selected_dkdm (); if (!removed) { return; } @@ -564,24 +579,24 @@ private: } _dkdm->Delete (dkdm_to_id (removed)); - shared_ptr dkdms = Config::instance()->dkdms (); + auto dkdms = Config::instance()->dkdms (); dkdms->remove (removed); Config::instance()->changed (); } void export_dkdm_clicked () { - shared_ptr removed = selected_dkdm (); + auto removed = selected_dkdm (); if (!removed) { return; } - shared_ptr dkdm = dynamic_pointer_cast(removed); + auto dkdm = dynamic_pointer_cast(removed); if (!dkdm) { return; } - wxFileDialog* d = new wxFileDialog ( + auto d = new wxFileDialog ( this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); @@ -596,7 +611,7 @@ private: ScreensPanel* _screens; KDMTimingPanel* _timing; wxTreeCtrl* _dkdm; - typedef std::map > DKDMMap; + typedef std::map> DKDMMap; DKDMMap _dkdm_id; wxButton* _add_dkdm; wxButton* _add_dkdm_folder; @@ -607,6 +622,7 @@ private: JobViewDialog* _job_view; }; + /** @class App * @brief The magic App class for wxWidgets. */ @@ -615,14 +631,14 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) + , _frame (nullptr) {} private: - bool OnInit () + bool OnInit () override { - wxSplashScreen* splash = 0; + wxSplashScreen* splash = nullptr; try { wxInitAllImageHandlers (); @@ -671,7 +687,7 @@ private: _frame->Maximize (); if (splash) { splash->Destroy (); - splash = 0; + splash = nullptr; } _frame->Show (); @@ -690,7 +706,7 @@ private: } /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { try { throw; @@ -705,10 +721,10 @@ private: ); } 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 (...) { @@ -719,9 +735,9 @@ private: 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 () @@ -736,7 +752,7 @@ private: void config_warning (string m) { - message_dialog (_frame, std_to_wx (m)); + message_dialog (_frame, std_to_wx(m)); } DOMFrame* _frame;