Move some functions to kdm_with_metadata

[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 82fb55d802a8566b494b79de9466dedff552e3d9..7b4d349f3d7ca767c799f02d9be8feb335dacbcd 100644 (file)
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -20,8 +20,8 @@
 
 #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"
@@ -30,34 +30,43 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
-/** @param log Log to write to, or 0 */
+/** @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.
+ */
 SendKDMEmailJob::SendKDMEmailJob (
-       string film_name,
-       string cpl_name,
-       boost::posix_time::ptime from,
-       boost::posix_time::ptime to,
-       list<CinemaKDMs> cinema_kdms,
-       shared_ptr<Log> log
+       list<list<KDMWithMetadataPtr> > cinema_kdms,
+       dcp::NameFormat container_name_format,
+       dcp::NameFormat filename_format,
+       dcp::NameFormat::Map name_values,
+       string cpl_name
        )
        : 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)
 {
 
 }
 
+SendKDMEmailJob::~SendKDMEmailJob ()
+{
+       stop_thread ();
+}
+
 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
@@ -70,7 +79,7 @@ void
 SendKDMEmailJob::run ()
 {
        set_progress_unknown ();
-       CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms, dcp::LocalTime (_from), dcp::LocalTime (_to), _log);
+       email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
        set_progress (1);
        set_state (FINISHED_OK);
 }