diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-13 12:00:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-13 12:00:35 +0100 |
| commit | 8bdc1edabc107c3ba0ec6c5f0b8f93ac00e4c631 (patch) | |
| tree | c87aee4edefa33e25a1bc90da56dc3266ec697b0 /src/lib/cinema_kdms.cc | |
| parent | fe0b4d0512d289caf3bc327a3791edcdd0fa3d0c (diff) | |
Fix various small errors in emailed-KDM zip file format (#478).
Diffstat (limited to 'src/lib/cinema_kdms.cc')
| -rw-r--r-- | src/lib/cinema_kdms.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 605e414a0..dc9bfd3d7 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -179,15 +179,17 @@ CinemaKDMs::write_zip_files ( /** Email one ZIP file per cinema to the cinema. * @param cinema_kdms KDMS to email. - * @param name_format Format of filename to use. - * @param name_values Values to substitute into \p name_format. + * @param container_name_format Format of folder / ZIP to use. + * @param filename_format Format of filenames to use. + * @param name_values Values to substitute into \p container_name_format and \p filename_format. * @param cpl_name Name of the CPL that the KDMs are for. * @param log Log to write email session transcript to, or 0. */ void CinemaKDMs::email ( list<CinemaKDMs> cinema_kdms, - dcp::NameFormat name_format, + dcp::NameFormat container_name_format, + dcp::NameFormat filename_format, dcp::NameFormat::Map name_values, string cpl_name, shared_ptr<Log> log @@ -206,9 +208,9 @@ CinemaKDMs::email ( 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 (zip_file, name_format, name_values); + boost::filesystem::path zip_file = boost::filesystem::temp_directory_path(); + zip_file /= container_name_format.get(name_values, ".zip"); + i.make_zip_file (zip_file, filename_format, name_values); string subject = config->kdm_subject(); boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name); @@ -237,7 +239,7 @@ CinemaKDMs::email ( email.add_bcc (config->kdm_bcc ()); } - email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip"); + email.add_attachment (zip_file, container_name_format.get(name_values, ".zip"), "application/zip"); Config* c = Config::instance (); |