Confirm overwrite of KDMs (#1008).

[dcpomatic.git] / src / lib / screen_kdm.cc

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 52590bc55a1fb1c9499b473214a4b7371fdf41b2..5d8409ea746b6e30ff1cf4667f4d20f6e0aecb9e 100644 (file)
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -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, KDMNameFormat name_format, 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["cinema"] = i.screen->cinema->name;
-               name_values["screen"] = i.screen->name;
-               boost::filesystem::path out = directory / (name_format.get(name_values) + ".xml");
-               i.kdm.as_xml (out);
+               name_values['c'] = i.screen->cinema->name;
+               name_values['s'] = i.screen->name;
+               boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
+               if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
+                       i.kdm.as_xml (out);
+                       ++written;
+               }
        }
+
+       return written;
 }