X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fkdm.cc;h=a2ed1be73498dd924752f998fa154e479ae18cb9;hb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;hp=cf551285bb5444a476bd5b5f319b3ac556f056fd;hpb=5323e65637177f9003a3a6fc6d16318efef250a6;p=dcpomatic.git

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index cf551285b..a2ed1be73 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -21,7 +21,8 @@
 #include <boost/shared_ptr.hpp>
 #include <quickmail.h>
 #include <zip.h>
-#include <libdcp/kdm.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/types.h>
 #include "kdm.h"
 #include "cinema.h"
 #include "exceptions.h"
@@ -32,17 +33,18 @@
 using std::list;
 using std::string;
 using std::stringstream;
+using std::cout;
 using boost::shared_ptr;
 
 struct ScreenKDM
 {
-	ScreenKDM (shared_ptr<Screen> s, libdcp::KDM k)
+	ScreenKDM (shared_ptr<Screen> s, dcp::EncryptedKDM k)
 		: screen (s)
 		, kdm (k)
 	{}
 	
 	shared_ptr<Screen> screen;
-	libdcp::KDM kdm;
+	dcp::EncryptedKDM kdm;
 };
 
 static string
@@ -102,17 +104,18 @@ static list<ScreenKDM>
 make_screen_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	boost::filesystem::path cpl,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
+	dcp::Formulation formulation
 	)
 {
-	list<libdcp::KDM> kdms = film->make_kdms (screens, dcp, from, to);
+	list<dcp::EncryptedKDM> kdms = film->make_kdms (screens, cpl, from, to, formulation);
 	   
 	list<ScreenKDM> screen_kdms;
 	
 	list<shared_ptr<Screen> >::iterator i = screens.begin ();
-	list<libdcp::KDM>::iterator j = kdms.begin ();
+	list<dcp::EncryptedKDM>::iterator j = kdms.begin ();
 	while (i != screens.end() && j != kdms.end ()) {
 		screen_kdms.push_back (ScreenKDM (*i, *j));
 		++i;
@@ -126,12 +129,13 @@ static list<CinemaKDMs>
 make_cinema_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	boost::filesystem::path cpl,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
+	dcp::Formulation formulation
 	)
 {
-	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
+	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, cpl, from, to, formulation);
 	list<CinemaKDMs> cinema_kdms;
 
 	while (!screen_kdms.empty ()) {
@@ -164,17 +168,21 @@ make_cinema_kdms (
 	return cinema_kdms;
 }
 
+/** @param from KDM from time in local time.
+ *  @param to KDM to time in local time.
+ */
 void
 write_kdm_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	boost::filesystem::path cpl,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
+	dcp::Formulation formulation,
 	boost::filesystem::path directory
 	)
 {
-	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, dcp, from, to);
+	list<ScreenKDM> screen_kdms = make_screen_kdms (film, screens, cpl, from, to, formulation);
 
 	/* Write KDMs to the specified directory */
 	for (list<ScreenKDM>::iterator i = screen_kdms.begin(); i != screen_kdms.end(); ++i) {
@@ -188,13 +196,14 @@ void
 write_kdm_zip_files (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
+	boost::filesystem::path cpl,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
+	dcp::Formulation formulation,
 	boost::filesystem::path directory
 	)
 {
-	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
+	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to, formulation);
 
 	for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
 		boost::filesystem::path path = directory;
@@ -207,12 +216,13 @@ void
 email_kdms (
 	shared_ptr<const Film> film,
 	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to
+	boost::filesystem::path cpl,
+	dcp::LocalTime from,
+	dcp::LocalTime to,
+	dcp::Formulation formulation
 	)
 {
-	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, dcp, from, to);
+	list<CinemaKDMs> cinema_kdms = make_cinema_kdms (film, screens, cpl, from, to, formulation);
 
 	for (list<CinemaKDMs>::const_iterator i = cinema_kdms.begin(); i != cinema_kdms.end(); ++i) {
 		
@@ -223,17 +233,38 @@ email_kdms (
 		/* Send email */
 		
 		quickmail_initialize ();
-		quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), "KDM delivery");
+
+		stringstream start;
+		start << from.date() << " " << from.time_of_day();
+		stringstream end;
+		end << to.date() << " " << to.time_of_day();
+		
+		string subject = Config::instance()->kdm_subject();
+		boost::algorithm::replace_all (subject, "$CPL_NAME", film->dcp_name ());
+		boost::algorithm::replace_all (subject, "$START_TIME", start.str ());
+		boost::algorithm::replace_all (subject, "$END_TIME", end.str ());
+		boost::algorithm::replace_all (subject, "$CINEMA_NAME", i->cinema->name);
+		quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), subject.c_str ());
+		
 		quickmail_add_to (mail, i->cinema->email.c_str ());
+		if (!Config::instance()->kdm_cc().empty ()) {
+			quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ());
+		}
+		if (!Config::instance()->kdm_bcc().empty ()) {
+			quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ());
+		}
 		
 		string body = Config::instance()->kdm_email().c_str();
 		boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
-		stringstream start;
-		start << from.date() << " " << from.time_of_day();
 		boost::algorithm::replace_all (body, "$START_TIME", start.str ());
-		stringstream end;
-		end << to.date() << " " << to.time_of_day();
 		boost::algorithm::replace_all (body, "$END_TIME", end.str ());
+		boost::algorithm::replace_all (body, "$CINEMA_NAME", i->cinema->name);
+		
+		stringstream screens;
+		for (list<ScreenKDM>::const_iterator j = i->screen_kdms.begin(); j != i->screen_kdms.end(); ++j) {
+			screens << j->screen->name << ", ";
+		}
+		boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
 
 		quickmail_set_body (mail, body.c_str());
 		quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");