X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=c6845f7bd3085eb44e7b484f3ebc9ccdfd92e04c;hb=ccc8409dceedcf71872b2846b9b4a4dea9042bda;hp=e2510c929f5730838b33f892dbbb5ecbc70050e6;hpb=7bdd09c815a8f4ddbb70c9fe3c55fa10b67bc641;p=dcpomatic.git diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index e2510c929..c6845f7bd 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -19,9 +19,15 @@ */ #include "lib/config.h" +#include "lib/cinema.h" +#include "lib/cinema_kdms.h" +#include "lib/send_kdm_email_job.h" #include "kdm_output_panel.h" +#include "kdm_timing_panel.h" +#include "confirm_kdm_email_dialog.h" #include "wx_util.h" #include "name_format_editor.h" +#include #include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" @@ -30,6 +36,14 @@ #endif #include +using std::pair; +using std::string; +using std::list; +using std::exception; +using std::make_pair; +using boost::shared_ptr; +using boost::function; + KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) : wxPanel (parent, wxID_ANY) { @@ -38,6 +52,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) add_label_to_sizer (table, this, _("KDM type"), true); _type = new wxChoice (this, wxID_ANY); _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); + _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST)); if (!interop) { _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC)); @@ -46,7 +61,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _type->SetSelection (0); { - int flags = wxALIGN_TOP | wxTOP | wxLEFT; + int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; wxString t = _("Filename format"); #ifdef __WXOSX__ flags |= wxALIGN_RIGHT; @@ -56,17 +71,22 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); } - _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format()); - NameFormat::Map ex; - ex["film_name"] = "Bambi"; - ex["cinema"] = "Lumière"; - ex["screen"] = "Screen 1"; - ex["from"] = "2012/03/15 12:30"; - ex["to"] = "2012/03/22 02:30"; - _filename_format->set_example (ex); + dcp::NameFormat::Map titles; + titles['f'] = "film name"; + titles['c'] = "cinema"; + titles['s'] = "screen"; + titles['b'] = "from date/time"; + titles['e'] = "to date/time"; + dcp::NameFormat::Map ex; + ex['f'] = "Bambi"; + ex['c'] = "Lumière"; + ex['s'] = "Screen 1"; + ex['b'] = "2012/03/15 12:30"; + ex['e'] = "2012/03/22 02:30"; + _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); table->Add (_filename_format->panel(), 1, wxEXPAND); - _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); + _write_to = new wxCheckBox (this, wxID_ANY, _("Write to")); table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER @@ -75,18 +95,23 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif - _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + boost::optional path = Config::instance()->default_kdm_directory (); + if (path) { + _folder->SetPath (std_to_wx (path->string ())); + } else { + _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + } table->Add (_folder, 1, wxEXPAND); - _email = new wxRadioButton (this, wxID_ANY, _("Send by email")); + _email = new wxCheckBox (this, wxID_ANY, _("Send by email")); table->Add (_email, 1, wxEXPAND); table->AddSpacer (0); _write_to->SetValue (true); - _write_to->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); - _email->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_to->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _email->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); SetSizer (table); } @@ -97,16 +122,73 @@ KDMOutputPanel::setup_sensitivity () _folder->Enable (_write_to->GetValue ()); } -boost::filesystem::path -KDMOutputPanel::directory () const +pair, int> +KDMOutputPanel::make ( + list screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite, shared_ptr log + ) { - return wx_to_std (_folder->GetPath ()); -} + Config::instance()->set_kdm_filename_format (_filename_format->get ()); + + int written = 0; + shared_ptr job; + + try { + dcp::NameFormat::Map name_values; + name_values['f'] = name; + name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(); + name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(); + + if (_write_to->GetValue ()) { + written = ScreenKDM::write_files ( + screen_kdms, + directory(), + _filename_format->get(), + name_values, + confirm_overwrite + ); + } + + if (_email->GetValue ()) { + + list const cinema_kdms = CinemaKDMs::collect (screen_kdms); + + bool ok = true; + + if (Config::instance()->confirm_kdm_email ()) { + list emails; + BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { + BOOST_FOREACH (string j, i.cinema->emails) { + emails.push_back (j); + } + } + + ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails); + if (d->ShowModal() == wxID_CANCEL) { + ok = false; + } + } + + if (ok) { + job.reset ( + new SendKDMEmailJob ( + cinema_kdms, + _filename_format->get(), + name_values, + name, + log + ) + ); + } + } + } catch (dcp::NotEncryptedError& e) { + error_dialog (this, _("CPL's content is not encrypted.")); + } catch (exception& e) { + error_dialog (this, e.what ()); + } catch (...) { + error_dialog (this, _("An unknown exception occurred.")); + } -bool -KDMOutputPanel::write_to () const -{ - return _write_to->GetValue (); + return make_pair (job, written); } dcp::Formulation @@ -115,14 +197,8 @@ KDMOutputPanel::formulation () const return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); } -void -KDMOutputPanel::save_kdm_name_format () const -{ - Config::instance()->set_kdm_filename_format (name_format ()); -} - -KDMNameFormat -KDMOutputPanel::name_format () const +boost::filesystem::path +KDMOutputPanel::directory () const { - return _filename_format->get (); + return wx_to_std (_folder->GetPath ()); }