diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-24 23:17:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-24 23:17:51 +0100 |
| commit | 624141eca78ad5d349322fd4cc38bdeea99a8d49 (patch) | |
| tree | 0f643a8dcd46013b8eb73c7e166c6bc95afab5f4 /src/lib/dcp.cc | |
| parent | 66d566201f832974671828cc417721d7ff3c94b2 (diff) | |
Properly ignore empty asset path errors that do not lead to missing asset errors.v2.14.15
Diffstat (limited to 'src/lib/dcp.cc')
| -rw-r--r-- | src/lib/dcp.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index f506d5c70..e40a9496d 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; /** Find all the CPLs in our directories, cross-add assets and return the CPLs */ list<shared_ptr<dcp::CPL> > @@ -42,11 +43,19 @@ DCP::cpls () const { 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 (false, 0, true); + list<shared_ptr<dcp::DCPReadError> > errors; + dcp->read (true, &errors, true); + /** 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()) { |