Assorted test fixes.

[libdcp.git] / src / dcp.cc

diff --git a/src/dcp.cc b/src/dcp.cc
index 88e365062f305d3d542eb1b9ffe3970f3c7f990d..044e1f537840638d85e4040b7db8a57373fecca7 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -33,9 +33,10 @@
 #include "reel.h"
 #include "cpl.h"
 #include "signer.h"
-#include "kdm.h"
 #include "compose.hpp"
 #include "AS_DCP.h"
+#include "decrypted_kdm.h"
+#include "decrypted_kdm_key.h"
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
 #include <libxml++/libxml++.h>
@@ -53,8 +54,11 @@ using std::stringstream;
 using std::ostream;
 using std::make_pair;
 using std::map;
+using std::cout;
+using std::exception;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::algorithm::starts_with;
 using namespace dcp;
 
 DCP::DCP (boost::filesystem::path directory)
@@ -64,8 +68,20 @@ DCP::DCP (boost::filesystem::path directory)
        _directory = boost::filesystem::canonical (_directory);
 }
 
+template<class T> void
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
+{
+       if (keep_going) {
+               if (errors) {
+                       errors->push_back (shared_ptr<T> (new T (e)));
+               }
+       } else {
+               throw e;
+       }
+}
+
 void
-DCP::read ()
+DCP::read (bool keep_going, ReadErrors* errors)
 {
        /* Read the ASSETMAP */
        
@@ -75,7 +91,7 @@ DCP::read ()
        } else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
                asset_map_file = _directory / "ASSETMAP.xml";
        } else {
-               boost::throw_exception (DCPReadError ("could not find AssetMap file"));
+               boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file `%1'", asset_map_file.string())));
        }
 
        cxml::Document asset_map ("AssetMap");
@@ -86,16 +102,22 @@ DCP::read ()
                if ((*i)->node_child("ChunkList")->node_children("Chunk").size() != 1) {
                        boost::throw_exception (XMLError ("unsupported asset chunk count"));
                }
-               paths.insert (make_pair (
-                       (*i)->string_child ("Id"),
-                       (*i)->node_child("ChunkList")->node_child("Chunk")->string_child ("Path")
-                                     ));
+               string p = (*i)->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
+               if (starts_with (p, "file://")) {
+                       p = p.substr (7);
+               }
+               paths.insert (make_pair ((*i)->string_child ("Id"), p));
        }
 
        /* Read all the assets from the asset map */
-       
        for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
                boost::filesystem::path path = _directory / i->second;
+
+               if (!boost::filesystem::exists (path)) {
+                       survivable_error (keep_going, errors, MissingAssetError (path));
+                       continue;
+               }
+               
                if (boost::algorithm::ends_with (path.string(), ".xml")) {
                        xmlpp::DomParser* p = new xmlpp::DomParser;
                        try {
@@ -148,7 +170,7 @@ bool
 DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
        if (_assets.size() != other._assets.size()) {
-               note (ERROR, "Asset counts differ");
+               note (ERROR, String::compose ("Asset counts differ: %1 vs %2", _assets.size(), other._assets.size()));
                return false;
        }
 
@@ -194,13 +216,13 @@ DCP::encrypted () const
 }
 
 void
-DCP::add (KDM const & kdm)
+DCP::add (DecryptedKDM const & kdm)
 {
-       list<KDMKey> keys = kdm.keys ();
+       list<DecryptedKDMKey> keys = kdm.keys ();
        list<shared_ptr<CPL> > cpl = cpls ();
        
        for (list<shared_ptr<CPL> >::iterator i = cpl.begin(); i != cpl.end(); ++i) {
-               for (list<KDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
+               for (list<DecryptedKDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
                        if (j->cpl_id() == (*i)->id()) {
                                (*i)->add (kdm);
                        }