X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=369d8a25f082f0ba2ef576328ee8bcea61a7d985;hb=5cf687959afd75b0251b87d742b1594f6a8a7991;hp=49e561c657327ae701bfe6367598fc8c235286cd;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4;p=dcpomatic.git diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 49e561c65..369d8a25f 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. @@ -18,55 +18,99 @@ */ -#include "lib/config.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 "lib/config.h" +#include "lib/cinema.h" +#include "lib/send_kdm_email_job.h" +#include "lib/warnings.h" +#include #include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #endif +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS + + +using std::exception; +using std::function; +using std::list; +using std::make_pair; +using std::make_shared; +using std::pair; +using std::shared_ptr; +using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + -KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) +KDMOutputPanel::KDMOutputPanel (wxWindow* parent) : 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); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol (1); - add_label_to_sizer (table, this, _("KDM type"), true); + add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + + auto type = new wxBoxSizer (wxHORIZONTAL); _type = new wxChoice (this, wxID_ANY); - _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); - if (!interop) { - _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); - _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC)); - } - table->Add (_type, 1, wxEXPAND); + _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1)); + _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY)); + _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC)); + _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1)); + _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST)); + type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); _type->SetSelection (0); + auto advanced = new Button (this, _("Advanced...")); + type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); - { - int flags = wxALIGN_TOP | wxTOP; - 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_CENTER_VERTICAL | 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); - _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); + auto format = create_label (this, _("Filename format"), true); + auto align = new wxBoxSizer (wxHORIZONTAL); +#ifdef DCPOMATIC_OSX + align->Add (format, 0, wxTOP, 2); + table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2); + table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif + dcp::NameFormat::Map titles; + 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"; + 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 CheckBox (this, _("Write to")); table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER @@ -75,18 +119,49 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif - _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + auto 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")); + auto 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, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs")); + write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); + write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + 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_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_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); } @@ -94,35 +169,152 @@ 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 ()); + auto 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); + } } -dcp::Formulation -KDMOutputPanel::formulation () const +pair, int> +KDMOutputPanel::make ( + list kdms, string name, function confirm_overwrite + ) { - return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); + auto const cinema_kdms = collect (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; + for (auto i: cinema_kdms) { + if (i.front()->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; + for (auto const& i: cinema_kdms) { + for (auto j: i.front()->emails()) { + emails.push_back (j); + } + } + + if (!emails.empty ()) { + auto d = new ConfirmKDMEmailDialog (this, emails); + if (d->ShowModal() == wxID_CANCEL) { + proceed = false; + } + d->Destroy (); + } + } + } + + if (!proceed) { + return make_pair (shared_ptr(), 0); + } + + Config::instance()->set_kdm_filename_format (_filename_format->get ()); + + int written = 0; + shared_ptr job; + + try { + + if (_write_to->GetValue()) { + if (_write_flat->GetValue()) { + written = write_files ( + kdms, + directory(), + _filename_format->get(), + confirm_overwrite + ); + } else if (_write_folder->GetValue()) { + written = write_directories ( + collect (kdms), + directory(), + _container_name_format->get(), + _filename_format->get(), + confirm_overwrite + ); + } else if (_write_zip->GetValue()) { + written = write_zip_files ( + collect (kdms), + directory(), + _container_name_format->get(), + _filename_format->get(), + confirm_overwrite + ); + } + } + + if (_email->GetValue ()) { + job = make_shared( + cinema_kdms, + _container_name_format->get(), + _filename_format->get(), + 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); } -void -KDMOutputPanel::save_kdm_name_format () const +dcp::Formulation +KDMOutputPanel::formulation () const { - Config::instance()->set_kdm_filename_format (name_format ()); + return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); } -KDMNameFormat -KDMOutputPanel::name_format () const +boost::filesystem::path +KDMOutputPanel::directory () const { - return _filename_format->get (); + return wx_to_std (_folder->GetPath ()); }