Try to do the previous commit in a more compatible way.

[dcpomatic.git] / src / lib / cinema_kdms.cc

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 2b6a51e4179a95ac3d0b3727cdcdd641be96963b..2d1f3e2730ffacffd1144b79e01fe987065fc36f 100644 (file)
--- 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 <zip.h>
 #include <boost/foreach.hpp>
 
@@ -65,14 +66,18 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
                }
 
                name_values['s'] = i.screen->name;
-               string const name = name_format.get(name_values, ".xml");
+               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");
                }
        }
 
        if (zip_close (zip) == -1) {
-               throw runtime_error ("failed to close ZIP archive");
+               int zep;
+               int sep;
+               zip_error_get (zip, &zep, &sep);
+               throw runtime_error (String::compose("failed to close ZIP archive (%1, %2)", zep, sep));
        }
 }
 
@@ -183,7 +188,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 +195,7 @@ 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 ();
@@ -206,6 +209,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();
@@ -245,25 +252,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);
        }
 }