X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=3515af8a6644f1b6ed70377e1474652577b0fc88;hb=464801a7b386f93be65cdfc60c3807cb5365467e;hp=5cdf1c77bd420464136301753dd20046554de715;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 5cdf1c77b..3515af8a6 100644
--- 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.
 
@@ -25,6 +25,7 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+using std::cout;
 using std::list;
 using boost::shared_ptr;
 
@@ -34,18 +35,42 @@ operator== (ScreenKDM const & a, ScreenKDM const & b)
 	return a.screen == b.screen && a.kdm == b.kdm;
 }
 
-string
-ScreenKDM::filename (string film_name) const
+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
+	)
 {
-	return tidy_for_filename (film_name) + "_" + tidy_for_filename (screen->cinema->name) + "_" + tidy_for_filename (screen->name) + ".kdm.xml";
-}
+	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);
+	}
 
-void
-ScreenKDM::write_files (string film_name, list<ScreenKDM> screen_kdms, boost::filesystem::path directory)
-{
 	/* Write KDMs to the specified directory */
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-		boost::filesystem::path out = directory / i.filename(film_name);
-		i.kdm.as_xml (out);
+		name_values['c'] = i.screen->cinema->name;
+		name_values['s'] = i.screen->name;
+		name_values['i'] = i.kdm.id ();
+		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;
 }