X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=95ed07769e94b07d90d0340df3587ab4c19fe40b;hb=ba049fdab4a47023d6d5ee8b5ff9bbb710afbabb;hp=4b0685d4136db3cf2617fbb12c8b2669b8077941;hpb=e2a17243c3a7047bb02ef2c7dddc5c71efc8181e;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 4b0685d41..95ed07769 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2017 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,6 +28,9 @@ #include "wx/kdm_timing_panel.h" #include "wx/kdm_output_panel.h" #include "wx/job_view_dialog.h" +#include "wx/file_dialog_wrapper.h" +#include "wx/new_dkdm_folder_dialog.h" +#include "wx/editable_list.h" #include "lib/config.h" #include "lib/util.h" #include "lib/screen.h" @@ -35,6 +39,9 @@ #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 #include #include @@ -54,29 +61,55 @@ using std::exception; using std::list; using std::string; +using std::vector; +using std::pair; +using std::map; using boost::shared_ptr; using boost::bind; +using boost::optional; +using boost::ref; +using boost::dynamic_pointer_cast; enum { - ID_help_report_a_problem, + ID_help_report_a_problem = 1, }; class DOMFrame : public wxFrame { public: DOMFrame (wxString const & title) - : wxFrame (NULL, -1, title) + : wxFrame (0, -1, title) , _config_dialog (0) , _job_view (0) { +#if defined(DCPOMATIC_WINDOWS) + if (Config::instance()->win32_console ()) { + AllocConsole(); + + HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); + int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); + FILE* hf_out = _fdopen(hCrt, "w"); + setvbuf(hf_out, NULL, _IONBF, 1); + *stdout = *hf_out; + + HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); + hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); + FILE* hf_in = _fdopen(hCrt, "r"); + setvbuf(hf_in, NULL, _IONBF, 128); + *stdin = *hf_in; + + std::cout << "DCP-o-matic KDM creator is starting." << "\n"; + } +#endif + wxMenuBar* bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. @@ -84,60 +117,73 @@ public: wxPanel* overall_panel = new wxPanel (this, wxID_ANY); wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL); + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + + horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 2); + horizontal->Add (right, 1, wxEXPAND); wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); + left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (overall_panel); - vertical->Add (_screens, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); - vertical->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - wxSizer* dkdm = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - add_label_to_sizer (dkdm, overall_panel, _("DKDM file"), true); - _dkdm = new FilePickerCtrl (overall_panel, _("Select a DKDM XML file..."), "*.xml"); - dkdm->Add (_dkdm, 1, wxEXPAND); - add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true); - _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT("")); - dkdm->Add (_annotation_text, 1, wxEXPAND); - add_label_to_sizer (dkdm, overall_panel, _("Content title"), true); - _content_title_text = new wxStaticText (overall_panel, wxID_ANY, wxT("")); - dkdm->Add (_content_title_text, 1, wxEXPAND); - add_label_to_sizer (dkdm, overall_panel, _("Issue date"), true); - _issue_date = new wxStaticText (overall_panel, wxID_ANY, wxT("")); - dkdm->Add (_issue_date, 1, wxEXPAND); - vertical->Add (dkdm, 0, wxALL, DCPOMATIC_SIZER_X_GAP); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL); + _dkdm = new wxTreeCtrl ( + overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT + ); + dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL); + _add_dkdm = new wxButton (overall_panel, wxID_ANY, _("Add...")); + dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + _add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder...")); + dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + _remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("Remove")); + dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + + add_dkdm_view (Config::instance()->dkdms()); h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); /* XXX: hard-coded non-interop here */ _output = new KDMOutputPanel (overall_panel, false); - vertical->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs")); - vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); + right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); - main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER); + main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); overall_panel->SetSizer (main_sizer); /* Instantly save any config changes when using a DCP-o-matic GUI */ Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ())); _screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this)); - _dkdm->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, bind (&DOMFrame::dkdm_changed, this)); - _create->Bind (wxEVT_COMMAND_BUTTON_CLICKED, bind (&DOMFrame::create_kdms, this)); + _create->Bind (wxEVT_BUTTON, bind (&DOMFrame::create_kdms, this)); + _dkdm->Bind (wxEVT_TREE_SEL_CHANGED, boost::bind (&DOMFrame::setup_sensitivity, this)); + _dkdm->Bind (wxEVT_TREE_BEGIN_DRAG, boost::bind (&DOMFrame::dkdm_begin_drag, this, _1)); + _dkdm->Bind (wxEVT_TREE_END_DRAG, boost::bind (&DOMFrame::dkdm_end_drag, this, _1)); + _add_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_clicked, this)); + _add_dkdm_folder->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_folder_clicked, this)); + _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this)); setup_sensitivity (); } @@ -205,41 +251,52 @@ private: m->Append (help, _("&Help")); } - void dkdm_changed () + bool confirm_overwrite (boost::filesystem::path path) { - if (_dkdm->GetPath().IsEmpty()) { - return; + return confirm_dialog ( + this, + wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); + } + + /** @id if not 0 this is filled in with the wxTreeItemId of the selection */ + shared_ptr selected_dkdm (wxTreeItemId* id = 0) const + { + wxArrayTreeItemIds selections; + _dkdm->GetSelections (selections); + if (selections.GetCount() != 1) { + if (id) { + *id = 0; + } + return shared_ptr (); } - try { - dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath()))); - dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get()); - _annotation_text->Enable (true); - _annotation_text->SetLabel (std_to_wx (decrypted.annotation_text ())); - _content_title_text->Enable (true); - _content_title_text->SetLabel (std_to_wx (decrypted.content_title_text ())); - _issue_date->Enable (true); - _issue_date->SetLabel (std_to_wx (decrypted.issue_date ())); - } catch (exception& e) { - error_dialog (this, wxString::Format (_("Could not load DKDM (%s)"), std_to_wx (e.what()).data())); - _dkdm->SetPath (wxT("")); - _annotation_text->SetLabel (wxT("")); - _annotation_text->Enable (false); - _content_title_text->SetLabel (wxT("")); - _content_title_text->Enable (false); - _issue_date->SetLabel (wxT("")); - _issue_date->Enable (false); + if (id) { + *id = selections[0]; } - setup_sensitivity (); + DKDMMap::const_iterator i = _dkdm_id.find (selections[0]); + if (i == _dkdm_id.end()) { + return shared_ptr (); + } + + return i->second; } void create_kdms () { try { + shared_ptr dkdm_base = selected_dkdm (); + if (!dkdm_base) { + return; + } + shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); + if (!dkdm) { + return; + } + /* Decrypt the DKDM */ - dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath()))); - dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get()); + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); /* This is the signer for our new KDMs */ shared_ptr signer = Config::instance()->signer_chain (); @@ -250,13 +307,17 @@ private: list screen_kdms; BOOST_FOREACH (shared_ptr i, _screens->screens()) { - if (!i->certificate) { + if (!i->recipient) { continue; } /* Make an empty KDM */ dcp::DecryptedKDM kdm ( - _timing->from(), _timing->until(), decrypted.annotation_text(), decrypted.content_title_text(), dcp::LocalTime().as_string() + 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 */ @@ -265,37 +326,31 @@ private: } /* Encrypt */ - screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->certificate.get(), _output->formulation()))); + screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); } - if (_output->write_to()) { - ScreenKDM::write_files (decrypted.content_title_text(), screen_kdms, _output->directory()); - /* XXX: proper plural form support in wxWidgets? */ - wxString s = screen_kdms.size() == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s"); - message_dialog ( - this, - wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data()) - ); - } else { - string film_name = decrypted.annotation_text (); - if (film_name.empty ()) { - film_name = decrypted.content_title_text (); - } - shared_ptr job (new SendKDMEmailJob ( - film_name, - decrypted.content_title_text(), - _timing->from(), _timing->until(), - CinemaKDMs::collect (screen_kdms) - )); - - JobManager::instance()->add (job); + pair, int> result = _output->make ( + screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr () + ); + + if (result.first) { + JobManager::instance()->add (result.first); if (_job_view) { _job_view->Destroy (); _job_view = 0; } - _job_view = new JobViewDialog (this, _("Send KDM emails"), job); + _job_view = new JobViewDialog (this, _("Send KDM emails"), result.first); _job_view->ShowModal (); } + + if (result.second > 0) { + /* XXX: proper plural form support in wxWidgets? */ + wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s"); + message_dialog ( + this, + wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data()) + ); + } } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -309,17 +364,149 @@ private: { _screens->setup_sensitivity (); _output->setup_sensitivity (); - _create->Enable (!_screens->screens().empty() && !_dkdm->GetPath().IsEmpty()); + wxArrayTreeItemIds sel; + _dkdm->GetSelections (sel); + _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0); + } + + void dkdm_begin_drag (wxTreeEvent& ev) + { + ev.Allow (); + } + + void dkdm_end_drag (wxTreeEvent& ev) + { + DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ()); + DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ()); + if (from == _dkdm_id.end() || to == _dkdm_id.end()) { + return; + } + + shared_ptr group = dynamic_pointer_cast (to->second); + if (!group) { + group = to->second->parent(); + } + + DCPOMATIC_ASSERT (group); + DCPOMATIC_ASSERT (from->second->parent ()); + + from->second->parent()->remove (from->second); + add_dkdm_model (from->second, group); + + _dkdm->Delete (from->first); + _dkdm_id.erase (from->first); + add_dkdm_view (from->second); + } + + void add_dkdm_clicked () + { + wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); + if (d->ShowModal() == wxID_OK) { + shared_ptr new_dkdm; + try { + new_dkdm.reset ( + new DKDM (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))) + ); + } catch (dcp::KDMFormatError& e) { + error_dialog ( + this, + wxString::Format ( + _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all.\n\n%s"), + std_to_wx(e.what()).data() + ) + ); + return; + } + + 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 (); + } + + void add_dkdm_folder_clicked () + { + NewDKDMFolderDialog* 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 ()); + if (!parent) { + parent = Config::instance()->dkdms (); + } + add_dkdm_model (new_dkdm, parent); + add_dkdm_view (new_dkdm); + } + d->Destroy (); + } + + /** @param dkdm Thing to add. + * @param parent Parent group, or 0. + */ + void add_dkdm_view (shared_ptr base) + { + if (!base->parent()) { + /* This is the root group */ + _dkdm_id[_dkdm->AddRoot("root")] = base; + } else { + /* Add base to the view */ + _dkdm_id[_dkdm->AppendItem(dkdm_to_id(base->parent()), std_to_wx(base->name()))] = base; + } + + /* Add children */ + shared_ptr g = dynamic_pointer_cast (base); + if (g) { + BOOST_FOREACH (shared_ptr i, g->children()) { + add_dkdm_view (i); + } + } + } + + /** @param group Group to add dkdm to */ + void add_dkdm_model (shared_ptr dkdm, shared_ptr group) + { + group->add (dkdm); + /* We're messing with a Config-owned object here, so tell it that something has changed. + This isn't nice. + */ + Config::instance()->changed (); + } + + 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; + } + } + DCPOMATIC_ASSERT (false); + } + + void remove_dkdm_clicked () + { + shared_ptr removed = selected_dkdm (); + if (!removed) { + return; + } + + _dkdm->Delete (dkdm_to_id (removed)); + shared_ptr dkdms = Config::instance()->dkdms (); + dkdms->remove (removed); + Config::instance()->changed (); } wxPreferencesEditor* _config_dialog; ScreensPanel* _screens; KDMTimingPanel* _timing; - /* I can't seem to clear the value in a wxFilePickerCtrl, so use our own */ - FilePickerCtrl* _dkdm; - wxStaticText* _annotation_text; - wxStaticText* _content_title_text; - wxStaticText* _issue_date; + wxTreeCtrl* _dkdm; + typedef std::map > DKDMMap; + DKDMMap _dkdm_id; + wxButton* _add_dkdm; + wxButton* _add_dkdm_folder; + wxButton* _remove_dkdm; wxButton* _create; KDMOutputPanel* _output; JobViewDialog* _job_view; @@ -343,7 +530,7 @@ private: { wxInitAllImageHandlers (); - SetAppName (_("DCP-o-matic KDM creator")); + SetAppName (_("DCP-o-matic KDM Creator")); if (!wxApp::OnInit()) { return false; @@ -379,7 +566,7 @@ private: */ Config::drop (); - _frame = new DOMFrame (_("DCP-o-matic KDM creator")); + _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); SetTopWindow (_frame); _frame->Maximize (); _frame->Show ();