diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-24 23:33:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-24 23:33:48 +0100 |
| commit | 6b2c68525a3e8a6ea2152ba966f2ca1d861fed35 (patch) | |
| tree | 2a810101777f810e043c850bc77b6eee9cf1637d | |
| parent | 9021670bc6a2841887dea548e0bcd933bbb49702 (diff) | |
Accept EmptyAssetPathError if it does not lead to anything worse.
| -rw-r--r-- | src/lib/dcp.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index f3b3b4496..2db49bda5 100644 --- a/src/lib/dcp.cc +++ b/src/lib/dcp.cc @@ -35,6 +35,7 @@ using std::list; using std::string; using boost::shared_ptr; +using boost::dynamic_pointer_cast; dcp::DecryptedKDM DCP::decrypted_kdm () const @@ -71,7 +72,18 @@ DCP::cpls () const 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); + list<shared_ptr<dcp::DCPReadError> > errors; + dcp->read (_tolerant, &errors, true); + if (!_tolerant) { + /** We accept and ignore EmptyAssetPathError but everything else is bad */ + BOOST_FOREACH (shared_ptr<dcp::DCPReadError> j, errors) { + if (dynamic_pointer_cast<dcp::EmptyAssetPathError>(j)) { + LOG_WARNING("Empty path in ASSETMAP of %1", i.string()); + } else { + boost::throw_exception(*j.get()); + } + } + } 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()) { |