BOOST_FOREACH.

[dcpomatic.git] / src / lib / send_kdm_email_job.cc

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index b06704545ab4e2321f7018938c20952770f15cd5..8ed08f2a39c6f666ed9c2f30712c5fc5a421b8e2 100644 (file)
--- 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,43 +20,70 @@
 
 #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,
-       KDMFilenameFormat 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 ('f');
-       if (i == _name_values.end() || i->second.empty ()) {
+       optional<string> 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 %2"), *f);
 }
 
 string
@@ -69,7 +96,7 @@ void
 SendKDMEmailJob::run ()
 {
        set_progress_unknown ();
-       CinemaKDMs::email (_cinema_kdms, _name_format, _name_values, _cpl_name, _log);
+       email (_kdms, _container_name_format, _filename_format, _cpl_name);
        set_progress (1);
        set_state (FINISHED_OK);
 }