#include "emailer.h"
#include "compose.hpp"
#include "log.h"
+#include "dcpomatic_log.h"
#include <zip.h>
#include <boost/foreach.hpp>
name_values['c'] = cinema->name;
- BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
- shared_ptr<string> kdm (new string (i.kdm.as_xml ()));
+ BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+ shared_ptr<string> kdm (new string(i->kdm_as_xml()));
kdm_strings.push_back (kdm);
struct zip_source* source = zip_source_buffer (zip, kdm->c_str(), kdm->length(), 0);
throw runtime_error ("could not create ZIP source");
}
- name_values['s'] = i.screen->name;
- name_values['i'] = i.kdm.id ();
- string const name = name_format.get(name_values, ".xml");
+ name_values['s'] = i->screen->name;
+ name_values['i'] = i->kdm_id ();
+ string const name = careful_string_filter(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");
}
* CinemaKDM contains the KDMs for its cinema.
*/
list<CinemaKDMs>
-CinemaKDMs::collect (list<ScreenKDM> screen_kdms)
+CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
{
list<CinemaKDMs> cinema_kdms;
CinemaKDMs ck;
- list<ScreenKDM>::iterator i = screen_kdms.begin ();
- ck.cinema = i->screen->cinema;
+ list<shared_ptr<ScreenKDM> >::iterator i = screen_kdms.begin ();
+ ck.cinema = (*i)->screen->cinema;
ck.screen_kdms.push_back (*i);
- list<ScreenKDM>::iterator j = i;
+ list<shared_ptr<ScreenKDM> >::iterator j = i;
++i;
screen_kdms.remove (*j);
while (i != screen_kdms.end ()) {
- if (i->screen->cinema == ck.cinema) {
+ if ((*i)->screen->cinema == ck.cinema) {
ck.screen_kdms.push_back (*i);
- list<ScreenKDM>::iterator j = i;
+ list<shared_ptr<ScreenKDM> >::iterator j = i;
++i;
screen_kdms.remove (*j);
} else {
* @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 (
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
dcp::NameFormat::Map name_values,
- string cpl_name,
- shared_ptr<Log> log
+ string cpl_name
)
{
Config* config = Config::instance ();
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
+ if (i.cinema->emails.empty()) {
+ continue;
+ }
+
name_values['c'] = i.cinema->name;
boost::filesystem::path zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
string screens;
- BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
- screens += j.screen->name + ", ";
+ BOOST_FOREACH (shared_ptr<ScreenKDM> j, i.screen_kdms) {
+ screens += j->screen->name + ", ";
}
boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
Config* c = Config::instance ();
try {
- email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
+ email.send (c->mail_server(), c->mail_port(), c->mail_protocol(), c->mail_user(), c->mail_password());
} catch (...) {
boost::filesystem::remove (zip_file);
- 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);
- }
+ dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
throw;
}
boost::filesystem::remove (zip_file);
- 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);
- }
+ dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
+ dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
}
}