X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp.cc;h=06e3e15d5525408e9dbd62b3ca2d090fcd3c84af;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=0b80a3737db0e1903cec10d64367b7b23f365669;hpb=1f88a38a2a607c21988a403e76f315444c4be36b;p=dcpomatic.git

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 0b80a3737..06e3e15d5 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -28,34 +28,48 @@
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
-#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+using std::dynamic_pointer_cast;
+using std::vector;
+
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
 list<shared_ptr<dcp::CPL> >
 DCP::cpls () const
 {
-	list<shared_ptr<dcp::DCP> > dcps;
-	list<shared_ptr<dcp::CPL> > cpls;
+	list<shared_ptr<dcp::DCP>> dcps;
+	list<shared_ptr<dcp::CPL>> cpls;
 
 	LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size());
-	BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
-		shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
-		dcp->read (_tolerant, 0, true);
+	for (auto i: _dcp_content->directories()) {
+		auto dcp = make_shared<dcp::DCP>(i);
+		vector<dcp::VerificationNote> notes;
+		dcp->read (&notes, true);
+		if (!_tolerant) {
+			/** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
+			for (auto j: notes) {
+				if (j.code() == dcp::VerificationNote::Code::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::Code::EXTERNAL_ASSET) {
+					LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
+				} else {
+					boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
+				}
+			}
+		}
 		dcps.push_back (dcp);
 		LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
-		BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {
+		for (auto i: dcp->cpls()) {
 			cpls.push_back (i);
 		}
 	}
 
-	BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-		BOOST_FOREACH (shared_ptr<dcp::DCP> j, dcps) {
+	for (auto i: dcps) {
+		for (auto j: dcps) {
 			if (i != j) {
 				i->resolve_refs (j->assets (true));
 			}
@@ -63,25 +77,9 @@ DCP::cpls () const
 	}
 
 	if (_dcp_content->kdm ()) {
-		BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-			try {
-				i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
-			} catch (dcp::KDMDecryptionError& e) {
-				/* Flesh out the error a bit */
-				string const kdm_subject_name = _dcp_content->kdm()->recipient_x509_subject_name();
-				bool on_chain = false;
-				shared_ptr<const dcp::CertificateChain> dc = Config::instance()->decryption_chain();
-				BOOST_FOREACH (dcp::Certificate i, dc->root_to_leaf()) {
-					if (i.subject() == kdm_subject_name) {
-						on_chain = true;
-					}
-				}
-				if (!on_chain) {
-					throw KDMError (_("KDM was not made for DCP-o-matic's decryption certificate."), e.what());
-				} else if (on_chain && kdm_subject_name != dc->leaf().subject()) {
-					throw KDMError (_("KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
-				}
-			}
+		dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+		for (auto i: dcps) {
+			i->add (k);
 		}
 	}