X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=32879cf6b5763355378e6ddc58432b8095d8ef52;hp=c5057873417622c1cb24b8276cdcde695e0ad661;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=fbe2784c136fa1550815babfce89589f66b35a29

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index c50578734..32879cf6b 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -27,7 +27,7 @@
 #include "emailer.h"
 #include "compose.hpp"
 #include "log.h"
-#include "kdm_name_format.h"
+#include "dcpomatic_log.h"
 #include <zip.h>
 #include <boost/foreach.hpp>
 
@@ -38,9 +38,10 @@ 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, KDMNameFormat name_format, dcp::NameFormat::Map name_values) const
+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);
@@ -55,8 +56,8 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_
 
 	name_values['c'] = cinema->name;
 
-	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
-		shared_ptr<string> kdm (new string (i.kdm.as_xml ()));
+	BOOST_FOREACH (shared_ptr<ScreenKDM> i, screen_kdms) {
+		shared_ptr<string> 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);
@@ -64,8 +65,9 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_
 			throw runtime_error ("could not create ZIP source");
 		}
 
-		name_values['s'] = i.screen->name;
-		string const name = name_format.get(name_values) + ".xml";
+		name_values['s'] = i->screen->name;
+		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");
 		}
@@ -80,7 +82,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_
  *  CinemaKDM contains the KDMs for its cinema.
  */
 list<CinemaKDMs>
-CinemaKDMs::collect (list<ScreenKDM> screen_kdms)
+CinemaKDMs::collect (list<shared_ptr<ScreenKDM> > screen_kdms)
 {
 	list<CinemaKDMs> cinema_kdms;
 
@@ -90,17 +92,17 @@ CinemaKDMs::collect (list<ScreenKDM> screen_kdms)
 
 		CinemaKDMs ck;
 
-		list<ScreenKDM>::iterator i = screen_kdms.begin ();
-		ck.cinema = i->screen->cinema;
+		list<shared_ptr<ScreenKDM> >::iterator i = screen_kdms.begin ();
+		ck.cinema = (*i)->screen->cinema;
 		ck.screen_kdms.push_back (*i);
-		list<ScreenKDM>::iterator j = i;
+		list<shared_ptr<ScreenKDM> >::iterator j = i;
 		++i;
 		screen_kdms.remove (*j);
 
 		while (i != screen_kdms.end ()) {
-			if (i->screen->cinema == ck.cinema) {
+			if ((*i)->screen->cinema == ck.cinema) {
 				ck.screen_kdms.push_back (*i);
-				list<ScreenKDM>::iterator j = i;
+				list<shared_ptr<ScreenKDM> >::iterator j = i;
 				++i;
 				screen_kdms.remove (*j);
 			} else {
@@ -114,36 +116,83 @@ 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,
-	KDMNameFormat 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 log Log to write email session transcript to, or 0.
+ *  @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.
  */
 void
 CinemaKDMs::email (
 	list<CinemaKDMs> cinema_kdms,
-	KDMNameFormat 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 ();
@@ -157,29 +206,34 @@ 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);
-		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);
 
-		locked_stringstream screens;
-		BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
-			screens << j.screen->name << ", ";
+		string screens;
+		BOOST_FOREACH (shared_ptr<ScreenKDM> j, i.screen_kdms) {
+			screens += j->screen->name + ", ";
 		}
-		boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
+		boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
 
 		Emailer email (config->kdm_from(), i.cinema->emails, subject, body);
 
@@ -190,27 +244,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);
 	}
 }