/*
- Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "dcp.h"
#include "config.h"
+#include "film.h"
+#include "log.h"
+#include "dcpomatic_log.h"
+#include "compose.hpp"
#include "dcp_content.h"
#include <dcp/dcp.h>
#include <dcp/decrypted_kdm.h>
-#include <boost/foreach.hpp>
+#include <dcp/exceptions.h>
+
+#include "i18n.h"
using std::list;
-using boost::shared_ptr;
+using std::string;
+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;
-
- BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
- shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
- dcp->read (false, 0, true);
- if (_dcp_content->kdm ()) {
- dcp->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+ list<shared_ptr<dcp::DCP>> dcps;
+ list<shared_ptr<dcp::CPL>> cpls;
+
+ 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) {
+ /** 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);
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {
+ LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
+ 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 ());
+ i->resolve_refs (j->assets (true));
}
}
}
+ if (_dcp_content->kdm ()) {
+ dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+ for (auto i: dcps) {
+ i->add (k);
+ }
+ }
+
return cpls;
}