/*
- Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::list;
using std::string;
using std::vector;
+using std::pair;
using boost::shared_ptr;
using boost::bind;
using boost::optional;
screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
}
- dcp::NameFormat::Map name_values;
- name_values['f'] = decrypted.content_title_text();
- name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day();
- name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day();
-
- if (_output->write_to()) {
- int written = ScreenKDM::write_files (
- screen_kdms, _output->directory(), _output->name_format(), name_values,
- bind (&DOMFrame::confirm_overwrite, this, _1)
- );
+ pair<shared_ptr<Job>, int> result = _output->make (
+ screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr<Log> ()
+ );
- if (written > 0) {
- /* XXX: proper plural form support in wxWidgets? */
- wxString s = written == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
- message_dialog (
- this,
- wxString::Format (s, written, std_to_wx(_output->directory().string()).data())
- );
- }
- } else {
- string film_name = decrypted.annotation_text().get_value_or ("");
- if (film_name.empty ()) {
- film_name = decrypted.content_title_text ();
- }
- shared_ptr<Job> job (new SendKDMEmailJob (
- CinemaKDMs::collect (screen_kdms),
- _output->name_format(),
- name_values,
- decrypted.content_title_text(),
- shared_ptr<Log> ()
- ));
-
- JobManager::instance()->add (job);
+ if (result.first) {
+ JobManager::instance()->add (result.first);
if (_job_view) {
_job_view->Destroy ();
_job_view = 0;
}
- _job_view = new JobViewDialog (this, _("Send KDM emails"), job);
+ _job_view = new JobViewDialog (this, _("Send KDM emails"), result.first);
_job_view->ShowModal ();
}
+
+ if (result.second > 0) {
+ /* XXX: proper plural form support in wxWidgets? */
+ wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
+ message_dialog (
+ this,
+ wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
+ );
+ }
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
- _output->save_kdm_name_format ();
-
- try {
- list<ScreenKDM> screen_kdms = film->make_kdms (
- _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
- );
-
- dcp::NameFormat::Map name_values;
- name_values['f'] = film->name();
- name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day();
- name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day();
-
- if (_output->write_to ()) {
- ScreenKDM::write_files (
- screen_kdms,
- _output->directory(),
- _output->name_format(),
- name_values,
- bind (&KDMDialog::confirm_overwrite, this, _1)
- );
- }
-
- if (_output->email ()) {
-
- list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
-
- bool ok = true;
-
- if (Config::instance()->confirm_kdm_email ()) {
- list<string> emails;
- BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
- BOOST_FOREACH (string j, i.cinema->emails) {
- emails.push_back (j);
- }
- }
-
- ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
- if (d->ShowModal() == wxID_CANCEL) {
- ok = false;
- }
- }
-
- if (ok) {
- JobManager::instance()->add (
- shared_ptr<Job> (new SendKDMEmailJob (
- cinema_kdms,
- _output->name_format(),
- name_values,
- film->dcp_name(),
- film->log()
- ))
- );
- }
- }
- } catch (dcp::NotEncryptedError& e) {
- error_dialog (this, _("CPL's content is not encrypted."));
- } catch (exception& e) {
- error_dialog (this, e.what ());
- } catch (...) {
- error_dialog (this, _("An unknown exception occurred."));
+ list<ScreenKDM> screen_kdms = film->make_kdms (
+ _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
+ );
+
+ pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());
+ if (result.first) {
+ JobManager::instance()->add (result.first);
}
}
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
#include "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/cinema_kdms.h"
+#include "lib/send_kdm_email_job.h"
#include "kdm_output_panel.h"
+#include "kdm_timing_panel.h"
+#include "confirm_kdm_email_dialog.h"
#include "wx_util.h"
#include "name_format_editor.h"
+#include <dcp/exceptions.h>
#include <dcp/types.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#endif
#include <wx/stdpaths.h>
+using std::pair;
+using std::string;
+using std::list;
+using std::exception;
+using std::make_pair;
+using boost::shared_ptr;
+using boost::function;
+
KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
: wxPanel (parent, wxID_ANY)
{
_folder->Enable (_write_to->GetValue ());
}
-boost::filesystem::path
-KDMOutputPanel::directory () const
+pair<shared_ptr<Job>, int>
+KDMOutputPanel::make (
+ list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite, shared_ptr<Log> log
+ )
{
- return wx_to_std (_folder->GetPath ());
-}
+ Config::instance()->set_kdm_filename_format (_filename_format->get ());
+
+ int written = 0;
+ shared_ptr<Job> job;
+
+ try {
+ dcp::NameFormat::Map name_values;
+ name_values['f'] = name;
+ name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day();
+ name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day();
+
+ if (_write_to->GetValue ()) {
+ written = ScreenKDM::write_files (
+ screen_kdms,
+ directory(),
+ _filename_format->get(),
+ name_values,
+ confirm_overwrite
+ );
+ }
+
+ if (_email->GetValue ()) {
+
+ list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
+
+ bool ok = true;
+
+ if (Config::instance()->confirm_kdm_email ()) {
+ list<string> emails;
+ BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
+ BOOST_FOREACH (string j, i.cinema->emails) {
+ emails.push_back (j);
+ }
+ }
+
+ ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
+ if (d->ShowModal() == wxID_CANCEL) {
+ ok = false;
+ }
+ }
+
+ if (ok) {
+ job.reset (
+ new SendKDMEmailJob (
+ cinema_kdms,
+ _filename_format->get(),
+ name_values,
+ name,
+ log
+ )
+ );
+ }
+ }
+ } catch (dcp::NotEncryptedError& e) {
+ error_dialog (this, _("CPL's content is not encrypted."));
+ } catch (exception& e) {
+ error_dialog (this, e.what ());
+ } catch (...) {
+ error_dialog (this, _("An unknown exception occurred."));
+ }
-bool
-KDMOutputPanel::write_to () const
-{
- return _write_to->GetValue ();
-}
-
-bool
-KDMOutputPanel::email () const
-{
- return _email->GetValue ();
+ return make_pair (job, written);
}
dcp::Formulation
return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
}
-void
-KDMOutputPanel::save_kdm_name_format () const
-{
- Config::instance()->set_kdm_filename_format (name_format ());
-}
-
-dcp::NameFormat
-KDMOutputPanel::name_format () const
+boost::filesystem::path
+KDMOutputPanel::directory () const
{
- return _filename_format->get ();
+ return wx_to_std (_folder->GetPath ());
}
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "lib/screen_kdm.h"
#include "wx_util.h"
#include "name_format_editor.h"
#include <dcp/types.h>
class wxDirPickerCtrl;
class DirPickerCtrl;
+class KDMTimingPanel;
+class Job;
+class Log;
class KDMOutputPanel : public wxPanel
{
public:
KDMOutputPanel (wxWindow* parent, bool interop);
+ void setup_sensitivity ();
+
boost::filesystem::path directory () const;
- bool write_to () const;
- bool email () const;
dcp::Formulation formulation () const;
- dcp::NameFormat name_format () const;
- void setup_sensitivity ();
- void save_kdm_name_format () const;
+ std::pair<boost::shared_ptr<Job>, int> make (
+ std::list<ScreenKDM> screen_kdms,
+ std::string name,
+ KDMTimingPanel* timing,
+ boost::function<bool (boost::filesystem::path)> confirm_overwrite,
+ boost::shared_ptr<Log> log
+ );
private:
wxChoice* _type;
projects / dcpomatic.git / commitdiff