Merge.

5 files changed, 173 insertions, 90 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index dd54a2d1f..c5c53849b 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -192,6 +192,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Thierry Journet"));
 	supported_by.Add (wxT ("Mario Kalogjera"));
 	supported_by.Add (wxT ("Zbigniew Kamiński"));
+	supported_by.Add (wxT ("Ikram Karimov"));
 	supported_by.Add (wxT ("Chris Kay"));
 	supported_by.Add (wxT ("Lars Kelto"));
 	supported_by.Add (wxT ("Erwan Kerzanet"));
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 5ed1169b1..5679cf0cb 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -139,65 +139,21 @@ KDMDialog::make_clicked ()
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	_output->save_kdm_name_format ();
+	list<ScreenKDM> screen_kdms = film->make_kdms (
+		_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
+		);
 
-	try {
-		list<ScreenKDM> screen_kdms = film->make_kdms (
-			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
-			);
+	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());
+	if (result.first) {
+		JobManager::instance()->add (result.first);
+	}
 
-		dcp::NameFormat::Map name_values;
-		name_values['f'] = film->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 (_output->write_to ()) {
-			ScreenKDM::write_files (
-				screen_kdms,
-				_output->directory(),
-				_output->name_format(),
-				name_values,
-				bind (&KDMDialog::confirm_overwrite, this, _1)
-				);
-		}
-
-		if (_output->email ()) {
-
-			list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
-
-			bool ok = true;
-
-			if (Config::instance()->confirm_kdm_email ()) {
-				list<string> 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) {
-				JobManager::instance()->add (
-					shared_ptr<Job> (new SendKDMEmailJob (
-								 cinema_kdms,
-								 _output->name_format(),
-								 name_values,
-								 film->dcp_name(),
-								 film->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."));
+	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())
+			);
 	}
 }
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index a36c82024..f9078eac4 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     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 <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
@@ -30,6 +36,14 @@
 #endif
 #include <wx/stdpaths.h>
 
+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)
 {
@@ -48,6 +62,20 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
 	{
 		int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT;
+		wxString t = _("Folder / ZIP name 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);
+	}
+
+	_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);
+
+	{
+		int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT;
 		wxString t = _("Filename format");
 #ifdef __WXOSX__
 		flags |= wxALIGN_RIGHT;
@@ -90,6 +118,16 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
 	table->Add (_folder, 1, wxEXPAND);
 
+	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 wxCheckBox (this, wxID_ANY, _("Send by email"));
 	table->Add (_email, 1, wxEXPAND);
 	table->AddSpacer (0);
@@ -105,25 +143,100 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 void
 KDMOutputPanel::setup_sensitivity ()
 {
-	_folder->Enable (_write_to->GetValue ());
-}
-
-boost::filesystem::path
-KDMOutputPanel::directory () const
-{
-	return wx_to_std (_folder->GetPath ());
+	bool const write = _write_to->GetValue ();
+	_folder->Enable (write);
+	_write_flat->Enable (write);
+	_write_folder->Enable (write);
+	_write_zip->Enable (write);
 }
 
-bool
-KDMOutputPanel::write_to () const
+pair<shared_ptr<Job>, int>
+KDMOutputPanel::make (
+	list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite, shared_ptr<Log> log
+	)
 {
-	return _write_to->GetValue ();
-}
+	Config::instance()->set_kdm_filename_format (_filename_format->get ());
+
+	int written = 0;
+	shared_ptr<Job> 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()) {
+			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 ()) {
+
+			list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
+
+			bool ok = true;
+
+			if (Config::instance()->confirm_kdm_email ()) {
+				list<string> 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::email () const
-{
-	return _email->GetValue ();
+	return make_pair (job, written);
 }
 
 dcp::Formulation
@@ -132,14 +245,8 @@ KDMOutputPanel::formulation () const
 	return (dcp::Formulation) reinterpret_cast<intptr_t> (_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 ());
 }
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 98e2622a9..cb6f9a1ca 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,41 @@
 
 */
 
+#include "lib/screen_kdm.h"
 #include "wx_util.h"
 #include "name_format_editor.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <boost/filesystem.hpp>
 
+class wxRadioButton;
 class wxDirPickerCtrl;
 class DirPickerCtrl;
+class KDMTimingPanel;
+class Job;
+class Log;
 
 class KDMOutputPanel : public wxPanel
 {
 public:
 	KDMOutputPanel (wxWindow* parent, bool interop);
 
+	void setup_sensitivity ();
+
 	boost::filesystem::path directory () const;
-	bool write_to () const;
-	bool email () const;
 	dcp::Formulation formulation () const;
-	dcp::NameFormat name_format () const;
 
-	void setup_sensitivity ();
-	void save_kdm_name_format () const;
+	std::pair<boost::shared_ptr<Job>, int> make (
+		std::list<ScreenKDM> screen_kdms,
+		std::string name,
+		KDMTimingPanel* timing,
+		boost::function<bool (boost::filesystem::path)> confirm_overwrite,
+		boost::shared_ptr<Log> log
+		);
 
 private:
 	wxChoice* _type;
+	NameFormatEditor* _container_name_format;
 	NameFormatEditor* _filename_format;
 	wxCheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -50,5 +60,8 @@ private:
 #else
 	wxDirPickerCtrl* _folder;
 #endif
+	wxRadioButton* _write_flat;
+	wxRadioButton* _write_folder;
+	wxRadioButton* _write_zip;
 	wxCheckBox* _email;
 };
diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc
index 1f7ca109b..82adc3f55 100644
--- a/src/wx/name_format_editor.cc
+++ b/src/wx/name_format_editor.cc
@@ -34,7 +34,9 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
 	, _suffix (suffix)
 {
 	_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
-	_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	if (!_examples.empty ()) {
+		_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	}
 	_panel->SetSizer (_sizer);
 
 	for (dcp::NameFormat::Map::const_iterator i = titles.begin(); i != titles.end(); ++i) {
@@ -63,6 +65,10 @@ NameFormatEditor::changed ()
 void
 NameFormatEditor::update_example ()
 {
+	if (_examples.empty ()) {
+		return;
+	}
+
 	_name.set_specification (careful_string_filter (wx_to_std (_specification->GetValue ())));
 
 	wxString example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));