Confirm overwrite of KDMs (#1008).

2 files changed, 19 insertions, 5 deletions

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 182d03bb0..5d8409ea7 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -34,14 +34,27 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 	return a.screen == b.screen && a.kdm == b.kdm;
 }
 
-void
-ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, dcp::NameFormat name_format, dcp::NameFormat::Map name_values)
+int
+ScreenKDM::write_files (
+	list<ScreenKDM> screen_kdms,
+	boost::filesystem::path directory,
+	dcp::NameFormat name_format,
+	dcp::NameFormat::Map name_values,
+	boost::function<bool (boost::filesystem::path)> confirm_overwrite
+	)
 {
+	int written = 0;
+
 	/* Write KDMs to the specified directory */
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
 		name_values['c'] = i.screen->cinema->name;
 		name_values['s'] = i.screen->name;
 		boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
-		i.kdm.as_xml (out);
+		if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
+			i.kdm.as_xml (out);
+			++written;
+		}
 	}
+
+	return written;
 }
diff --git a/src/lib/screen_kdm.h b/src/lib/screen_kdm.h
index 60486c259..9ab73b851 100644
--- a/src/lib/screen_kdm.h
+++ b/src/lib/screen_kdm.h
@@ -36,9 +36,10 @@ public:
 		, kdm (k)
 	{}
 
-	static void write_files (
+	static int write_files (
 		std::list<ScreenKDM> screen_kdms, boost::filesystem::path directory,
-		dcp::NameFormat name_format, dcp::NameFormat::Map name_values
+		dcp::NameFormat name_format, dcp::NameFormat::Map name_values,
+		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
 	boost::shared_ptr<Screen> screen;