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 605e414a0c4db08042b8da174286f5cbb3bb706d..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));
        }
 }
 
@@ -179,18 +184,18 @@ CinemaKDMs::write_zip_files (
 
 /** Email one ZIP file per cinema to the cinema.
  *  @param cinema_kdms KDMS to email.
- *  @param name_format Format of filename to use.
- *  @param name_values Values to substitute into \p name_format.
+ *  @param container_name_format Format of folder / ZIP to use.
+ *  @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 (
        list<CinemaKDMs> cinema_kdms,
-       dcp::NameFormat name_format,
+       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 ();
@@ -204,11 +209,16 @@ 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 ();
-               zip_file /= boost::filesystem::unique_path().string() + ".zip";
-               i.make_zip_file (zip_file, name_format, name_values);
+               boost::filesystem::path zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
+               boost::filesystem::create_directories (zip_file);
+               zip_file /= container_name_format.get(name_values, ".zip");
+               i.make_zip_file (zip_file, filename_format, name_values);
 
                string subject = config->kdm_subject();
                boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
@@ -237,27 +247,26 @@ CinemaKDMs::email (
                        email.add_bcc (config->kdm_bcc ());
                }
 
-               email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip");
+               email.add_attachment (zip_file, container_name_format.get(name_values, ".zip"), "application/zip");
 
                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 (...) {
-                       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);
-                       }
+                       boost::filesystem::remove (zip_file);
+                       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;
                }
 
-               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);
-               }
+               boost::filesystem::remove (zip_file);
+
+               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);
        }
 }