Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).

7 files changed, 42 insertions, 103 deletions

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 7e13b50ae..3fb5d672b 100644
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -43,14 +43,6 @@ Cinema::Cinema (cxml::ConstNodePtr node)
 	for (auto i: node->node_children("Email")) {
 		emails.push_back (i->content ());
 	}
-
-	if (node->optional_number_child<int>("UTCOffset")) {
-		_utc_offset_hour = node->number_child<int>("UTCOffset");
-	} else {
-		_utc_offset_hour = node->optional_number_child<int>("UTCOffsetHour").get_value_or (0);
-	}
-
-	_utc_offset_minute = node->optional_number_child<int>("UTCOffsetMinute").get_value_or (0);
 }
 
 /* This is necessary so that we can use shared_from_this in add_screen (which cannot be done from
@@ -75,9 +67,6 @@ Cinema::as_xml (xmlpp::Element* parent) const
 
 	parent->add_child("Notes")->add_child_text (notes);
 
-	parent->add_child("UTCOffsetHour")->add_child_text (raw_convert<string> (_utc_offset_hour));
-	parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert<string> (_utc_offset_minute));
-
 	for (auto i: _screens) {
 		i->as_xml (parent->add_child ("Screen"));
 	}
@@ -96,16 +85,3 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 	_screens.remove (s);
 }
 
-void
-Cinema::set_utc_offset_hour (int h)
-{
-	DCPOMATIC_ASSERT (h >= -11 && h <= 12);
-	_utc_offset_hour = h;
-}
-
-void
-Cinema::set_utc_offset_minute (int m)
-{
-	DCPOMATIC_ASSERT (m >= 0 && m <= 59);
-	_utc_offset_minute = m;
-}
diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index c17454db9..f8f52dc16 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -44,12 +44,10 @@ namespace dcpomatic {
 class Cinema : public std::enable_shared_from_this<Cinema>
 {
 public:
-	Cinema (std::string const & name_, std::list<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
+	Cinema(std::string const & name_, std::list<std::string> const & e, std::string notes_)
 		: name (name_)
 		, emails (e)
 		, notes (notes_)
-		, _utc_offset_hour (utc_offset_hour)
-		, _utc_offset_minute (utc_offset_minute)
 	{}
 
 	explicit Cinema (cxml::ConstNodePtr);
@@ -61,33 +59,14 @@ public:
 	void add_screen (std::shared_ptr<dcpomatic::Screen>);
 	void remove_screen (std::shared_ptr<dcpomatic::Screen>);
 
-	void set_utc_offset_hour (int h);
-	void set_utc_offset_minute (int m);
-
 	std::string name;
 	std::list<std::string> emails;
 	std::string notes;
 
-	int utc_offset_hour () const {
-		return _utc_offset_hour;
-	}
-
-	int utc_offset_minute () const {
-		return _utc_offset_minute;
-	}
-
 	std::list<std::shared_ptr<dcpomatic::Screen>> screens () const {
 		return _screens;
 	}
 
 private:
 	std::list<std::shared_ptr<dcpomatic::Screen>> _screens;
-	/** Offset such that the equivalent time in UTC can be determined
-	    by subtracting the offset from the local time.
-	*/
-	int _utc_offset_hour;
-	/** Additional minutes to add to _utc_offset_hour if _utc_offset_hour is
-	    positive, or to subtract if _utc_offset_hour is negative.
-	*/
-	int _utc_offset_minute;
 };
diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index f25934083..32508eb8c 100644
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -64,23 +64,20 @@ kdm_for_dkdm_recipient (
 	shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
 	shared_ptr<DKDMRecipient> recipient,
-	boost::posix_time::ptime valid_from,
-	boost::posix_time::ptime valid_to
+	dcp::LocalTime valid_from,
+	dcp::LocalTime valid_to
 	)
 {
 	if (!recipient->recipient) {
 		return {};
 	}
 
-	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-
 	auto const kdm = film->make_kdm (
 			recipient->recipient.get(),
 			vector<string>(),
 			cpl,
-			begin,
-			end,
+			valid_from,
+			valid_to,
 			dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 			true,
 			0
@@ -88,8 +85,8 @@ kdm_for_dkdm_recipient (
 
 	dcp::NameFormat::Map name_values;
 	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();
 
 	return make_shared<KDMWithMetadata>(name_values, nullptr, recipient->emails, kdm);
diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h
index 6e9e4dfb1..f8db7d166 100644
--- a/src/lib/dkdm_recipient.h
+++ b/src/lib/dkdm_recipient.h
@@ -60,7 +60,7 @@ kdm_for_dkdm_recipient (
 	std::shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
 	std::shared_ptr<DKDMRecipient> recipient,
-	boost::posix_time::ptime valid_from,
-	boost::posix_time::ptime valid_to
+	dcp::LocalTime valid_from,
+	dcp::LocalTime valid_to
 	);
 
diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index a76155a2c..c4cf82c56 100644
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -61,8 +61,8 @@ help (std::function<void (string)> out)
 	out ("  -o, --output                             output file or directory");
 	out ("  -K, --filename-format                    filename format for KDMs");
 	out ("  -Z, --container-name-format              filename format for ZIP containers");
-	out ("  -f, --valid-from                         valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"");
-	out ("  -t, --valid-to                           valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")");
+	out ("  -f, --valid-from                         valid from time (e.g. \"2013-09-28T01:41:51+04:00\", \"2018-01-01T12:00:30\") or \"now\"");
+	out ("  -t, --valid-to                           valid to time (e.g. \"2014-09-28T01:41:51\")");
 	out ("  -d, --valid-duration                     valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")");
 	out ("  -F, --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");
@@ -97,17 +97,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)
 {
@@ -209,8 +198,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,
@@ -243,7 +232,7 @@ from_film (
 	try {
 		list<KDMWithMetadataPtr> 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);
+			auto p = kdm_for_screen(film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
 			if (p) {
 				kdms.push_back (p);
 			}
@@ -335,8 +324,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,
@@ -354,18 +343,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
@@ -375,8 +358,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 : list<string>(), kdm));
@@ -426,8 +409,8 @@ try
 	optional<string> screen;
 	list<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;
@@ -488,10 +471,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;
@@ -535,7 +522,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, list<string>(), "", 0, 0);
+			cinema = make_shared<Cinema>(optarg, list<string>(), "");
 			break;
 		case 'S':
 			/* Similarly, this could be the name of a new (temporary) screen or the name of a screen
@@ -608,11 +595,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];
diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 2c821eceb..801042c24 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -76,8 +76,8 @@ kdm_for_screen (
 	shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
 	shared_ptr<const dcpomatic::Screen> screen,
-	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
@@ -88,15 +88,13 @@ kdm_for_screen (
 	}
 
 	auto cinema = screen->cinema;
-	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
-	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
 
 	auto const kdm = film->make_kdm (
 			screen->recipient.get(),
 			screen->trusted_device_thumbprints(),
 			cpl,
-			begin,
-			end,
+			valid_from,
+			valid_to,
 			formulation,
 			disable_forensic_marking_picture,
 			disable_forensic_marking_audio
@@ -110,8 +108,8 @@ kdm_for_screen (
 	}
 	name_values['s'] = screen->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();
 
 	return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm);
diff --git a/src/lib/screen.h b/src/lib/screen.h
index 84cecb80b..2fd1b3745 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -23,10 +23,11 @@
 #define DCPOMATIC_SCREEN_H
 
 
-#include "kdm_with_metadata.h"
 #include "kdm_recipient.h"
+#include "kdm_with_metadata.h"
 #include "trusted_device.h"
 #include <dcp/certificate.h>
+#include <dcp/utc_offset.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <string>
@@ -77,8 +78,8 @@ kdm_for_screen (
 	std::shared_ptr<const Film> film,
 	boost::filesystem::path cpl,
 	std::shared_ptr<const dcpomatic::Screen> screen,
-	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,
 	boost::optional<int> disable_forensic_marking_audio