From 957f92414a6f88dd6ef1ceb901ef0b61414bf6cd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 1 Dec 2022 22:30:58 +0100
Subject: Move UTC offset for KDMs from the cinema to the point of KDM creation
 (#2300).

---
 src/lib/kdm_cli.cc | 56 ++++++++++++++++++++++--------------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

(limited to 'src/lib/kdm_cli.cc')

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index ddc77e771..112913042 100644
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -62,8 +62,10 @@ help (std::function<void (string)> out)
 	out ("  -o, --output <path>                      output file or directory");
 	out ("  -K, --filename-format <format>           filename format for KDMs");
 	out ("  -Z, --container-name-format <format>     filename format for ZIP containers");
-	out ("  -f, --valid-from <time>                  valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"");
+	out ("  -f, --valid-from <time>                  valid from time (e.g. \"2013-09-2 01:41:51\") or \"now\"");
 	out ("  -t, --valid-to <time>                    valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")");
+	out ("  -f, --valid-from <time>                  valid from time (e.g. \"2013-09-28T01:41:51+04:00\", \"2018-01-01T12:00:30\") or \"now\"");
+	out ("  -t, --valid-to <time>                    valid to time (e.g. \"2014-09-28T01:41:51\")");
 	out ("  -d, --valid-duration <duration>          valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")");
 	out ("  -F, --formulation <formulation>          modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]");
 	out ("  -p, --disable-forensic-marking-picture   disable forensic marking of pictures essences");
@@ -99,17 +101,6 @@ public:
 };
 
 
-static boost::posix_time::ptime
-time_from_string (string t)
-{
-	if (t == "now") {
-		return boost::posix_time::second_clock::local_time ();
-	}
-
-	return boost::posix_time::time_from_string (t);
-}
-
-
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
@@ -211,8 +202,8 @@ from_film (
 	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
-	boost::posix_time::ptime valid_from,
-	boost::posix_time::ptime valid_to,
+	dcp::LocalTime valid_from,
+	dcp::LocalTime valid_to,
 	dcp::Formulation formulation,
 	bool disable_forensic_marking_picture,
 	optional<int> disable_forensic_marking_audio,
@@ -362,8 +353,8 @@ from_dkdm (
  	boost::filesystem::path output,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
-	boost::posix_time::ptime valid_from,
-	boost::posix_time::ptime valid_to,
+	dcp::LocalTime valid_from,
+	dcp::LocalTime valid_to,
 	dcp::Formulation formulation,
 	bool disable_forensic_marking_picture,
 	optional<int> disable_forensic_marking_audio,
@@ -381,18 +372,12 @@ from_dkdm (
 				continue;
 			}
 
-			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,
 							i->recipient.get(),
 							i->trusted_device_thumbprints(),
-							begin,
-							end,
+							valid_from,
+							valid_to,
 							formulation,
 							disable_forensic_marking_picture,
 							disable_forensic_marking_audio
@@ -402,8 +387,8 @@ from_dkdm (
 			name_values['c'] = i->cinema ? i->cinema->name : "";
 			name_values['s'] = i->name;
 			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['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false);
+			name_values['e'] = valid_to.date() + " " + valid_to.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 : vector<string>(), kdm));
@@ -453,8 +438,8 @@ try
 	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;
+	optional<dcp::LocalTime> valid_from;
+	optional<dcp::LocalTime> valid_to;
 	bool zip = false;
 	bool list_cinemas = false;
 	bool list_dkdm_cpls = false;
@@ -517,10 +502,14 @@ try
 			container_name_format = dcp::NameFormat (optarg);
 			break;
 		case 'f':
-			valid_from = time_from_string (optarg);
+			if (string(optarg) == "now") {
+				valid_from = dcp::LocalTime();
+			} else {
+				valid_from = dcp::LocalTime(optarg);
+			}
 			break;
 		case 't':
-			valid_to = time_from_string (optarg);
+			valid_to = dcp::LocalTime(optarg);
 			break;
 		case 'd':
 			duration_string = optarg;
@@ -564,7 +553,7 @@ try
 			   (for lookup) and by creating a Cinema which the next Screen will be added to.
 			*/
 			cinema_name = optarg;
-			cinema = make_shared<Cinema>(optarg, vector<string>(), "", 0, 0);
+			cinema = make_shared<Cinema>(optarg, vector<string>(), "");
 			break;
 		case 'S':
 			/* Similarly, this could be the name of a new (temporary) screen or the name of a screen
@@ -644,11 +633,12 @@ try
 	}
 
 	if (duration_string) {
-		valid_to = valid_from.get() + duration_from_string (*duration_string);
+		valid_to = valid_from.get();
+		valid_to->add(duration_from_string(*duration_string));
 	}
 
 	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())));
+		out(String::compose("Making KDMs valid from %1 to %2", valid_from->as_string(), valid_to->as_string()));
 	}
 
 	string const thing = argv[optind];
-- 
cgit v1.2.3