X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.cc;h=f7ff8443536d8ad7cfa92b70c082946d461beb17;hb=HEAD;hp=e3c0d9204a065aee1c3f31d202f54d6c265357f6;hpb=a6f2b7b15a4d80c9bcd763765fc7ccd7407f6820;p=dcpomatic.git

diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc
index e3c0d9204..f7ff84435 100644
--- a/src/lib/kdm_with_metadata.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -23,11 +23,13 @@
 #include "config.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
-#include "emailer.h"
+#include "email.h"
 #include "kdm_with_metadata.h"
 #include "screen.h"
 #include "util.h"
 #include "zipper.h"
+#include <dcp/file.h>
+#include <dcp/filesystem.h>
 
 #include "i18n.h"
 
@@ -37,6 +39,7 @@ using std::function;
 using std::list;
 using std::shared_ptr;
 using std::string;
+using std::vector;
 using boost::optional;
 
 
@@ -60,14 +63,14 @@ write_files (
 		return written;
 	}
 
-	if (!boost::filesystem::exists (directory)) {
-		boost::filesystem::create_directories (directory);
+	if (!dcp::filesystem::exists(directory)) {
+		dcp::filesystem::create_directories(directory);
 	}
 
 	/* Write KDMs to the specified directory */
 	for (auto i: kdms) {
-		auto out = fix_long_path(directory / careful_string_filter(name_format.get(i->name_values(), ".xml")));
-		if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
+		auto out = directory / careful_string_filter(name_format.get(i->name_values(), ".xml"));
+		if (!dcp::filesystem::exists(out) || confirm_overwrite(out)) {
 			i->kdm_as_xml (out);
 			++written;
 		}
@@ -145,14 +148,14 @@ write_directories (
 {
 	int written = 0;
 
-	for (auto const& i: kdms) {
+	for (auto const& kdm: kdms) {
 		auto path = directory;
-		path /= container_name_format.get(i.front()->name_values(), "", "s");
-		if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
-			boost::filesystem::create_directories (path);
-			write_files (i, path, filename_format, confirm_overwrite);
+		path /= container_name_format.get(kdm.front()->name_values(), "", "s");
+		if (!dcp::filesystem::exists(path) || confirm_overwrite(path)) {
+			dcp::filesystem::create_directories(path);
+			write_files(kdm, path, filename_format, confirm_overwrite);
+			written += kdm.size();
 		}
-		written += i.size();
 	}
 
 	return written;
@@ -171,16 +174,16 @@ write_zip_files (
 {
 	int written = 0;
 
-	for (auto const& i: kdms) {
+	for (auto const& kdm: kdms) {
 		auto path = directory;
-		path /= container_name_format.get(i.front()->name_values(), ".zip", "s");
-		if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
-			if (boost::filesystem::exists (path)) {
+		path /= container_name_format.get(kdm.front()->name_values(), ".zip", "s");
+		if (!dcp::filesystem::exists(path) || confirm_overwrite(path)) {
+			if (dcp::filesystem::exists(path)) {
 				/* Creating a new zip file over an existing one is an error */
-				boost::filesystem::remove (path);
+				dcp::filesystem::remove(path);
 			}
-			make_zip_file (i, path, filename_format);
-			written += i.size();
+			make_zip_file(kdm, path, filename_format);
+			written += kdm.size();
 		}
 	}
 
@@ -200,74 +203,86 @@ send_emails (
 	list<list<KDMWithMetadataPtr>> kdms,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
-	string cpl_name
+	string cpl_name,
+	vector<string> extra_addresses
 	)
 {
 	auto config = Config::instance ();
 
 	if (config->mail_server().empty()) {
-		throw NetworkError (_("No mail server configured in preferences"));
+		throw MissingConfigurationError(_("No outgoing mail server configured in the Email tab of preferences"));
 	}
 
-	for (auto const& i: kdms) {
+	if (config->kdm_from().empty()) {
+		throw MissingConfigurationError(_("No from address configured in the KDM Email tab of preferences"));
+	}
 
-		if (i.front()->emails().empty()) {
-			continue;
-		}
+	for (auto const& kdms_for_cinema: kdms) {
+
+		auto first = kdms_for_cinema.front();
 
 		auto zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
-		boost::filesystem::create_directories (zip_file);
-		zip_file /= container_name_format.get(i.front()->name_values(), ".zip");
-		make_zip_file (i, zip_file, filename_format);
-
-		auto subject = config->kdm_subject();
-		boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
-		boost::algorithm::replace_all (subject, "$START_TIME", i.front()->get('b').get_value_or(""));
-		boost::algorithm::replace_all (subject, "$END_TIME", i.front()->get('e').get_value_or(""));
-		boost::algorithm::replace_all (subject, "$CINEMA_NAME", i.front()->get('c').get_value_or(""));
-
-		auto body = config->kdm_email();
-		boost::algorithm::replace_all (body, "$CPL_NAME", cpl_name);
-		boost::algorithm::replace_all (body, "$START_TIME", i.front()->get('b').get_value_or(""));
-		boost::algorithm::replace_all (body, "$END_TIME", i.front()->get('e').get_value_or(""));
-		boost::algorithm::replace_all (body, "$CINEMA_NAME", i.front()->get('c').get_value_or(""));
-
-		string screens;
-		for (auto j: i) {
-			auto screen_name = j->get('s');
-			if (screen_name) {
-				screens += *screen_name + ", ";
+		dcp::filesystem::create_directories(zip_file);
+		zip_file /= container_name_format.get(first->name_values(), ".zip");
+		make_zip_file (kdms_for_cinema, zip_file, filename_format);
+
+		auto substitute_variables = [cpl_name, first](string target) {
+			boost::algorithm::replace_all(target, "$CPL_NAME", cpl_name);
+			boost::algorithm::replace_all(target, "$START_TIME", first->get('b').get_value_or(""));
+			boost::algorithm::replace_all(target, "$END_TIME", first->get('e').get_value_or(""));
+			boost::algorithm::replace_all(target, "$CINEMA_NAME", first->get('c').get_value_or(""));
+			boost::algorithm::replace_all(target, "$CINEMA_SHORT_NAME", first->get('c').get_value_or("").substr(0, 14));
+			return target;
+		};
+
+		auto subject = substitute_variables(config->kdm_subject());
+		auto body = substitute_variables(config->kdm_email());
+
+		vector<string> screens;
+		for (auto kdm: kdms_for_cinema) {
+			if (auto screen_name = kdm->get('s')) {
+				screens.push_back(*screen_name);
 			}
 		}
-		boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
+		boost::algorithm::replace_all(body, "$SCREENS", screen_names_to_string(screens));
 
-		Emailer email (config->kdm_from(), i.front()->emails(), subject, body);
+		auto emails = first->emails();
+		std::copy(extra_addresses.begin(), extra_addresses.end(), std::back_inserter(emails));
+		if (emails.empty()) {
+			continue;
+		}
 
-		for (auto i: config->kdm_cc()) {
-			email.add_cc (i);
+		Email email(config->kdm_from(), { emails.front() }, subject, body);
+
+		/* Use CC for the second and subsequent email addresses, so we seem less spammy (#2310) */
+		for (auto cc = std::next(emails.begin()); cc != emails.end(); ++cc) {
+			email.add_cc(*cc);
+		}
+
+		for (auto cc: config->kdm_cc()) {
+			email.add_cc (cc);
 		}
 		if (!config->kdm_bcc().empty()) {
 			email.add_bcc (config->kdm_bcc());
 		}
 
-		email.add_attachment (zip_file, container_name_format.get(i.front()->name_values(), ".zip"), "application/zip");
+		email.add_attachment (zip_file, container_name_format.get(first->name_values(), ".zip"), "application/zip");
+		dcp::filesystem::remove(zip_file);
+
+		auto log_details = [](Email& 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);
+		};
 
 		try {
 			email.send (config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password());
 		} catch (...) {
-			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);
+			log_details (email);
 			throw;
 		}
 
-		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);
+		log_details (email);
 	}
 }