#include "lib/config.h"
#include "lib/exceptions.h"
#include "lib/emailer.h"
-#include "lib/safe_stringstream.h"
+#include <locked_sstream.h>
#include <dcp/certificate.h>
#include <getopt.h>
#include <iostream>
static boost::posix_time::time_duration
duration_from_string (string d)
{
- SafeStringStream s (d);
+ locked_stringstream s (d);
int N;
string unit;
s >> N >> unit;
}
dcp::Certificate certificate (dcp::file_to_string (certificate_file));
- dcp::EncryptedKDM kdm = film->make_kdm (certificate, vector<dcp::Certificate>(), cpl, valid_from.get(), valid_to.get(), formulation);
+ dcp::EncryptedKDM kdm = film->make_kdm (
+ certificate, vector<dcp::Certificate>(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+ );
kdm.as_xml (output);
if (verbose) {
cout << "Generated KDM " << output << " for certificate.\n";
output = ".";
}
+ NameFormat::Map values;
+ values["film_name"] = film->name();
+ values["from"] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day();
+ values["to"] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day();
+
try {
list<ScreenKDM> screen_kdms = film->make_kdms (
(*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
);
if (zip) {
- CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
+ CinemaKDMs::write_zip_files (
+ CinemaKDMs::collect (screen_kdms),
+ output,
+ Config::instance()->kdm_filename_format(),
+ values
+ );
if (verbose) {
cout << "Wrote ZIP files to " << output << "\n";
}
} else {
- ScreenKDM::write_files (film->name(), screen_kdms, output);
+ ScreenKDM::write_files (screen_kdms, output, Config::instance()->kdm_filename_format(), values);
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";