X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=84cd9c18f83a9b6bd6c9665da6eb929b158b4b92;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=966955ab4631cb92c972a3bc2da79a8fbb7c0979;hpb=590975c2020fea67b06d82af5bec1b798d42ba9b;p=dcpomatic.git diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 966955ab4..84cd9c18f 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -1,44 +1,45 @@ /* 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 . */ -#include "quickmail.h" #include "exceptions.h" #include "cinema_kdms.h" #include "cinema.h" #include "screen.h" #include "config.h" #include "util.h" +#include "emailer.h" #include "compose.hpp" +#include "log.h" #include #include #include "i18n.h" using std::list; +using std::cout; using std::string; +using std::runtime_error; using boost::shared_ptr; -/** @param filename_first_part First part of name of KDM files inside the zip file - * (perhaps the name of the film). - */ void -CinemaKDMs::make_zip_file (string filename_first_part, boost::filesystem::path zip_file) const +CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) const { int error; struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error); @@ -57,16 +58,16 @@ CinemaKDMs::make_zip_file (string filename_first_part, boost::filesystem::path z 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(filename_first_part).c_str(), source) == -1) { - throw StringError ("failed to add KDM to ZIP archive"); + if (zip_add (zip, i.filename(film_name).c_str(), source) == -1) { + 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"); } } @@ -106,50 +107,45 @@ CinemaKDMs::collect (list screen_kdms) } void -CinemaKDMs::write_zip_files (string filename_first_part, list cinema_kdms, boost::filesystem::path directory) +CinemaKDMs::write_zip_files (string film_name, list cinema_kdms, boost::filesystem::path directory) { BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; path /= tidy_for_filename (i.cinema->name) + ".zip"; - i.make_zip_file (filename_first_part, path); + i.make_zip_file (film_name, path); } } +/** @param log Log to write email session transcript to, or 0 */ /* XXX: should probably get from/to from the KDMs themselves */ void -CinemaKDMs::email (string filename_first_part, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to) +CinemaKDMs::email ( + 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 (); zip_file /= boost::filesystem::unique_path().string() + ".zip"; - i.make_zip_file (filename_first_part, zip_file); - - /* Send email */ - - quickmail_initialize (); + i.make_zip_file (film_name, zip_file); + string subject = config->kdm_subject(); SafeStringStream start; start << from.date() << " " << from.time_of_day(); SafeStringStream end; end << to.date() << " " << to.time_of_day(); - - string subject = Config::instance()->kdm_subject(); 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, "$CINEMA_NAME", i.cinema->name); - quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), subject.c_str ()); - quickmail_add_to (mail, i.cinema->email.c_str ()); - if (!Config::instance()->kdm_cc().empty ()) { - quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ()); - } - if (!Config::instance()->kdm_bcc().empty ()) { - quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ()); - } - - string body = Config::instance()->kdm_email().c_str(); + 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 ()); @@ -161,34 +157,37 @@ CinemaKDMs::email (string filename_first_part, string cpl_name, list } boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2)); - quickmail_set_body (mail, body.c_str()); - quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip"); + Emailer email (config->kdm_from(), i.cinema->emails, subject, body); - char const* e = quickmail_send ( - mail, - Config::instance()->mail_server().c_str(), - Config::instance()->mail_port(), - Config::instance()->mail_user().c_str(), - Config::instance()->mail_password().c_str() - ); + BOOST_FOREACH (string i, config->kdm_cc()) { + email.add_cc (i); + } + if (!config->kdm_bcc().empty ()) { + email.add_bcc (config->kdm_bcc ()); + } - if (e) { - quickmail_destroy (mail); + string const name = tidy_for_filename(i.cinema->name) + "_" + tidy_for_filename(film_name) + ".zip"; + email.add_attachment (zip_file, name, "application/zip"); - string error (e); + Config* c = Config::instance (); - if (Config::instance()->mail_server().empty ()) { - error = _("no mail server set up in preferences"); + 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; + } - throw KDMError ( - String::compose ( - _("Failed to send KDM email to %1 (%2)"), - i.cinema->email, - error - ) - ); + 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); } - quickmail_destroy (mail); } }