Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 9cb83162215f5d840d7e2be963a9087ab74e968f..f9a3fa36eb2720fa0d04d597486248ecdb68a338 100644 (file)
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -25,23 +25,46 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+using std::cout;
 using std::list;
 using boost::shared_ptr;
 
-bool
-operator== (ScreenKDM const & a, ScreenKDM const & b)
+int
+ScreenKDM::write_files (
+       list<shared_ptr<ScreenKDM> > screen_kdms,
+       boost::filesystem::path directory,
+       dcp::NameFormat name_format,
+       dcp::NameFormat::Map name_values,
+       boost::function<bool (boost::filesystem::path)> confirm_overwrite
+       )
 {
-       return a.screen == b.screen && a.kdm == b.kdm;
-}
+       int written = 0;
+
+       if (directory == "-") {
+               /* Write KDMs to the stdout */
+               BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+                       cout << i->kdm_as_xml ();
+                       ++written;
+               }
+
+               return written;
+       }
+
+       if (!boost::filesystem::exists (directory)) {
+               boost::filesystem::create_directories (directory);
+       }
 
-void
-ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path directory, KDMFilenameFormat name_format, dcp::NameFormat::Map name_values)
-{
        /* 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);
+       BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+               name_values['c'] = i->screen->cinema ? i->screen->cinema->name : "";
+               name_values['s'] = i->screen->name;
+               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;
 }