X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fkdm_cli.cc;h=05a59142f1f037bf77f0fbcbb50e626eb04ed791;hp=8086fc4b7ea87e20fc39ba734dedda204a8db8ad;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=1871ff804558499e85100815dce103d5b31a95ae diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc index 8086fc4b7..05a59142f 100644 --- a/src/lib/kdm_cli.cc +++ b/src/lib/kdm_cli.cc @@ -70,8 +70,8 @@ help (std::function out) 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"); @@ -203,7 +203,7 @@ find_cinema (string cinema_name) static void from_film ( - list> screens, + vector> screens, boost::filesystem::path film_dir, bool verbose, boost::filesystem::path output, @@ -240,17 +240,34 @@ from_film ( auto cpl = cpls.front().cpl_file; + std::vector period_checks; + try { list 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 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()); + send_emails ({kdms}, container_name_format, filename_format, film->dcp_name(), {}); } } catch (FileError& e) { throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string())); @@ -329,7 +346,7 @@ kdm_from_dkdm ( static void from_dkdm ( - list> screens, + vector> screens, dcp::DecryptedKDM dkdm, bool verbose, boost::filesystem::path output, @@ -354,8 +371,11 @@ from_dkdm ( continue; } - dcp::LocalTime begin(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); - dcp::LocalTime end(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + 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, dcp::UTCOffset(offset_hour, offset_minute)); + dcp::LocalTime end(valid_to, dcp::UTCOffset(offset_hour, offset_minute)); auto const kdm = kdm_from_dkdm( dkdm, @@ -369,18 +389,18 @@ from_dkdm ( ); dcp::NameFormat::Map name_values; - name_values['c'] = i->cinema->name; + name_values['c'] = i->cinema ? i->cinema->name : ""; name_values['s'] = i->name; - name_values['f'] = dkdm.annotation_text().get_value_or(""); + name_values['f'] = kdm.content_title_text(); name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); name_values['e'] = end.date() + " " + end.time_of_day(true, false); name_values['i'] = kdm.cpl_id(); - kdms.push_back (make_shared(name_values, i->cinema.get(), i->cinema->emails, kdm)); + kdms.push_back(make_shared(name_values, i->cinema.get(), i->cinema ? i->cinema->emails : vector(), kdm)); } write_files (kdms, zip, output, container_name_format, filename_format, verbose, out); if (email) { - send_emails ({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or("")); + send_emails ({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or(""), {}); } } catch (FileError& e) { throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string())); @@ -419,8 +439,9 @@ try auto filename_format = Config::instance()->kdm_filename_format(); optional cinema_name; shared_ptr cinema; - string screen_description; - list> screens; + optional certificate; + optional screen; + vector> screens; optional dkdm; optional valid_from; optional valid_to; @@ -436,6 +457,9 @@ try 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[] = { @@ -528,22 +552,17 @@ try (for lookup) and by creating a Cinema which the next Screen will be added to. */ cinema_name = optarg; - cinema = make_shared(optarg, list(), "", 0, 0); + cinema = make_shared(optarg, vector(), "", 0, 0); break; case 'S': - screen_description = optarg; + /* 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': - { - /* Make a new screen and add it to the current cinema */ - dcp::CertificateChain chain (dcp::file_to_string(optarg)); - auto screen = make_shared(screen_description, "", chain.leaf(), vector()); - if (cinema) { - cinema->add_screen (screen); - } - screens.push_back (screen); + certificate = optarg; break; - } case 'T': /* A trusted device ends up in the last screen we made */ if (!screens.empty ()) { @@ -559,6 +578,16 @@ try } } + 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.get_value_or(""), "", chain.leaf(), boost::none, vector()); + if (cinema) { + cinema->add_screen(screen_to_add); + } + screens.push_back(screen_to_add); + } + if (list_cinemas) { auto cinemas = Config::instance()->cinemas (); for (auto i: cinemas) { @@ -590,15 +619,15 @@ try } screens = find_cinema (*cinema_name)->screens (); + if (screen) { + screens.erase(std::remove_if(screens.begin(), screens.end(), [&screen](shared_ptr s) { return s->name != *screen; }), screens.end()); + } } if (duration_string) { valid_to = valid_from.get() + duration_from_string (*duration_string); } - dcpomatic_setup_path_encoding (); - dcpomatic_setup (); - if (verbose) { out (String::compose("Making KDMs valid from %1 to %2", boost::posix_time::to_simple_string(valid_from.get()), boost::posix_time::to_simple_string(valid_to.get()))); }