X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=32879cf6b5763355378e6ddc58432b8095d8ef52;hp=316deed2fa3401b0a2606a251176e267adbfa74e;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=e85799ff00274388b87a1492d7d7f401c0d7757d diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 316deed2f..32879cf6b 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -27,6 +27,7 @@ #include "emailer.h" #include "compose.hpp" #include "log.h" +#include "dcpomatic_log.h" #include #include @@ -55,8 +56,8 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam name_values['c'] = cinema->name; - BOOST_FOREACH (ScreenKDM const & i, screen_kdms) { - shared_ptr kdm (new string (i.kdm.as_xml ())); + BOOST_FOREACH (shared_ptr i, screen_kdms) { + shared_ptr 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); @@ -64,8 +65,9 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam throw runtime_error ("could not create ZIP source"); } - name_values['s'] = i.screen->name; - 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"); } @@ -80,7 +82,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam * CinemaKDM contains the KDMs for its cinema. */ list -CinemaKDMs::collect (list screen_kdms) +CinemaKDMs::collect (list > screen_kdms) { list cinema_kdms; @@ -90,17 +92,17 @@ CinemaKDMs::collect (list screen_kdms) CinemaKDMs ck; - list::iterator i = screen_kdms.begin (); - ck.cinema = i->screen->cinema; + list >::iterator i = screen_kdms.begin (); + ck.cinema = (*i)->screen->cinema; ck.screen_kdms.push_back (*i); - list::iterator j = i; + list >::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::iterator j = i; + list >::iterator j = i; ++i; screen_kdms.remove (*j); } else { @@ -130,15 +132,14 @@ CinemaKDMs::write_directories ( int written = 0; - if (!boost::filesystem::exists (directory)) { - boost::filesystem::create_directories (directory); - } - BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; name_values['c'] = i.cinema->name; path /= container_name_format.get(name_values, ""); - ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite); + if (!boost::filesystem::exists (path) || confirm_overwrite (path)) { + boost::filesystem::create_directories (path); + ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite); + } written += i.screen_kdms.size(); } @@ -161,10 +162,6 @@ CinemaKDMs::write_zip_files ( int written = 0; - if (!boost::filesystem::exists (directory)) { - boost::filesystem::create_directories (directory); - } - BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; name_values['c'] = i.cinema->name; @@ -188,7 +185,6 @@ CinemaKDMs::write_zip_files ( * @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 ( @@ -196,8 +192,7 @@ CinemaKDMs::email ( dcp::NameFormat container_name_format, dcp::NameFormat filename_format, dcp::NameFormat::Map name_values, - string cpl_name, - shared_ptr log + string cpl_name ) { Config* config = Config::instance (); @@ -211,6 +206,10 @@ CinemaKDMs::email ( 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(); @@ -231,8 +230,8 @@ CinemaKDMs::email ( 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 j, i.screen_kdms) { + screens += j->screen->name + ", "; } boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2)); @@ -250,25 +249,21 @@ CinemaKDMs::email ( 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); } }