X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=d4d13fa48d6f5d9865aaa7782ff9f9ce72cc86f4;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=3bf1887f49df2bdf12bf9bade02a2026a03fa7f8;hpb=fe9d2a290682021cd12a00bf21fa4db3012e2049;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 3bf1887f4..d4d13fa48 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,58 +18,93 @@
 
 */
 
+
 #include "send_kdm_email_job.h"
 #include "compose.hpp"
+#include "kdm_with_metadata.h"
 #include "film.h"
-#include "cinema_kdms.h"
 #include <list>
 
 #include "i18n.h"
 
+
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
+
 
-/** @param log Log to write to, or 0 */
 SendKDMEmailJob::SendKDMEmailJob (
-	list<CinemaKDMs> cinema_kdms,
-	KDMNameFormat name_format,
-	dcp::NameFormat::Map name_values,
-	string cpl_name,
-	shared_ptr<Log> log
+	list<KDMWithMetadataPtr> kdms,
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
+	string cpl_name
 	)
 	: Job (shared_ptr<Film>())
-	, _name_format (name_format)
-	, _name_values (name_values)
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
 	, _cpl_name (cpl_name)
-	, _cinema_kdms (cinema_kdms)
-	, _log (log)
+{
+	for (auto i: kdms) {
+		list<KDMWithMetadataPtr> s;
+		s.push_back (i);
+		_kdms.push_back (s);
+	}
+}
+
+
+/** @param kdms KDMs to email.
+ *  @param container_name_format Format to ues for folders / ZIP files.
+ *  @param filename_format Format to use for filenames.
+ *  @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.
+ */
+SendKDMEmailJob::SendKDMEmailJob (
+	list<list<KDMWithMetadataPtr> > kdms,
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
+	string cpl_name
+	)
+	: Job (shared_ptr<Film>())
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
+	, _cpl_name (cpl_name)
+	, _kdms (kdms)
 {
 
 }
 
+
+SendKDMEmailJob::~SendKDMEmailJob ()
+{
+	stop_thread ();
+}
+
+
 string
 SendKDMEmailJob::name () const
 {
-	dcp::NameFormat::Map::const_iterator i = _name_values.find ("film_name");
-	if (i == _name_values.end() || i->second.empty ()) {
+	auto f = _kdms.front().front()->get('f');
+	if (!f || f->empty()) {
 		return _("Email KDMs");
 	}
 
-	return String::compose (_("Email KDMs for %1"), i->second);
+	return String::compose (_("Email KDMs for %1"), *f);
 }
 
+
 string
 SendKDMEmailJob::json_name () const
 {
 	return N_("send_kdm_email");
 }
 
+
 void
 SendKDMEmailJob::run ()
 {
 	set_progress_unknown ();
-	CinemaKDMs::email (_cinema_kdms, _name_format, _name_values, _cpl_name, _log);
+	send_emails (_kdms, _container_name_format, _filename_format, _cpl_name);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }