X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=166b22285a741f8cd5cdc491982042c78d3f8f8a;hp=c3ff9025565c4c268b85e0b64fca8687168c4a7e;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=f17c1575ec037e3ac2ec95f2725335ca306fd700 diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index c3ff90255..166b22285 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -42,10 +42,12 @@ using std::cout; using std::cerr; using std::list; using std::vector; +using std::runtime_error; using boost::shared_ptr; using boost::optional; using boost::bind; using boost::dynamic_pointer_cast; +using namespace dcpomatic; static void help () @@ -59,8 +61,8 @@ help () " -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" " -F, --formulation modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n" - " -a, --disable-forensic-marking-picture disable forensic of pictures essences\n" - " -a, --disable-forensic-marking-audio disable forensic of audio essences (optionally above a given channel, e.g 12)\n" + " -a, --disable-forensic-marking-picture disable forensic marking of pictures essences\n" + " -a, --disable-forensic-marking-audio disable forensic marking of audio essences (optionally above a given channel, e.g 12)\n" " -z, --zip ZIP each cinema's KDMs into its own file\n" " -v, --verbose be verbose\n" " -c, --cinema specify a cinema, either by name or email address\n" @@ -73,7 +75,7 @@ help () "For example:\n\n" "Create KDMs for my_great_movie to play in all of Fred's Cinema's screens for the next two weeks and zip them up.\n" "(Fred's Cinema must have been set up in DCP-o-matic's KDM window)\n\n" - "\tdcpomatic_kdm -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n"; + "\t" << program_name << " -c \"Fred's Cinema\" -f now -d \"2 weeks\" -z my_great_movie\n\n"; } static void @@ -128,7 +130,7 @@ always_overwrite () void write_files ( - list screen_kdms, + list > screen_kdms, bool zip, boost::filesystem::path output, dcp::NameFormat container_name_format, @@ -194,8 +196,8 @@ from_film ( boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio, bool zip ) { @@ -227,7 +229,7 @@ from_film ( values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false); try { - list screen_kdms = film->make_kdms ( + list > screen_kdms = film->make_kdms ( screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio ); @@ -238,6 +240,9 @@ from_film ( } catch (KDMError& e) { cerr << program_name << ": " << e.what() << "\n"; exit (EXIT_FAILURE); + } catch (runtime_error& e) { + cerr << program_name << ": " << e.what() << "\n"; + exit (EXIT_FAILURE); } } @@ -273,12 +278,12 @@ dcp::EncryptedKDM kdm_from_dkdm ( dcp::DecryptedKDM dkdm, dcp::Certificate target, - vector trusted_devices, + vector trusted_devices, dcp::LocalTime valid_from, dcp::LocalTime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio ) { /* Signer for new KDM */ @@ -314,8 +319,8 @@ from_dkdm ( boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio, bool zip ) { @@ -325,24 +330,26 @@ from_dkdm ( values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false); try { - list screen_kdms; + list > screen_kdms; BOOST_FOREACH (shared_ptr i, screens) { if (!i->recipient) { continue; } screen_kdms.push_back ( - ScreenKDM ( - i, - kdm_from_dkdm ( - dkdm, - i->recipient.get(), - i->trusted_devices, - dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), - dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), - formulation, - disable_forensic_marking_picture, - disable_forensic_marking_audio + shared_ptr( + new DCPScreenKDM( + i, + kdm_from_dkdm( + dkdm, + i->recipient.get(), + i->trusted_device_thumbprints(), + dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + formulation, + disable_forensic_marking_picture, + disable_forensic_marking_audio + ) ) ) ); @@ -390,7 +397,6 @@ int main (int argc, char* argv[]) shared_ptr cinema; string screen_description = ""; list > screens; - optional certificate; optional dkdm; optional valid_from; optional valid_to; @@ -400,8 +406,8 @@ int main (int argc, char* argv[]) optional duration_string; bool verbose = false; dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1; - int disable_forensic_marking_picture = 0; - int disable_forensic_marking_audio = 0; + bool disable_forensic_marking_picture = false; + optional disable_forensic_marking_audio; program_name = argv[0]; @@ -471,13 +477,13 @@ int main (int argc, char* argv[]) } break; case 'p': - disable_forensic_marking_picture = -1; + disable_forensic_marking_picture = true; break; case 'a': - disable_forensic_marking_audio = -1; - if (optarg == NULL && argv[optind] != NULL && argv[optind][0] != '-') { + disable_forensic_marking_audio = 0; + if (optarg == 0 && argv[optind] != 0 && argv[optind][0] != '-') { disable_forensic_marking_audio = atoi (argv[optind++]); - } else if (optarg != NULL) { + } else if (optarg) { disable_forensic_marking_audio = atoi (optarg); } break; @@ -488,24 +494,32 @@ int main (int argc, char* argv[]) verbose = true; break; case 'c': + /* This could be a cinema to search for in the configured list or the name of a cinema being + built up on-the-fly in the option. Cater for both possilibities here by storing the name + (for lookup) and by creating a Cinema which the next Screen will be added to. + */ cinema_name = optarg; - cinema = shared_ptr (new Cinema (optarg, list (), "", 0, 0 )); + cinema = shared_ptr (new Cinema (optarg, list(), "", 0, 0)); break; case 'S': screen_description = optarg; break; - case 'C': { - certificate = dcp::Certificate (dcp::file_to_string (optarg)); - vector trusted_devices; - shared_ptr screen (new Screen (screen_description, certificate, trusted_devices)); - if (cinema_name) { + case 'C': + { + /* Make a new screen and add it to the current cinema */ + dcp::CertificateChain chain (dcp::file_to_string(optarg)); + shared_ptr screen (new Screen (screen_description, "", chain.leaf(), vector())); + if (cinema) { cinema->add_screen (screen); } screens.push_back (screen); break; } case 'T': - screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg))); + /* A trusted device ends up in the last screen we made */ + if (!screens.empty ()) { + screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg)))); + } break; case 'B': list_cinemas = true;