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 f3b3b44969cca6aacd9657e22f1465c4f18053d1..2f56a4ee750040ed390e9b37f4dd2fcb5358803d 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -35,31 +35,8 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
-dcp::DecryptedKDM
-DCP::decrypted_kdm () const
-{
-       try {
-               return dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get());
-       } catch (dcp::KDMDecryptionError& e) {
-               /* Try to flesh out the error a bit */
-               string const kdm_subject_name = _dcp_content->kdm()->recipient_x509_subject_name();
-               bool on_chain = false;
-               shared_ptr<const dcp::CertificateChain> dc = Config::instance()->decryption_chain();
-               BOOST_FOREACH (dcp::Certificate i, dc->root_to_leaf()) {
-                       if (i.subject() == kdm_subject_name) {
-                               on_chain = true;
-                       }
-               }
-               if (!on_chain) {
-                       throw KDMError (_("KDM was not made for DCP-o-matic's decryption certificate."), e.what());
-               } else if (on_chain && kdm_subject_name != dc->leaf().subject()) {
-                       throw KDMError (_("KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
-               } else {
-                       throw;
-               }
-       }
-}
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
 list<shared_ptr<dcp::CPL> >
@@ -71,7 +48,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<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()) {
@@ -88,7 +76,7 @@ DCP::cpls () const
        }
 
        if (_dcp_content->kdm ()) {
-               dcp::DecryptedKDM k = decrypted_kdm ();
+               dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
                BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
                        i->add (k);
                }