Add some tests; fix failure to make DCP when there is a bit of audio right at the...

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

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 6a0349b3125cb97052bc6d8fc0607052a3218c5d..2b6a51e4179a95ac3d0b3727cdcdd641be96963b 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -37,6 +37,7 @@ using std::cout;
 using std::string;
 using std::runtime_error;
 using boost::shared_ptr;
+using boost::function;
 
 void
 CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
@@ -113,33 +114,82 @@ CinemaKDMs::collect (list<ScreenKDM> screen_kdms)
        return cinema_kdms;
 }
 
+/** Write one directory per cinema into another directory */
+int
+CinemaKDMs::write_directories (
+       list<CinemaKDMs> cinema_kdms,
+       boost::filesystem::path directory,
+       dcp::NameFormat container_name_format,
+       dcp::NameFormat filename_format,
+       dcp::NameFormat::Map name_values,
+       function<bool (boost::filesystem::path)> confirm_overwrite
+       )
+{
+       /* No specific screen */
+       name_values['s'] = "";
+
+       int written = 0;
+
+       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);
+               }
+               written += i.screen_kdms.size();
+       }
+
+       return written;
+}
+
 /** Write one ZIP file per cinema into a directory */
-void
+int
 CinemaKDMs::write_zip_files (
        list<CinemaKDMs> cinema_kdms,
        boost::filesystem::path directory,
-       dcp::NameFormat name_format,
-       dcp::NameFormat::Map name_values
+       dcp::NameFormat container_name_format,
+       dcp::NameFormat filename_format,
+       dcp::NameFormat::Map name_values,
+       function<bool (boost::filesystem::path)> confirm_overwrite
        )
 {
        /* No specific screen */
        name_values['s'] = "";
 
+       int written = 0;
+
        BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
                boost::filesystem::path path = directory;
                name_values['c'] = i.cinema->name;
-               path /= name_format.get(name_values, ".zip");
-               i.make_zip_file (path, name_format, name_values);
+               path /= container_name_format.get(name_values, ".zip");
+               if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
+                       if (boost::filesystem::exists (path)) {
+                               /* Creating a new zip file over an existing one is an error */
+                               boost::filesystem::remove (path);
+                       }
+                       i.make_zip_file (path, filename_format, name_values);
+                       written += i.screen_kdms.size();
+               }
        }
+
+       return written;
 }
 
 /** 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
@@ -158,20 +208,21 @@ 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);
-               boost::algorithm::replace_all (subject, "$START_TIME", name_values['f']);
-               boost::algorithm::replace_all (subject, "$END_TIME", name_values['t']);
+               boost::algorithm::replace_all (subject, "$START_TIME", name_values['b']);
+               boost::algorithm::replace_all (subject, "$END_TIME", name_values['e']);
                boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.cinema->name);
 
                string body = config->kdm_email().c_str();
                boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name);
-               boost::algorithm::replace_all (body, "$START_TIME", name_values['f']);
-               boost::algorithm::replace_all (body, "$END_TIME", name_values['t']);
+               boost::algorithm::replace_all (body, "$START_TIME", name_values['b']);
+               boost::algorithm::replace_all (body, "$END_TIME", name_values['e']);
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
                string screens;
@@ -189,13 +240,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);
@@ -205,6 +257,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);