Allow configuration of KDM filename format.

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index b98ec84a9aa939cf165c84bd1283afc8aad10e56..a0a803737bf82608b9a954a2aa3863acc5128043 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -86,7 +87,7 @@ class DOMFrame : public wxFrame
 {
 public:
        DOMFrame (wxString const & title)
-               : wxFrame (NULL, -1, title)
+               : wxFrame (0, -1, title)
                , _config_dialog (0)
                , _job_view (0)
        {
@@ -146,7 +147,7 @@ public:
                vector<string> columns;
                columns.push_back (wx_to_std (_("CPL")));
                _dkdm = new EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper> (
-                       overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false
+                       overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false
                        );
                vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 
@@ -160,7 +161,7 @@ public:
                _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
                vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-               main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+               main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
                overall_panel->SetSizer (main_sizer);
 
                /* Instantly save any config changes when using a DCP-o-matic GUI */
@@ -271,9 +272,9 @@ private:
 
                                /* Make an empty KDM */
                                dcp::DecryptedKDM kdm (
-                                       dcp::LocalTime (_timing->from(), i->cinema->utc_offset(), 0),
-                                       dcp::LocalTime (_timing->until(), i->cinema->utc_offset(), 0),
-                                       decrypted.annotation_text(),
+                                       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()
                                        );
@@ -287,8 +288,13 @@ private:
                                screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
                        }
 
+                       NameFormat::Map name_values;
+                       name_values["film_name"] = decrypted.content_title_text();
+                       name_values["from"] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day();
+                       name_values["to"] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day();
+
                        if (_output->write_to()) {
-                               ScreenKDM::write_files (decrypted.content_title_text(), screen_kdms, _output->directory());
+                               ScreenKDM::write_files (screen_kdms, _output->directory(), _output->name_format(), name_values);
                                /* 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 (
@@ -296,15 +302,15 @@ private:
                                        wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
                                        );
                        } else {
-                               string film_name = decrypted.annotation_text ();
+                               string film_name = decrypted.annotation_text().get_value_or ("");
                                if (film_name.empty ()) {
                                        film_name = decrypted.content_title_text ();
                                }
                                shared_ptr<Job> job (new SendKDMEmailJob (
-                                                            film_name,
-                                                            decrypted.content_title_text(),
-                                                            _timing->from(), _timing->until(),
                                                             CinemaKDMs::collect (screen_kdms),
+                                                            _output->name_format(),
+                                                            name_values,
+                                                            decrypted.content_title_text(),
                                                             shared_ptr<Log> ()
                                                             ));
 
@@ -359,7 +365,7 @@ private:
        {
                wxInitAllImageHandlers ();
 
-               SetAppName (_("DCP-o-matic KDM creator"));
+               SetAppName (_("DCP-o-matic KDM Creator"));
 
                if (!wxApp::OnInit()) {
                        return false;
@@ -395,7 +401,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 ();