X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen_kdm.cc;h=f9a3fa36eb2720fa0d04d597486248ecdb68a338;hb=4cb18d1e0b8fdedf6bb38e1d4187a2d782957022;hp=22081fc81d399e8987214028a9dda0ccdc8dcaf2;hpb=fe9d2a290682021cd12a00bf21fa4db3012e2049;p=dcpomatic.git diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc index 22081fc81..f9a3fa36e 100644 --- a/src/lib/screen_kdm.cc +++ b/src/lib/screen_kdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -25,23 +25,46 @@ #include 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 > screen_kdms, + boost::filesystem::path directory, + dcp::NameFormat name_format, + dcp::NameFormat::Map name_values, + boost::function 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 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 screen_kdms, boost::filesystem::path directory, KDMNameFormat name_format, dcp::NameFormat::Map name_values) -{ /* 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); + BOOST_FOREACH (shared_ptr 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; }