X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=223a183b3deed2b4c29cd5c0dde534dcc2ec9213;hb=ccc8409dceedcf71872b2846b9b4a4dea9042bda;hp=b5ebd1e968c79dd0e1d11406244e24d5414e3eb3;hpb=55861a0b4ad4270f80b8d1ae10230cf2ebb25735;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index b5ebd1e96..223a183b3 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -24,12 +24,15 @@
 #include "kdm_timing_panel.h"
 #include "kdm_output_panel.h"
 #include "kdm_cpl_panel.h"
+#include "confirm_kdm_email_dialog.h"
 #include "lib/film.h"
 #include "lib/screen.h"
 #include "lib/screen_kdm.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/job_manager.h"
 #include "lib/cinema_kdms.h"
+#include "lib/config.h"
+#include "lib/cinema.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
 #include <wx/treectrl.h>
@@ -45,6 +48,7 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::bind;
 
 KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make KDMs"))
@@ -103,7 +107,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 
 	_screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
 	_timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
-	_make->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::make_clicked, this));
+	_make->Bind (wxEVT_BUTTON, boost::bind (&KDMDialog::make_clicked, this));
 
 	setup_sensitivity ();
 
@@ -120,49 +124,27 @@ KDMDialog::setup_sensitivity ()
 	_make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected());
 }
 
+bool
+KDMDialog::confirm_overwrite (boost::filesystem::path path)
+{
+	return confirm_dialog (
+		this,
+		wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
+		);
+}
+
 void
 KDMDialog::make_clicked ()
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	_output->save_kdm_name_format ();
-
-	try {
-		list<ScreenKDM> screen_kdms = film->make_kdms (
-			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
-			);
-
-		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
-				);
-		}
-
-		if (_output->email ()) {
-			JobManager::instance()->add (
-				shared_ptr<Job> (new SendKDMEmailJob (
-							 CinemaKDMs::collect (screen_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."));
+	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);
 	}
 }