- BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
- shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
- dcp->read (false, 0, true);
+ /** 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());
+ for (auto i: _dcp_content->directories()) {
+ auto dcp = make_shared<dcp::DCP>(i);
+ vector<dcp::VerificationNote> notes;
+ dcp->read (¬es, 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)));
+ }
+ }
+ }