X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=56b76d3f9ecdb5e9264647c7ce638e28384645ea;hp=2b6a51e4179a95ac3d0b3727cdcdd641be96963b;hb=4e62980064496060af5a8c6ecab26ddf218aa63a;hpb=769ce034cbb2f95f01dba3d22f7bd554ecb14f3e diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 2b6a51e41..56b76d3f9 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -27,7 +27,9 @@ #include "emailer.h" #include "compose.hpp" #include "log.h" -#include +#include "zipper.h" +#include "dcpomatic_log.h" +#include "kdm_with_metadata.h" #include #include "i18n.h" @@ -38,49 +40,29 @@ using std::string; using std::runtime_error; using boost::shared_ptr; using boost::function; +using boost::optional; void CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const { - int error; - struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error); - if (!zip) { - if (error == ZIP_ER_EXISTS) { - throw FileError ("ZIP file already exists", zip_file); - } - throw FileError ("could not create ZIP file", zip_file); - } - - list > kdm_strings; + Zipper zipper (zip_file); name_values['c'] = cinema->name; - BOOST_FOREACH (ScreenKDM const & 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); - if (!source) { - throw runtime_error ("could not create ZIP source"); - } - - name_values['s'] = i.screen->name; - string const name = 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"); - } + BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) { + name_values['i'] = i->kdm_id (); + string const name = careful_string_filter(name_format.get(name_values, ".xml")); + zipper.add (name, i->kdm_as_xml()); } - if (zip_close (zip) == -1) { - throw runtime_error ("failed to close ZIP archive"); - } + zipper.close (); } -/** Collect a list of ScreenKDMs into a list of CinemaKDMs so that each +/** Collect a list of KDMWithMetadatas into a list of CinemaKDMs so that each * CinemaKDM contains the KDMs for its cinema. */ list -CinemaKDMs::collect (list screen_kdms) +CinemaKDMs::collect (list screen_kdms) { list cinema_kdms; @@ -90,17 +72,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)->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)->cinema() == ck.cinema) { ck.screen_kdms.push_back (*i); - list::iterator j = i; + list::iterator j = i; ++i; screen_kdms.remove (*j); } else { @@ -136,7 +118,7 @@ CinemaKDMs::write_directories ( path /= container_name_format.get(name_values, ""); 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); + write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite); } written += i.screen_kdms.size(); } @@ -183,7 +165,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 ( @@ -191,8 +172,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 (); @@ -206,6 +186,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(); @@ -226,8 +210,11 @@ 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 (KDMWithMetadataPtr j, i.screen_kdms) { + optional screen_name = j->get('n'); + if (screen_name) { + screens += *screen_name + ", "; + } } boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2)); @@ -245,25 +232,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); } }