Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 129e64aeee5b7e88de8bcccd512cdfa8b98c796d..5b7692469a8d68a3be03929f00e980b7f586d27d 100644 (file)
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -25,6 +25,7 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+using std::cout;
 using std::list;
 using boost::shared_ptr;
 
@@ -34,14 +35,42 @@ 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;
+
+       if (directory == "-") {
+               /* Write KDMs to the stdout */
+               BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
+                       cout << i.kdm.as_xml ();
+                       ++written;
+               }
+
+               return written;
+       }
+
+       if (!boost::filesystem::exists (directory)) {
+               boost::filesystem::create_directories (directory);
+       }
+
        /* Write KDMs to the specified directory */
        BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-               name_values['c'] = i.screen->cinema->name;
+               name_values['c'] = i.screen->cinema ? 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);
+               name_values['i'] = i.kdm.id ();
+               boost::filesystem::path out = directory / careful_string_filter(name_format.get(name_values, ".xml"));
+               if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
+                       i.kdm.as_xml (out);
+                       ++written;
+               }
        }
+
+       return written;
 }