Make a backup of configuration when we load in a Version 2 file, and bump our config...

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

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 8cac65f41574602973b300d03ba22b10f6b9569e..d4c1017bb6bcb1846332be77ba7559ba0af6f8d5 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -65,6 +65,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
                }
 
                name_values['s'] = i.screen->name;
+               name_values['i'] = i.kdm.id ();
                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");
@@ -130,14 +131,15 @@ 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, "");
-               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);
-               }
+               ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
                written += i.screen_kdms.size();
        }
 
@@ -160,6 +162,10 @@ 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;
@@ -178,12 +184,18 @@ CinemaKDMs::write_zip_files (
 }
 
 /** Email one ZIP file per cinema to the cinema.
+ *  @param cinema_kdms KDMS to email.
+ *  @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
@@ -202,9 +214,10 @@ CinemaKDMs::email (
 
                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);
@@ -233,13 +246,14 @@ 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());
                } 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);
@@ -249,6 +263,8 @@ CinemaKDMs::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);