X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=f76c96283710cc7b4bd0e3fea085a29d0d15c3bd;hp=37c9e1fb55cb5684aaba45612b8bdcc6c5ba2ba2;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 37c9e1fb5..f76c96283 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 . */ @@ -34,6 +35,7 @@ using std::list; using std::cout; using std::string; +using std::runtime_error; using boost::shared_ptr; void @@ -56,16 +58,16 @@ CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) c struct zip_source* source = zip_source_buffer (zip, kdm->c_str(), kdm->length(), 0); if (!source) { - throw StringError ("could not create ZIP source"); + throw runtime_error ("could not create ZIP source"); } if (zip_add (zip, i.filename(film_name).c_str(), source) == -1) { - throw StringError ("failed to add KDM to ZIP archive"); + throw runtime_error ("failed to add KDM to ZIP archive"); } } if (zip_close (zip) == -1) { - throw StringError ("failed to close ZIP archive"); + throw runtime_error ("failed to close ZIP archive"); } } @@ -118,11 +120,15 @@ CinemaKDMs::write_zip_files (string film_name, list cinema_kdms, boo /* XXX: should probably get from/to from the KDMs themselves */ void CinemaKDMs::email ( - string film_name, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr job, shared_ptr log + string film_name, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr log ) { Config* config = Config::instance (); + if (config->mail_server().empty()) { + throw NetworkError (_("No mail server configured in preferences")); + } + BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path zip_file = boost::filesystem::temp_directory_path (); @@ -130,9 +136,9 @@ CinemaKDMs::email ( i.make_zip_file (film_name, zip_file); string subject = config->kdm_subject(); - SafeStringStream start; + locked_stringstream start; start << from.date() << " " << from.time_of_day(); - SafeStringStream end; + locked_stringstream 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 ()); @@ -145,16 +151,16 @@ CinemaKDMs::email ( boost::algorithm::replace_all (body, "$END_TIME", end.str ()); 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 << ", "; } boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2)); - Emailer email (config->kdm_from(), i.cinema->email, subject, body); + Emailer email (config->kdm_from(), i.cinema->emails, subject, body); - if (!config->kdm_cc().empty ()) { - email.add_cc (config->kdm_cc ()); + BOOST_FOREACH (string i, config->kdm_cc()) { + email.add_cc (i); } if (!config->kdm_bcc().empty ()) { email.add_bcc (config->kdm_bcc ()); @@ -162,9 +168,25 @@ CinemaKDMs::email ( string const name = tidy_for_filename(i.cinema->name) + "_" + tidy_for_filename(film_name) + ".zip"; email.add_attachment (zip_file, name, "application/zip"); - email.send (job); + + Config* c = Config::instance (); + + try { + email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password()); + } catch (...) { + if (log) { + log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL); + log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL); + log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL); + log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL); + } + throw; + } if (log) { + log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL); + log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL); + log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL); log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL); } }