1 files changed, 43 insertions, 149 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index 3de683bc..ec2a77fa 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -91,8 +91,6 @@ using boost::optional;
 using namespace dcp;
 
 
-static string const assetmap_interop_ns = "http://www.digicine.com/PROTO-ASDCP-AM-20040311#";
-static string const assetmap_smpte_ns   = "http://www.smpte-ra.org/schemas/429-9/2007/AM";
 static string const volindex_interop_ns = "http://www.digicine.com/PROTO-ASDCP-VL-20040311#";
 static string const volindex_smpte_ns   = "http://www.smpte-ra.org/schemas/429-9/2007/AM";
 
@@ -110,10 +108,9 @@ DCP::DCP (boost::filesystem::path directory)
 
 DCP::DCP (DCP&& other)
 	: _directory(std::move(other._directory))
+	, _asset_map(std::move(other._asset_map))
 	, _cpls(std::move(other._cpls))
 	, _pkls(std::move(other._pkls))
-	, _asset_map(std::move(other._asset_map))
-	, _standard(std::move(other._standard))
 {
 
 }
@@ -122,10 +119,9 @@ DCP::DCP (DCP&& other)
 dcp::DCP& DCP::operator= (DCP&& other)
 {
 	_directory = std::move(other._directory);
+	_asset_map = std::move(other._asset_map);
 	_cpls = std::move(other._cpls);
 	_pkls = std::move(other._pkls);
-	_asset_map = std::move(other._asset_map);
-	_standard = std::move(other._standard);
 	return *this;
 }
 
@@ -135,63 +131,26 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 {
 	/* Read the ASSETMAP and PKL */
 
+	boost::filesystem::path asset_map_path;
+
 	if (boost::filesystem::exists (_directory / "ASSETMAP")) {
-		_asset_map = _directory / "ASSETMAP";
+		asset_map_path = _directory / "ASSETMAP";
 	} else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
-		_asset_map = _directory / "ASSETMAP.xml";
+		asset_map_path = _directory / "ASSETMAP.xml";
 	} else {
 		boost::throw_exception (MissingAssetmapError(_directory));
 	}
 
-	cxml::Document asset_map ("AssetMap");
-
-	asset_map.read_file (_asset_map.get());
-	if (asset_map.namespace_uri() == assetmap_interop_ns) {
-		_standard = Standard::INTEROP;
-	} else if (asset_map.namespace_uri() == assetmap_smpte_ns) {
-		_standard = Standard::SMPTE;
-	} else {
-		boost::throw_exception (XMLError ("Unrecognised Assetmap namespace " + asset_map.namespace_uri()));
-	}
-
-	auto asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset");
-	map<string, boost::filesystem::path> paths;
-	vector<boost::filesystem::path> pkl_paths;
-	for (auto i: asset_nodes) {
-		if (i->node_child("ChunkList")->node_children("Chunk").size() != 1) {
-			boost::throw_exception (XMLError ("unsupported asset chunk count"));
-		}
-		auto p = i->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
-		if (starts_with (p, "file://")) {
-			p = p.substr (7);
-		}
-		switch (*_standard) {
-		case Standard::INTEROP:
-			if (i->optional_node_child("PackingList")) {
-				pkl_paths.push_back (p);
-			} else {
-				paths.insert (make_pair(remove_urn_uuid(i->string_child("Id")), p));
-			}
-			break;
-		case Standard::SMPTE:
-		{
-			auto pkl_bool = i->optional_string_child("PackingList");
-			if (pkl_bool && *pkl_bool == "true") {
-				pkl_paths.push_back (p);
-			} else {
-				paths.insert (make_pair(remove_urn_uuid(i->string_child("Id")), p));
-			}
-			break;
-		}
-		}
-	}
+	_asset_map = AssetMap(asset_map_path);
+	auto const pkl_paths = _asset_map->pkl_paths();
+	auto const standard = _asset_map->standard();
 
 	if (pkl_paths.empty()) {
 		boost::throw_exception (XMLError ("No packing lists found in asset map"));
 	}
 
 	for (auto i: pkl_paths) {
-		_pkls.push_back (make_shared<PKL>(_directory / i));
+		_pkls.push_back(make_shared<PKL>(i));
 	}
 
 	/* Now we have:
@@ -206,10 +165,9 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 	*/
 	vector<shared_ptr<Asset>> other_assets;
 
-	for (auto i: paths) {
-		auto path = _directory / i.second;
-
-		if (i.second.empty()) {
+	auto paths = _asset_map->paths();
+	for (auto path: paths) {
+		if (path.second == _directory) {
 			/* I can't see how this is valid, but it's
 			   been seen in the wild with a DCP that
 			   claims to come from ClipsterDCI 5.10.0.5.
@@ -220,9 +178,9 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 			continue;
 		}
 
-		if (!boost::filesystem::exists(path)) {
+		if (!boost::filesystem::exists(path.second)) {
 			if (notes) {
-				notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSET, path});
+				notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSET, path.second});
 			}
 			continue;
 		}
@@ -230,7 +188,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 		/* Find the <Type> for this asset from the PKL that contains the asset */
 		optional<string> pkl_type;
 		for (auto j: _pkls) {
-			pkl_type = j->type(i.first);
+			pkl_type = j->type(path.first);
 			if (pkl_type) {
 				break;
 			}
@@ -251,45 +209,45 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 		pkl_type = pkl_type->substr(0, pkl_type->find(";"));
 
 		if (
-			pkl_type == remove_parameters(CPL::static_pkl_type(*_standard)) ||
-			pkl_type == remove_parameters(InteropSubtitleAsset::static_pkl_type(*_standard))) {
+			pkl_type == remove_parameters(CPL::static_pkl_type(standard)) ||
+			pkl_type == remove_parameters(InteropSubtitleAsset::static_pkl_type(standard))) {
 			auto p = new xmlpp::DomParser;
 			try {
-				p->parse_file (path.string());
+				p->parse_file (path.second.string());
 			} catch (std::exception& e) {
 				delete p;
-				throw ReadError(String::compose("XML error in %1", path.string()), e.what());
+				throw ReadError(String::compose("XML error in %1", path.second.string()), e.what());
 			}
 
 			auto const root = p->get_document()->get_root_node()->get_name();
 			delete p;
 
 			if (root == "CompositionPlaylist") {
-				auto cpl = make_shared<CPL>(path);
-				if (_standard && cpl->standard() != _standard.get() && notes) {
+				auto cpl = make_shared<CPL>(path.second);
+				if (cpl->standard() != standard && notes) {
 					notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_STANDARD});
 				}
 				_cpls.push_back (cpl);
 			} else if (root == "DCSubtitle") {
-				if (_standard && _standard.get() == Standard::SMPTE && notes) {
+				if (standard == Standard::SMPTE && notes) {
 					notes->push_back (VerificationNote(VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_STANDARD));
 				}
-				other_assets.push_back (make_shared<InteropSubtitleAsset>(path));
+				other_assets.push_back (make_shared<InteropSubtitleAsset>(path.second));
 			}
 		} else if (
-			*pkl_type == remove_parameters(PictureAsset::static_pkl_type(*_standard)) ||
-			*pkl_type == remove_parameters(SoundAsset::static_pkl_type(*_standard)) ||
-			*pkl_type == remove_parameters(AtmosAsset::static_pkl_type(*_standard)) ||
-			*pkl_type == remove_parameters(SMPTESubtitleAsset::static_pkl_type(*_standard))
+			*pkl_type == remove_parameters(PictureAsset::static_pkl_type(standard)) ||
+			*pkl_type == remove_parameters(SoundAsset::static_pkl_type(standard)) ||
+			*pkl_type == remove_parameters(AtmosAsset::static_pkl_type(standard)) ||
+			*pkl_type == remove_parameters(SMPTESubtitleAsset::static_pkl_type(standard))
 			) {
 
 			bool found_threed_marked_as_twod = false;
-			other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type, &found_threed_marked_as_twod));
+			other_assets.push_back (asset_factory(path.second, ignore_incorrect_picture_mxf_type, &found_threed_marked_as_twod));
 			if (found_threed_marked_as_twod && notes) {
-				notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, path});
+				notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, path.second});
 			}
-		} else if (*pkl_type == remove_parameters(FontAsset::static_pkl_type(*_standard))) {
-			other_assets.push_back (make_shared<FontAsset>(i.first, path));
+		} else if (*pkl_type == remove_parameters(FontAsset::static_pkl_type(standard))) {
+			other_assets.push_back (make_shared<FontAsset>(path.first, path.second));
 		} else if (*pkl_type == "image/png") {
 			/* It's an Interop PNG subtitle; let it go */
 		} else {
@@ -432,80 +390,6 @@ DCP::write_volindex (Standard standard) const
 
 
 void
-DCP::write_assetmap (
-	Standard standard, string pkl_uuid, boost::filesystem::path pkl_path,
-	string issuer, string creator, string issue_date, string annotation_text
-	) const
-{
-	auto p = _directory;
-
-	switch (standard) {
-	case Standard::INTEROP:
-		p /= "ASSETMAP";
-		break;
-	case Standard::SMPTE:
-		p /= "ASSETMAP.xml";
-		break;
-	default:
-		DCP_ASSERT (false);
-	}
-
-	xmlpp::Document doc;
-	xmlpp::Element* root;
-
-	switch (standard) {
-	case Standard::INTEROP:
-		root = doc.create_root_node ("AssetMap", assetmap_interop_ns);
-		break;
-	case Standard::SMPTE:
-		root = doc.create_root_node ("AssetMap", assetmap_smpte_ns);
-		break;
-	default:
-		DCP_ASSERT (false);
-	}
-
-	root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
-	root->add_child("AnnotationText")->add_child_text (annotation_text);
-
-	switch (standard) {
-	case Standard::INTEROP:
-		root->add_child("VolumeCount")->add_child_text ("1");
-		root->add_child("IssueDate")->add_child_text (issue_date);
-		root->add_child("Issuer")->add_child_text (issuer);
-		root->add_child("Creator")->add_child_text (creator);
-		break;
-	case Standard::SMPTE:
-		root->add_child("Creator")->add_child_text (creator);
-		root->add_child("VolumeCount")->add_child_text ("1");
-		root->add_child("IssueDate")->add_child_text (issue_date);
-		root->add_child("Issuer")->add_child_text (issuer);
-		break;
-	default:
-		DCP_ASSERT (false);
-	}
-
-	auto asset_list = root->add_child ("AssetList");
-
-	auto asset = asset_list->add_child ("Asset");
-	asset->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid);
-	asset->add_child("PackingList")->add_child_text ("true");
-	auto chunk_list = asset->add_child ("ChunkList");
-	auto chunk = chunk_list->add_child ("Chunk");
-	chunk->add_child("Path")->add_child_text (pkl_path.filename().string());
-	chunk->add_child("VolumeIndex")->add_child_text ("1");
-	chunk->add_child("Offset")->add_child_text ("0");
-	chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (pkl_path)));
-
-	for (auto i: assets()) {
-		i->write_to_assetmap (asset_list, _directory);
-	}
-
-	doc.write_to_file_formatted (p.string (), "UTF-8");
-	_asset_map = p;
-}
-
-
-void
 DCP::write_xml (
 	string issuer,
 	string creator,
@@ -553,7 +437,17 @@ DCP::write_xml (
 	pkl->write_xml (pkl_path, signer);
 
 	write_volindex (standard);
-	write_assetmap (standard, pkl->id(), pkl_path, issuer, creator, issue_date, annotation_text);
+
+	if (!_asset_map) {
+		_asset_map = AssetMap(standard, annotation_text, issue_date, issuer, creator);
+		_asset_map->add_asset(pkl->id(), pkl_path, true);
+		for (auto asset: assets()) {
+			asset->add_to_assetmap(*_asset_map, _directory);
+		}
+	}
+
+	auto asset_map_path = _directory / (standard == Standard::INTEROP ? "ASSETMAP" : "ASSETMAP.xml");
+	_asset_map->write_xml(asset_map_path);
 }