X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=eff77ce43bfa6b6467876fb24705df093171878c;hb=422eb00b446d90e3588ae6793f676917ee195cca;hp=5b37d8c87e2626d5969b4ea7f81b42022b6494b5;hpb=bf0b74f67b87b2361529cefaae45533e5935a9c4;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 5b37d8c87..eff77ce43 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013 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/>.
 
 */
 
@@ -29,19 +30,28 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
+/** @param cinema_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.
+ *  @param log Log to write to, or 0.
+ */
 SendKDMEmailJob::SendKDMEmailJob (
-	string film_name,
+	list<CinemaKDMs> cinema_kdms,
+	dcp::NameFormat container_name_format,
+	dcp::NameFormat filename_format,
+	dcp::NameFormat::Map name_values,
 	string cpl_name,
-	boost::posix_time::ptime from,
-	boost::posix_time::ptime to,
-	list<CinemaKDMs> cinema_kdms
+	shared_ptr<Log> log
 	)
 	: Job (shared_ptr<Film>())
-	, _film_name (film_name)
+	, _container_name_format (container_name_format)
+	, _filename_format (filename_format)
+	, _name_values (name_values)
 	, _cpl_name (cpl_name)
-	, _from (from)
-	, _to (to)
 	, _cinema_kdms (cinema_kdms)
+	, _log (log)
 {
 
 }
@@ -49,11 +59,12 @@ SendKDMEmailJob::SendKDMEmailJob (
 string
 SendKDMEmailJob::name () const
 {
-	if (_film_name.empty ()) {
+	dcp::NameFormat::Map::const_iterator i = _name_values.find ('f');
+	if (i == _name_values.end() || i->second.empty ()) {
 		return _("Email KDMs");
 	}
 
-	return String::compose (_("Email KDMs for %1"), _film_name);
+	return String::compose (_("Email KDMs for %1"), i->second);
 }
 
 string
@@ -66,7 +77,7 @@ void
 SendKDMEmailJob::run ()
 {
 	set_progress_unknown ();
-	CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms,	_from, _to);
+	CinemaKDMs::email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name, _log);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }