X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=f9a3fa36eb2720fa0d04d597486248ecdb68a338;hb=6ca34bc1ef59dd206379f35eb940e607a59c9804;hp=c295126966c66f2d1f3010ab59df3bd44d26b92b;hpb=9d63be286e8bc09dd1cf8deea5c58dda0a534c1e;p=dcpomatic.git

diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index c29512696..f9a3fa36e 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -1,51 +1,70 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "screen_kdm.h"
 #include "cinema.h"
 #include "screen.h"
-#include "film.h"
 #include "util.h"
 #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;
 
-string
-ScreenKDM::filename (shared_ptr<const Film> film) const
-{
-	return tidy_for_filename (film->name()) + "_" + tidy_for_filename (screen->cinema->name) + "_" + tidy_for_filename (screen->name) + ".kdm.xml";
-}
+	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 (shared_ptr<const Film> film, 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);
-		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;
 }