projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some unnecessary methods.
[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 89bce9a1490c84735ee7d7b4725c7352cefbf3ca..1b476fa63e7312a1ea67710a45e2fc0a6c88b384 100644
(file)
--- a/
src/lib/send_kdm_email_job.cc
+++ b/
src/lib/send_kdm_email_job.cc
@@
-1,26
+1,28
@@
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
/*
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.
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
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 "film.h"
*/
#include "send_kdm_email_job.h"
#include "compose.hpp"
#include "film.h"
-#include "kdm.h"
+#include "cinema_kdms.h"
+#include <list>
#include "i18n.h"
#include "i18n.h"
@@
-28,42
+30,56
@@
using std::string;
using std::list;
using boost::shared_ptr;
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.
+ */
SendKDMEmailJob::SendKDMEmailJob (
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
+
list<CinemaKDMs> cinema_kdms
,
+
dcp::NameFormat container_name_format
,
+
dcp::NameFormat filename_format
,
+
dcp::NameFormat::Map name_values
,
+ string cpl_name
)
)
- : Job (f)
- , _screens (screens)
- , _dcp (dcp)
- , _from (from)
- , _to (to)
+ : Job (shared_ptr<Film>())
+ , _container_name_format (container_name_format)
+ , _filename_format (filename_format)
+ , _name_values (name_values)
+ , _cpl_name (cpl_name)
+ , _cinema_kdms (cinema_kdms)
{
}
{
}
+SendKDMEmailJob::~SendKDMEmailJob ()
+{
+ stop_thread ();
+}
+
string
SendKDMEmailJob::name () const
{
string
SendKDMEmailJob::name () const
{
- return String::compose (_("Email KDMs for %1"), _film->name());
+ 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"), i->second);
+}
+
+string
+SendKDMEmailJob::json_name () const
+{
+ return N_("send_kdm_email");
}
void
SendKDMEmailJob::run ()
{
}
void
SendKDMEmailJob::run ()
{
- try {
-
- set_progress_unknown ();
- email_kdms (_film, _screens, _dcp, _from, _to);
- set_progress (1);
- set_state (FINISHED_OK);
-
- } catch (std::exception& e) {
-
- set_progress (1);
- set_state (FINISHED_ERROR);
- throw;
- }
+ set_progress_unknown ();
+ CinemaKDMs::email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
+ set_progress (1);
+ set_state (FINISHED_OK);
}
}