X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=d76a2735902d97923466f8ce1bac34b7ad391b1e;hp=a36c82024dfdf01740a14ae5ac7f7a73e8e2bd38;hb=910ea473219f2e7c672ad437d458316deca67025;hpb=532e7faa6ab37681999d1cbb0e9f8b6978198622 diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index a36c82024..d76a27359 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-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -19,9 +19,18 @@ */ #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 "kdm_advanced_dialog.h" #include "name_format_editor.h" +#include "check_box.h" +#include "dcpomatic_button.h" +#include #include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" @@ -30,39 +39,50 @@ #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) + , _forensic_mark_video (true) + , _forensic_mark_audio (true) + , _forensic_mark_audio_up_to (12) { wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); add_label_to_sizer (table, this, _("KDM type"), true); + + wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL); _type = new wxChoice (this, wxID_ANY); _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); + _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_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)); } - table->Add (_type, 1, wxEXPAND); + type->Add (_type, 1, wxEXPAND); _type->SetSelection (0); + wxButton* advanced = new Button (this, _("Advanced...")); + type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL); + table->Add (type, 1, wxEXPAND); - { - int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; - wxString t = _("Filename format"); -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; - t += wxT (":"); -#endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, t); - table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); - } + add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); + _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); + table->Add (_container_name_format->panel(), 1, wxEXPAND); + add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); dcp::NameFormat::Map titles; - titles['f'] = "film name"; - titles['c'] = "cinema"; - titles['s'] = "screen"; - titles['b'] = "from date/time"; - titles['e'] = "to date/time"; + titles['f'] = wx_to_std (_("film name")); + titles['c'] = wx_to_std (_("cinema")); + titles['s'] = wx_to_std (_("screen")); + titles['b'] = wx_to_std (_("from date/time")); + titles['e'] = wx_to_std (_("to date/time")); dcp::NameFormat::Map ex; ex['f'] = "Bambi"; ex['c'] = "Lumière"; @@ -72,7 +92,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); table->Add (_filename_format->panel(), 1, wxEXPAND); - _write_to = new wxCheckBox (this, wxID_ANY, _("Write to")); + _write_to = new CheckBox (this, _("Write to")); table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER @@ -90,14 +110,40 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) table->Add (_folder, 1, wxEXPAND); - _email = new wxCheckBox (this, wxID_ANY, _("Send by email")); + wxSizer* write_options = new wxBoxSizer(wxVERTICAL); + _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + write_options->Add (_write_flat); + _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs")); + write_options->Add (_write_folder); + _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); + write_options->Add (_write_zip); + table->AddSpacer (0); + table->Add (write_options); + + _email = new CheckBox (this, _("Send by email")); table->Add (_email, 1, wxEXPAND); table->AddSpacer (0); + switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { + case Config::KDM_WRITE_FLAT: + _write_flat->SetValue (true); + break; + case Config::KDM_WRITE_FOLDER: + _write_folder->SetValue (true); + break; + case Config::KDM_WRITE_ZIP: + _write_zip->SetValue (true); + break; + } + _write_to->SetValue (true); - _write_to->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); - _email->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_to->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _email->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + _write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); SetSizer (table); } @@ -105,25 +151,151 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) void KDMOutputPanel::setup_sensitivity () { - _folder->Enable (_write_to->GetValue ()); + bool const write = _write_to->GetValue (); + _folder->Enable (write); + _write_flat->Enable (write); + _write_folder->Enable (write); + _write_zip->Enable (write); } -boost::filesystem::path -KDMOutputPanel::directory () const +void +KDMOutputPanel::advanced_clicked () { - return wx_to_std (_folder->GetPath ()); + KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to); + d->ShowModal (); + _forensic_mark_video = d->forensic_mark_video (); + _forensic_mark_audio = d->forensic_mark_audio (); + _forensic_mark_audio_up_to = d->forensic_mark_audio_up_to (); + d->Destroy (); } -bool -KDMOutputPanel::write_to () const +void +KDMOutputPanel::kdm_write_type_changed () { - return _write_to->GetValue (); + if (_write_flat->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FLAT); + } else if (_write_folder->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FOLDER); + } else if (_write_zip->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_ZIP); + } } -bool -KDMOutputPanel::email () const +pair, int> +KDMOutputPanel::make ( + list > screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite + ) { - return _email->GetValue (); + list const cinema_kdms = CinemaKDMs::collect (screen_kdms); + + /* Decide whether to proceed */ + + bool proceed = true; + + if (_email->GetValue ()) { + + if (Config::instance()->mail_server().empty ()) { + proceed = false; + error_dialog (this, _("You must set up a mail server in Preferences before you can send emails.")); + } + + bool cinemas_with_no_email = false; + BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { + if (i.cinema->emails.empty ()) { + cinemas_with_no_email = true; + } + } + + if (proceed && cinemas_with_no_email && !confirm_dialog ( + this, + _("You have selected some cinemas that have no configured email address. Do you want to continue?") + )) { + proceed = false; + } + + if (proceed && Config::instance()->confirm_kdm_email ()) { + list emails; + BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { + BOOST_FOREACH (string j, i.cinema->emails) { + emails.push_back (j); + } + } + + if (!emails.empty ()) { + ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails); + if (d->ShowModal() == wxID_CANCEL) { + proceed = false; + } + } + } + } + + if (!proceed) { + return make_pair (shared_ptr(), 0); + } + + 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(false, false); + name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false); + + if (_write_to->GetValue()) { + if (_write_flat->GetValue()) { + written = ScreenKDM::write_files ( + screen_kdms, + directory(), + _filename_format->get(), + name_values, + confirm_overwrite + ); + } else if (_write_folder->GetValue()) { + written = CinemaKDMs::write_directories ( + CinemaKDMs::collect (screen_kdms), + directory(), + _container_name_format->get(), + _filename_format->get(), + name_values, + confirm_overwrite + ); + } else if (_write_zip->GetValue()) { + written = CinemaKDMs::write_zip_files ( + CinemaKDMs::collect (screen_kdms), + directory(), + _container_name_format->get(), + _filename_format->get(), + name_values, + confirm_overwrite + ); + } + } + + if (_email->GetValue ()) { + job.reset ( + new SendKDMEmailJob ( + cinema_kdms, + _container_name_format->get(), + _filename_format->get(), + name_values, + name + ) + ); + } + + } catch (dcp::NotEncryptedError& e) { + error_dialog (this, _("CPL's content is not encrypted.")); + } catch (exception& e) { + error_dialog (this, std_to_wx(e.what())); + } catch (...) { + error_dialog (this, _("An unknown exception occurred.")); + } + + return make_pair (job, written); } dcp::Formulation @@ -132,14 +304,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 ()); -} - -dcp::NameFormat -KDMOutputPanel::name_format () const +boost::filesystem::path +KDMOutputPanel::directory () const { - return _filename_format->get (); + return wx_to_std (_folder->GetPath ()); }