X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=ee5e454579bfda8812f6b2e324437dd5a4c59401;hp=9f1c28c990f9992f1a42a297313bb5a557c27fb2;hb=e573f4fa173608dcb7ca23f543b49d5be26a8226;hpb=2199f765aca8727da11dd0f33f7dfc59e39bf455 diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 9f1c28c99..ee5e45457 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,6 +18,7 @@ */ + #include "wx/full_config_dialog.h" #include "wx/about_dialog.h" #include "wx/report_problem_dialog.h" @@ -38,58 +39,62 @@ #include "lib/util.h" #include "lib/screen.h" #include "lib/job_manager.h" -#include "lib/screen_kdm.h" +#include "lib/kdm_with_metadata.h" #include "lib/exceptions.h" -#include "lib/cinema_kdms.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 #include #include +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS #ifdef __WXOSX__ #include #endif -#include -#include +#include #ifdef check #undef check #endif + using std::exception; using std::list; using std::string; using std::vector; using std::pair; using std::map; -using boost::shared_ptr; +using std::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) + , _config_dialog (nullptr) + , _job_view (nullptr) { #if defined(DCPOMATIC_WINDOWS) if (Config::instance()->win32_console ()) { @@ -111,7 +116,7 @@ public: } #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -123,12 +128,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); @@ -136,23 +141,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 ); @@ -173,7 +178,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); /* XXX: hard-coded non-interop here */ _output = new KDMOutputPanel (overall_panel, false); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); @@ -217,14 +222,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 (); } @@ -233,7 +238,7 @@ private: void setup_menu (wxMenuBar* m) { - wxMenu* file = new wxMenu; + auto file = new wxMenu; #ifdef __WXOSX__ file->Append (wxID_EXIT, _("&Exit")); @@ -287,7 +292,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 (); } @@ -298,39 +303,15 @@ private: void create_kdms () { try { - shared_ptr dkdm_base = selected_dkdm (); + auto dkdm_base = selected_dkdm (); if (!dkdm_base) { return; } - list > screen_kdms; + list kdms; string title; -#ifdef DCPOMATIC_VARIANT_SWAROOP - shared_ptr ecinema_dkdm = boost::dynamic_pointer_cast (dkdm_base); - if (ecinema_dkdm) { - DecryptedECinemaKDM decrypted (ecinema_dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); - title = decrypted.name (); - - BOOST_FOREACH (shared_ptr i, _screens->screens()) { - - if (!i->recipient) { - continue; - } - - DecryptedECinemaKDM kdm (decrypted.id(), decrypted.name(), decrypted.key()); - - /* Encrypt */ - screen_kdms.push_back ( - shared_ptr( - new ECinemaScreenKDM(i, kdm.encrypt(i->recipient.get())) - ) - ); - } - } -#endif - - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); + auto dkdm = std::dynamic_pointer_cast(dkdm_base); if (dkdm) { /* Decrypt the DKDM */ @@ -338,52 +319,62 @@ 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; } + dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + /* 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()), + begin, + end, 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()) { + 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 */ - screen_kdms.push_back ( - shared_ptr( - new DCPScreenKDM( - i, - kdm.encrypt( - signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), - !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 - ) - ) + kdms.push_back ( + KDMWithMetadataPtr( + new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, encrypted) ) ); } } - if (screen_kdms.empty()) { + if (kdms.empty()) { return; } - pair, int> result = _output->make ( - screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1) + auto result = _output->make ( + kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -433,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(); } @@ -457,56 +448,18 @@ private: void add_dkdm_clicked () { - wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); + auto d = new wxFileDialog (this, _("Select DKDM file")); if (d->ShowModal() == wxID_OK) { - shared_ptr chain = Config::instance()->decryption_chain(); + auto 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 new_dkdm(new ECinemaDKDM(ekdm)); - shared_ptr group = dynamic_pointer_cast (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 - 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 ()); + auto group = dynamic_pointer_cast (selected_dkdm ()); if (!group) { group = Config::instance()->dkdms (); } @@ -537,10 +490,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 parent = dynamic_pointer_cast (selected_dkdm ()); if (!parent) { parent = Config::instance()->dkdms (); } @@ -570,9 +523,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); } } @@ -590,9 +543,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); @@ -600,7 +553,7 @@ private: void remove_dkdm_clicked () { - shared_ptr removed = selected_dkdm (); + auto removed = selected_dkdm (); if (!removed) { return; } @@ -614,24 +567,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 ); @@ -646,7 +599,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; @@ -672,7 +625,7 @@ private: bool OnInit () { - wxSplashScreen* splash = 0; + wxSplashScreen* splash = nullptr; try { wxInitAllImageHandlers (); @@ -692,10 +645,8 @@ private: unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #endif dcpomatic_setup_path_encoding ();