X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=b9d71d27338ddf6ee8cd39c93b5d01c1f36768b0;hp=9d6fa2e8f21df8ffd44a05944d657f2bf2d643e9;hb=6ebec6b3ca11a7062ae19176096b1b157275d015;hpb=788ef2cf5daf510651cc4f5eb7940d7bd0c44b76

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 9d6fa2e8f..b9d71d273 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -312,10 +312,17 @@ private:
 
 	bool confirm_overwrite (boost::filesystem::path path)
 	{
-		return confirm_dialog (
-			this,
-			wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
-			);
+		if (boost::filesystem::is_directory(path)) {
+			return confirm_dialog (
+				this,
+				wxString::Format(_("Folder %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
+				);
+		} else {
+			return confirm_dialog (
+				this,
+				wxString::Format(_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
+				);
+		}
 	}
 
 	/** @id if not nullptr this is filled in with the wxTreeItemId of the selection */
@@ -370,46 +377,40 @@ private:
 
 			vector<KDMCertificatePeriod> period_checks;
 
-			for (auto i: _screens->screens()) {
-
-				if (!i->recipient) {
-					continue;
-				}
-
-				dcp::LocalTime begin(_timing->from(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
-				dcp::LocalTime end(_timing->until(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
-
-				period_checks.push_back(check_kdm_and_certificate_validity_periods(*i->recipient, begin, end));
-
+			std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) {
 				/* Make an empty KDM */
 				dcp::DecryptedKDM kdm (
 					begin,
 					end,
-					decrypted.annotation_text().get_value_or (""),
+					decrypted.annotation_text().get_value_or(""),
 					title,
 					dcp::LocalTime().as_string()
 					);
 
 				/* Add keys from the DKDM */
 				for (auto const& j: decrypted.keys()) {
-					kdm.add_key (j);
+					kdm.add_key(j);
 				}
 
-				auto const encrypted = kdm.encrypt(
-						signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
-						!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
-						);
-
-				dcp::NameFormat::Map name_values;
-				name_values['c'] = i->cinema->name;
-				name_values['s'] = i->name;
-				name_values['f'] = title;
-				name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-				name_values['e'] = end.date() + " " + end.time_of_day(true, false);
-				name_values['i'] = encrypted.cpl_id ();
-
-				/* Encrypt */
-				kdms.push_back (make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema->emails, encrypted));
+				return kdm;
+			};
+
+			for (auto i: _screens->screens()) {
+
+				auto kdm = kdm_for_screen(
+					make_kdm,
+					i,
+					_timing->from(),
+					_timing->until(),
+					_output->formulation(),
+					!_output->forensic_mark_video(),
+					_output->forensic_mark_audio() ? boost::optional<int>() : 0,
+					period_checks
+					);
+
+				if (kdm) {
+					kdms.push_back(kdm);
+				}
 			}
 
 			if (kdms.empty()) {
@@ -453,6 +454,13 @@ private:
 					wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
 					);
 			}
+		} catch (dcp::BadKDMDateError& e) {
+			if (e.starts_too_early()) {
+				error_dialog(this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
+			} else {
+				error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+			}
+			return;
 		} catch (dcp::NotEncryptedError& e) {
 			error_dialog (this, _("CPL's content is not encrypted."));
 		} catch (exception& e) {
@@ -790,7 +798,7 @@ private:
 
 	bool OnInit () override
 	{
-		wx_ptr<wxSplashScreen> splash;
+		wxSplashScreen* splash;
 
 		try {
 			wxInitAllImageHandlers ();