X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp.cc;h=abdfc7f9eaad8aa92b223a44bab1c87f1f663dc1;hp=9db478330f6873ccb9e73a1269e1c12e628e342f;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=efce7d4edd7f9d55626a198c6c541a93bcc5eaf4

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 9db478330..abdfc7f9e 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,71 +18,75 @@
 
 */
 
-#include "dcp.h"
-#include "config.h"
-#include "film.h"
-#include "log.h"
+
 #include "compose.hpp"
+#include "dcp.h"
 #include "dcp_content.h"
+#include "dcpomatic_log.h"
+#include "log.h"
+#include "util.h"
 #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;
 
-#define LOG_GENERAL(...) _dcp_content->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
-list<shared_ptr<dcp::CPL> >
+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;
+
+	/** We accept and ignore some warnings / errors but everything else is bad */
+	vector<dcp::VerificationNote::Code> ignore = {
+		dcp::VerificationNote::Code::EMPTY_ASSET_PATH,
+		dcp::VerificationNote::Code::EXTERNAL_ASSET,
+		dcp::VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD,
+	};
 
 	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 (false, 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) {
+			for (auto j: notes) {
+				if (std::find(ignore.begin(), ignore.end(), j.code()) != ignore.end()) {
+					LOG_WARNING("Ignoring: %1", dcp::note_to_string(j));
+				} 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));
+				i->resolve_refs(j->assets());
 			}
 		}
 	}
 
 	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());
-				}
-			}
+		auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+		for (auto i: dcps) {
+			i->add (k);
 		}
 	}