X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=8ed08f2a39c6f666ed9c2f30712c5fc5a421b8e2;hp=541307f5acc8ace90d682b5b396046ddcdcbab2e;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 541307f5a..8ed08f2a3 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -1,71 +1,102 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "send_kdm_email_job.h"
 #include "compose.hpp"
+#include "kdm_with_metadata.h"
 #include "film.h"
-#include "kdm.h"
+#include <list>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
 
 SendKDMEmailJob::SendKDMEmailJob (
-	shared_ptr<const Film> f,
-	list<shared_ptr<Screen> > screens,
-	boost::filesystem::path dcp,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
-	dcp::Formulation formulation
+	list<KDMWithMetadataPtr> kdms,
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
+	string cpl_name
 	)
-	: Job (f)
-	, _screens (screens)
-	, _dcp (dcp)
-	, _from (from)
-	, _to (to)
-	, _formulation (formulation)
+	: Job (shared_ptr<Film>())
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
+	, _cpl_name (cpl_name)
+{
+	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
 {
-	return String::compose (_("Email KDMs for %1"), _film->name());
+	optional<string> f = _kdms.front().front()->get('f');
+	if (!f || f->empty()) {
+		return _("Email KDMs");
+	}
+
+	return String::compose (_("Email KDMs for %2"), *f);
+}
+
+string
+SendKDMEmailJob::json_name () const
+{
+	return N_("send_kdm_email");
 }
 
 void
 SendKDMEmailJob::run ()
 {
-	try {
-		
-		set_progress_unknown ();
-		email_kdms (_film, _screens, _dcp, _from, _to, _formulation);
-		set_progress (1);
-		set_state (FINISHED_OK);
-		
-	} catch (std::exception& e) {
-
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		throw;
-	}
+	set_progress_unknown ();
+	email (_kdms, _container_name_format, _filename_format, _cpl_name);
+	set_progress (1);
+	set_state (FINISHED_OK);
 }