X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=3547d0f59209ba6cafbe261ca3bc4423eeb761a0;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=fc4282535664e2b00d54777e7b12aa7709485f74;hpb=006e38346a8bcdcc889979b7c00802d9bb8fc6f8;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index fc4282535..3547d0f59 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -38,9 +38,8 @@ #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" @@ -49,15 +48,17 @@ #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 @@ -69,11 +70,14 @@ 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 { @@ -299,57 +303,74 @@ private: if (!dkdm_base) { return; } - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); - if (!dkdm) { - return; - } - /* Decrypt the DKDM */ - dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + list kdms; + string title; - /* This is the signer for our new KDMs */ - shared_ptr signer = Config::instance()->signer_chain (); - if (!signer->valid ()) { - throw InvalidSignerError (); - } + shared_ptr dkdm = std::dynamic_pointer_cast (dkdm_base); + if (dkdm) { - list > screen_kdms; - BOOST_FOREACH (shared_ptr i, _screens->screens()) { + /* Decrypt the DKDM */ + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + title = decrypted.content_title_text (); - if (!i->recipient) { - continue; + /* This is the signer for our new KDMs */ + shared_ptr signer = Config::instance()->signer_chain (); + if (!signer->valid ()) { + throw InvalidSignerError (); } - /* 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); + 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 ( + begin, + end, + decrypted.annotation_text().get_value_or (""), + decrypted.content_title_text(), + dcp::LocalTime().as_string() + ); + + /* Add keys from the DKDM */ + for (auto const& j: decrypted.keys()) { + kdm.add_key (j); + } + + dcp::EncryptedKDM 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 */ + kdms.push_back ( + KDMWithMetadataPtr( + new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, encrypted) + ) + ); } + } - /* 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 - ) - ) - ) - ); + if (kdms.empty()) { + return; } pair, int> result = _output->make ( - screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1) + kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -425,16 +446,15 @@ private: { wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); if (d->ShowModal() == wxID_OK) { - shared_ptr new_dkdm; + shared_ptr 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 */ - shared_ptr chain = Config::instance()->decryption_chain(); - DCPOMATIC_ASSERT (chain->key()); dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); - new_dkdm.reset(new DKDM(ekdm)); + shared_ptr new_dkdm(new DKDM(ekdm)); shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); if (!group) { group = Config::instance()->dkdms (); @@ -501,7 +521,7 @@ private: /* Add children */ shared_ptr g = dynamic_pointer_cast (base); if (g) { - BOOST_FOREACH (shared_ptr i, g->children()) { + for (auto i: g->children()) { add_dkdm_view (i); } } @@ -575,7 +595,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; @@ -621,10 +641,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 ();