X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=345b905457d8415ae3b7e7edf78d6e3f054c8a3c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=8c26ba4ccc5cba33eb8eadd0b06cfae9e9bf461a;hpb=075f418cc6d9be06bed7a1d98257ae8d17ef3019;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 8c26ba4cc..345b90545 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -17,32 +17,34 @@
 
 */
 
+/** @file  src/tools/dcpomatic_kdm.cc
+ *  @brief Command-line program to generate KDMs.
+ */
+
 #include <getopt.h>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
 #include "lib/kdm.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
+#include "lib/safe_stringstream.h"
 
 using std::string;
-using std::stringstream;
 using std::cout;
 using std::cerr;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
 
-static string program_name;
-
 static void
 help ()
 {
 	cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n"
 		"  -h, --help             show this help\n"
 		"  -o, --output           output file or directory\n"
-		"  -f, --valid-from       valid from time (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
-		"  -t, --valid-to         valid to time (e.g. \"2014-09-28 01:41:51\")\n"
+		"  -f, --valid-from       valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
+		"  -t, --valid-to         valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n"
 		"  -d, --valid-duration   valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
 		"      --formulation      modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
 		"  -z, --zip              ZIP each cinema's KDMs into its own file\n"
@@ -76,7 +78,7 @@ time_from_string (string t)
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
-	stringstream s (d);
+	SafeStringStream s (d);
 	int N;
 	string unit;
 	s >> N >> unit;
@@ -111,12 +113,12 @@ int main (int argc, char* argv[])
 	bool cinemas = false;
 	string duration_string;
 	bool verbose = false;
-	libdcp::KDM::Formulation formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1;
+	dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
 
 	program_name = argv[0];
-	
+
 	int option_index = 0;
-	while (1) {
+	while (true) {
 		static struct option long_options[] = {
 			{ "help", no_argument, 0, 'h'},
 			{ "output", required_argument, 0, 'o'},
@@ -171,13 +173,13 @@ int main (int argc, char* argv[])
 			break;
 		case 'C':
 			if (string (optarg) == "modified-transitional-1") {
-				formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1;
+				formulation = dcp::MODIFIED_TRANSITIONAL_1;
 			} else if (string (optarg) == "dci-any") {
-				formulation = libdcp::KDM::DCI_ANY;
+				formulation = dcp::DCI_ANY;
 			} else if (string (optarg) == "dci-specific") {
-				formulation = libdcp::KDM::DCI_SPECIFIC;
+				formulation = dcp::DCI_SPECIFIC;
 			} else {
-				error ("unrecognised KDM formulation " + formulation);
+				error ("unrecognised KDM formulation " + string (optarg));
 			}
 		}
 	}
@@ -213,7 +215,7 @@ int main (int argc, char* argv[])
 	}
 
 	string const film_dir = argv[optind];
-			
+
 	dcpomatic_setup ();
 
 	shared_ptr<Film> film;
@@ -247,9 +249,9 @@ int main (int argc, char* argv[])
 		if (output.empty ()) {
 			error ("you must specify --output");
 		}
-		
-		shared_ptr<libdcp::Certificate> certificate (new libdcp::Certificate (boost::filesystem::path (certificate_file)));
-		libdcp::KDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
+
+		dcp::Certificate certificate (dcp::file_to_string (certificate_file));
+		dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
 		kdm.as_xml (output);
 		if (verbose) {
 			cout << "Generated KDM " << output << " for certificate.\n";
@@ -273,12 +275,18 @@ int main (int argc, char* argv[])
 
 		try {
 			if (zip) {
-				write_kdm_zip_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output);
+				write_kdm_zip_files (
+					film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+					);
+
 				if (verbose) {
 					cout << "Wrote ZIP files to " << output << "\n";
 				}
 			} else {
-				write_kdm_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output);
+				write_kdm_files (
+					film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+					);
+
 				if (verbose) {
 					cout << "Wrote KDM files to " << output << "\n";
 				}