#include "lib/cinema_kdms.h"
#include "lib/config.h"
#include "lib/exceptions.h"
+#include "lib/emailer.h"
#include "lib/safe_stringstream.h"
#include <dcp/certificate.h>
#include <getopt.h>
cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n"
" -h, --help show this help\n"
" -o, --output output file or directory\n"
- " -f, --valid-from valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
- " -t, --valid-to valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n"
+ " -f, --valid-from valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
+ " -t, --valid-to valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n"
" -d, --valid-duration valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
" --formulation modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
" -z, --zip ZIP each cinema's KDMs into its own file\n"
if (cinemas) {
list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
- cout << (*i)->name << " (" << (*i)->email << ")\n";
+ cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
}
exit (EXIT_SUCCESS);
}
}
dcp::Certificate certificate (dcp::file_to_string (certificate_file));
- dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
+ dcp::EncryptedKDM kdm = film->make_kdm (certificate, vector<dcp::Certificate>(), cpl, valid_from.get(), valid_to.get(), formulation);
kdm.as_xml (output);
if (verbose) {
cout << "Generated KDM " << output << " for certificate.\n";
list<shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
list<shared_ptr<Cinema> >::const_iterator i = cinemas.begin();
- while (i != cinemas.end() && (*i)->name != cinema_name && (*i)->email != cinema_name) {
+ while (
+ i != cinemas.end() &&
+ (*i)->name != cinema_name &&
+ find ((*i)->emails.begin(), (*i)->emails.end(), cinema_name) == (*i)->emails.end()) {
+
++i;
}
try {
list<ScreenKDM> screen_kdms = film->make_kdms (
- (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+ (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
);
if (zip) {
- CinemaKDMs::write_zip_files (film, CinemaKDMs::collect (screen_kdms), output);
+ CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
if (verbose) {
cout << "Wrote ZIP files to " << output << "\n";
}
} else {
- ScreenKDM::write_files (film, screen_kdms, output);
+ ScreenKDM::write_files (film->name(), screen_kdms, output);
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";