Don't offer to make KDMs for CPLs with no encrypted assets (#1490).

3 files changed, 35 insertions, 13 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index f1d066f34..76cd8da96 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -92,6 +92,7 @@ using std::runtime_error;
 using std::copy;
 using std::back_inserter;
 using std::map;
+using std::exception;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -1055,17 +1056,7 @@ Film::cpls () const
 			) {
 
 			try {
-				dcp::DCP dcp (*i);
-				dcp.read ();
-				DCPOMATIC_ASSERT (dcp.cpls().front()->file());
-				out.push_back (
-					CPLSummary (
-						i->path().leaf().string(),
-						dcp.cpls().front()->id(),
-						dcp.cpls().front()->annotation_text(),
-						dcp.cpls().front()->file().get()
-						)
-					);
+				out.push_back (CPLSummary(*i));
 			} catch (...) {
 
 			}
diff --git a/src/lib/types.cc b/src/lib/types.cc
index 898abeca4..ee36431cf 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,8 +22,13 @@
 #include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <dcp/raw_convert.h>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/reel_mxf.h>
+#include <dcp/reel_asset.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -183,3 +188,24 @@ string_to_video_frame_type (string s)
 
 	DCPOMATIC_ASSERT (false);
 }
+
+CPLSummary::CPLSummary (boost::filesystem::path p)
+	: dcp_directory (p.leaf().string())
+{
+	dcp::DCP dcp (p);
+	dcp.read ();
+
+	cpl_id = dcp.cpls().front()->id();
+	cpl_annotation_text = dcp.cpls().front()->annotation_text();
+	cpl_file = dcp.cpls().front()->file().get();
+
+	encrypted = false;
+	BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
+		BOOST_FOREACH (shared_ptr<const dcp::ReelAsset> k, j->reel_assets()) {
+			shared_ptr<const dcp::ReelMXF> mxf = boost::dynamic_pointer_cast<const dcp::ReelMXF> (k);
+			if (mxf && mxf->key_id()) {
+				encrypted = true;
+			}
+		}
+	}
+}
diff --git a/src/lib/types.h b/src/lib/types.h
index 607c9e275..3c9a8025b 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -205,17 +205,22 @@ struct Crop
 
 struct CPLSummary
 {
-	CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f)
+	CPLSummary (boost::filesystem::path p);
+
+	CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f, bool e)
 		: dcp_directory (d)
 		, cpl_id (i)
 		, cpl_annotation_text (a)
 		, cpl_file (f)
+		, encrypted (e)
 	{}
 
 	std::string dcp_directory;
 	std::string cpl_id;
 	std::string cpl_annotation_text;
 	boost::filesystem::path cpl_file;
+	/** true if this CPL has any encrypted assets */
+	bool encrypted;
 };
 
 extern bool operator== (Crop const & a, Crop const & b);