X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=166b22285a741f8cd5cdc491982042c78d3f8f8a;hb=3a715c7e0d5cbb39ffd6816899ef3050e8331882;hp=f1849adf675bd611681786322388c5e23a24c649;hpb=142f688c0ebb6938ef2d7f2b7e7c859d12af7e23;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index f1849adf6..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 <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     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<ScreenKDM> screen_kdms,
+	list<shared_ptr<ScreenKDM> > screen_kdms,
 	bool zip,
 	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
@@ -227,7 +229,7 @@ from_film (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<ScreenKDM> screen_kdms = film->make_kdms (
+		list<shared_ptr<ScreenKDM> > 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,7 +278,7 @@ dcp::EncryptedKDM
 kdm_from_dkdm (
 	dcp::DecryptedKDM dkdm,
 	dcp::Certificate target,
-	vector<dcp::Certificate> trusted_devices,
+	vector<string> trusted_devices,
 	dcp::LocalTime valid_from,
 	dcp::LocalTime valid_to,
 	dcp::Formulation formulation,
@@ -325,24 +330,26 @@ from_dkdm (
 	values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
 	try {
-		list<ScreenKDM> screen_kdms;
+		list<shared_ptr<ScreenKDM> > screen_kdms;
 		BOOST_FOREACH (shared_ptr<Screen> 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<ScreenKDM>(
+					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
+							)
 						)
 					)
 				);
@@ -500,7 +507,8 @@ int main (int argc, char* argv[])
 		case 'C':
 		{
 			/* Make a new screen and add it to the current cinema */
-			shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<dcp::Certificate>()));
+			dcp::CertificateChain chain (dcp::file_to_string(optarg));
+			shared_ptr<Screen> screen (new Screen (screen_description, "", chain.leaf(), vector<TrustedDevice>()));
 			if (cinema) {
 				cinema->add_screen (screen);
 			}
@@ -510,7 +518,7 @@ int main (int argc, char* argv[])
 		case 'T':
 			/* A trusted device ends up in the last screen we made */
 			if (!screens.empty ()) {
-				screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg)));
+				screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg))));
 			}
 			break;
 		case 'B':