Give 'wrong target' KDM errors in a dialogue box rather than in the job manager ...

[dcpomatic.git] / src / lib / dcp.cc

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index f58b06b57f4aab65ed48ac282f59cb4c18d7792c..2f56a4ee750040ed390e9b37f4dd2fcb5358803d 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -20,13 +20,23 @@
 
 #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 <dcp/exceptions.h>
 #include <boost/foreach.hpp>
 
+#include "i18n.h"
+
 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> >
@@ -35,10 +45,23 @@ 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<dcp::VerificationNote> notes;
+               dcp->read (&notes, true);
+               if (!_tolerant) {
+                       /** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
+                       BOOST_FOREACH (dcp::VerificationNote j, notes) {
+                               if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::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);
+               LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
                BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {
                        cpls.push_back (i);
                }
@@ -47,14 +70,15 @@ DCP::cpls () const
        BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
                BOOST_FOREACH (shared_ptr<dcp::DCP> 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());
                BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-                       i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+                       i->add (k);
                }
        }