WIP: Cope with changes to verify.1823-validation-report

1 files changed, 17 insertions, 8 deletions

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 89a5da0be..6d9a4b9cb 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -98,6 +98,9 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 	};
 
 	auto add = [&counts, &add_bullet](dcp::VerificationNote note, wxString message) {
+		if (note.cpl_id()) {
+			message.Replace("%cpl_id", std_to_wx(note.cpl_id().get()));
+		}
 		if (note.note()) {
 			message.Replace("%n", std_to_wx(note.note().get()));
 		}
@@ -137,7 +140,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add (i, std_to_wx(*i.note()));
 			break;
 		case dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES:
-			add(i, _("The hash of the CPL %n in the PKL does not agree with the CPL file.  This probably means that the CPL file is corrupt."));
+			add(i, _("The hash of the CPL %cpl_id in the PKL does not agree with the CPL file.  This probably means that the CPL file is corrupt."));
 			break;
 		case dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE:
 			add(i, _("The picture in a reel has a frame rate of %n, which is not valid."));
@@ -258,10 +261,10 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add(i, _("The sound asset %f has an invalid frame rate of %n."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT:
-			add(i, _("The CPL %n has no <AnnotationText> tag."));
+			add(i, _("The CPL %cpl_id has no <AnnotationText> tag."));
 			break;
 		case dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT:
-			add(i, _("The CPL %n has an <AnnotationText> which is not the same as its <ContentTitleText>."));
+			add(i, _("The CPL %cpl_id has an <AnnotationText> which is not the same as its <ContentTitleText>."));
 			break;
 		case dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION:
 			add(i, _("At least one asset in a reel does not have the same duration as the others."));
@@ -306,19 +309,19 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add(i, _("The DCP has a LFOC of %n instead of the reel duration minus one."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_CPL_METADATA:
-			add(i, _("The CPL %n has no CPL metadata tag."));
+			add(i, _("The CPL %cpl_id has no CPL metadata tag."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER:
-			add(i, _("The CPL %n has no CPL metadata version number tag."));
+			add(i, _("The CPL %cpl_id has no CPL metadata version number tag."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA:
-			add(i, _("The CPL %n has no CPL extension metadata tag."));
+			add(i, _("The CPL %cpl_id has no CPL extension metadata tag."));
 			break;
 		case dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA:
 			add(i, _("The CPL %f has an invalid CPL extension metadata tag (%n)"));
 			break;
 		case dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT:
-			add(i, _("The CPL %n has encrypted content but is not signed."));
+			add(i, _("The CPL %cpl_id has encrypted content but is not signed."));
 			break;
 		case dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT:
 			add(i, _("The PKL %n has encrypted content but is not signed."));
@@ -445,13 +448,19 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 			add(i, _("The asset with ID %id in the asset map actually has an id of %other_id"));
 			break;
 		case dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
-			add(i, _("The <LabelText> in a <ContentVersion> in CPL %id is empty"));
+			add(i, _("The <LabelText> in a <ContentVersion> in CPL %cpl_id is empty"));
 			break;
 		case dcp::VerificationNote::Code::ALL_ENCRYPTED:
 		case dcp::VerificationNote::Code::NONE_ENCRYPTED:
 		case dcp::VerificationNote::Code::MATCHING_CPL_HASHES:
 		case dcp::VerificationNote::Code::CORRECT_PICTURE_HASH:
 		case dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES:
+		case dcp::VerificationNote::Code::VALID_CONTENT_KIND:
+		case dcp::VerificationNote::Code::VALID_RELEASE_TERRITORY:
+		case dcp::VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT:
+		case dcp::VerificationNote::Code::VALID_CPL_ANNOTATION_TEXT:
+		case dcp::VerificationNote::Code::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL:
+		case dcp::VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA:
 			/* We don't make our own messages for "OK" notes, i.e. things that are used in verification reports */
 			break;
 		}