out (" -e, --email email KDMs to cinemas");
out (" -z, --zip ZIP each cinema's KDMs into its own file");
out (" -v, --verbose be verbose");
- out (" -c, --cinema specify a cinema, either by name or email address");
- out (" -S, --screen screen description");
+ out (" -c, --cinema cinema name (when using -C) or name/email (to filter cinemas)");
+ out (" -S, --screen screen name (when using -C) or screen name (to filter screens when using -c)");
out (" -C, --certificate file containing projector certificate");
out (" -T, --trusted-device file containing a trusted device's certificate");
out (" --list-cinemas list known cinemas from the DCP-o-matic settings");
static
void
from_film (
- list<shared_ptr<Screen>> screens,
+ vector<shared_ptr<Screen>> screens,
boost::filesystem::path film_dir,
bool verbose,
boost::filesystem::path output,
auto cpl = cpls.front().cpl_file;
+ std::vector<KDMCertificatePeriod> period_checks;
+
try {
list<KDMWithMetadataPtr> kdms;
for (auto i: screens) {
- auto p = kdm_for_screen (film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+ std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpl](dcp::LocalTime begin, dcp::LocalTime end) {
+ return film->make_kdm(cpl, begin, end);
+ };
+ auto p = kdm_for_screen(make_kdm, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio, period_checks);
if (p) {
kdms.push_back (p);
}
}
+
+
+ if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OUTSIDE_CERTIFICATE) != period_checks.end()) {
+ throw KDMCLIError(
+ "Some KDMs would have validity periods which are completely outside the recipient certificate periods. Such KDMs are very unlikely to work, so will not be created."
+ );
+ }
+
+ if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE) != period_checks.end()) {
+ out("For some of these KDMs the recipient certificate's validity period will not cover the whole of the KDM validity period. This might cause problems with the KDMs.");
+ }
+
write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
if (email) {
send_emails ({kdms}, container_name_format, filename_format, film->dcp_name(), {});
static
void
from_dkdm (
- list<shared_ptr<Screen>> screens,
+ vector<shared_ptr<Screen>> screens,
dcp::DecryptedKDM dkdm,
bool verbose,
boost::filesystem::path output,
int const offset_hour = i->cinema ? i->cinema->utc_offset_hour() : 0;
int const offset_minute = i->cinema ? i->cinema->utc_offset_minute() : 0;
- dcp::LocalTime begin(valid_from, offset_hour, offset_minute);
- dcp::LocalTime end(valid_to, offset_hour, offset_minute);
+ dcp::LocalTime begin(valid_from, dcp::UTCOffset(offset_hour, offset_minute));
+ dcp::LocalTime end(valid_to, dcp::UTCOffset(offset_hour, offset_minute));
auto const kdm = kdm_from_dkdm(
dkdm,
name_values['e'] = end.date() + " " + end.time_of_day(true, false);
name_values['i'] = kdm.cpl_id();
- kdms.push_back (make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema ? i->cinema->emails : list<string>(), kdm));
+ kdms.push_back(make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema ? i->cinema->emails : vector<string>(), kdm));
}
write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
if (email) {
optional<string> cinema_name;
shared_ptr<Cinema> cinema;
optional<boost::filesystem::path> certificate;
- string screen;
- list<shared_ptr<Screen>> screens;
+ optional<string> screen;
+ vector<shared_ptr<Screen>> screens;
optional<dcp::EncryptedKDM> dkdm;
optional<boost::posix_time::ptime> valid_from;
optional<boost::posix_time::ptime> valid_to;
program_name = argv[0];
+ /* Reset getopt() so we can call this method several times in one test process */
+ optind = 1;
+
int option_index = 0;
while (true) {
static struct option long_options[] = {
(for lookup) and by creating a Cinema which the next Screen will be added to.
*/
cinema_name = optarg;
- cinema = make_shared<Cinema>(optarg, list<string>(), "", 0, 0);
+ cinema = make_shared<Cinema>(optarg, vector<string>(), "", 0, 0);
break;
case 'S':
+ /* Similarly, this could be the name of a new (temporary) screen or the name of a screen
+ * to search for.
+ */
screen = optarg;
break;
case 'C':
if (certificate) {
/* Make a new screen and add it to the current cinema */
dcp::CertificateChain chain(dcp::file_to_string(*certificate));
- auto screen_to_add = std::make_shared<Screen>(screen, "", chain.leaf(), boost::none, vector<TrustedDevice>());
+ auto screen_to_add = std::make_shared<Screen>(screen.get_value_or(""), "", chain.leaf(), boost::none, vector<TrustedDevice>());
if (cinema) {
cinema->add_screen(screen_to_add);
}
}
screens = find_cinema (*cinema_name)->screens ();
+ if (screen) {
+ screens.erase(std::remove_if(screens.begin(), screens.end(), [&screen](shared_ptr<Screen> s) { return s->name != *screen; }), screens.end());
+ }
}
if (duration_string) {
projects / dcpomatic.git / blobdiff