X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=c5057873417622c1cb24b8276cdcde695e0ad661;hb=fbe2784c136fa1550815babfce89589f66b35a29;hp=318eebe3996af238156e3ce0e7c9b4bed9376faa;hpb=71bfa8bdd16060076ea948ae6ac9ac468ba6b7dc;p=dcpomatic.git diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 318eebe39..c50578734 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2015 Carl Hetherington - 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 . */ @@ -26,6 +27,7 @@ #include "emailer.h" #include "compose.hpp" #include "log.h" +#include "kdm_name_format.h" #include #include @@ -38,7 +40,7 @@ using std::runtime_error; using boost::shared_ptr; void -CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) const +CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_format, dcp::NameFormat::Map name_values) const { int error; struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error); @@ -51,6 +53,8 @@ CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) c list > kdm_strings; + name_values['c'] = cinema->name; + BOOST_FOREACH (ScreenKDM const & i, screen_kdms) { shared_ptr kdm (new string (i.kdm.as_xml ())); kdm_strings.push_back (kdm); @@ -60,7 +64,9 @@ CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) c throw runtime_error ("could not create ZIP source"); } - if (zip_add (zip, i.filename(film_name).c_str(), source) == -1) { + name_values['s'] = i.screen->name; + string const name = name_format.get(name_values) + ".xml"; + if (zip_add (zip, name.c_str(), source) == -1) { throw runtime_error ("failed to add KDM to ZIP archive"); } } @@ -70,6 +76,9 @@ CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) c } } +/** Collect a list of ScreenKDMs into a list of CinemaKDMs so that each + * CinemaKDM contains the KDMs for its cinema. + */ list CinemaKDMs::collect (list screen_kdms) { @@ -105,21 +114,36 @@ CinemaKDMs::collect (list screen_kdms) return cinema_kdms; } +/** Write one ZIP file per cinema into a directory */ void -CinemaKDMs::write_zip_files (string film_name, list cinema_kdms, boost::filesystem::path directory) +CinemaKDMs::write_zip_files ( + list cinema_kdms, + boost::filesystem::path directory, + KDMNameFormat name_format, + dcp::NameFormat::Map name_values + ) { + /* No specific screen */ + name_values['s'] = ""; + BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; - path /= tidy_for_filename (i.cinema->name) + ".zip"; - i.make_zip_file (film_name, path); + name_values['c'] = i.cinema->name; + path /= name_format.get(name_values) + ".zip"; + i.make_zip_file (path, name_format, name_values); } } -/** @param log Log to write email session transcript to, or 0 */ -/* XXX: should probably get from/to from the KDMs themselves */ +/** Email one ZIP file per cinema to the cinema. + * @param log Log to write email session transcript to, or 0. + */ void CinemaKDMs::email ( - string film_name, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr log + list cinema_kdms, + KDMNameFormat name_format, + dcp::NameFormat::Map name_values, + string cpl_name, + shared_ptr log ) { Config* config = Config::instance (); @@ -128,29 +152,30 @@ CinemaKDMs::email ( throw NetworkError (_("No mail server configured in preferences")); } + /* No specific screen */ + name_values['s'] = ""; + BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { + name_values['c'] = i.cinema->name; + boost::filesystem::path zip_file = boost::filesystem::temp_directory_path (); zip_file /= boost::filesystem::unique_path().string() + ".zip"; - i.make_zip_file (film_name, zip_file); + i.make_zip_file (zip_file, name_format, name_values); string subject = config->kdm_subject(); - SafeStringStream start; - start << from.date() << " " << from.time_of_day(); - SafeStringStream end; - end << to.date() << " " << to.time_of_day(); boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (subject, "$START_TIME", start.str ()); - boost::algorithm::replace_all (subject, "$END_TIME", end.str ()); + boost::algorithm::replace_all (subject, "$START_TIME", name_values['f']); + boost::algorithm::replace_all (subject, "$END_TIME", name_values['t']); boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.cinema->name); string body = config->kdm_email().c_str(); boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name); - boost::algorithm::replace_all (body, "$START_TIME", start.str ()); - boost::algorithm::replace_all (body, "$END_TIME", end.str ()); + boost::algorithm::replace_all (body, "$START_TIME", name_values['f']); + boost::algorithm::replace_all (body, "$END_TIME", name_values['t']); boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name); - SafeStringStream screens; + locked_stringstream screens; BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) { screens << j.screen->name << ", "; } @@ -165,8 +190,7 @@ CinemaKDMs::email ( email.add_bcc (config->kdm_bcc ()); } - string const name = tidy_for_filename(i.cinema->name) + "_" + tidy_for_filename(film_name) + ".zip"; - email.add_attachment (zip_file, name, "application/zip"); + email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip"); Config* c = Config::instance ();