X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=296e3bef2f00f89de63b23f05c79e5a9d8febb2c;hb=f0a6d7b5b8d16b8b47917cd30b340917f5c62fc5;hp=6bf8fec5dcc1fc70dc65596d8df381e9b5d859b3;hpb=2f0e6ee9d883abbbc31aca0d1cc80e89eb9b0af2;p=libdcp.git

diff --git a/src/asset.cc b/src/asset.cc
index 6bf8fec5..296e3bef 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,8 +25,10 @@
 #include "asset.h"
 #include "util.h"
 #include "exceptions.h"
+#include "dcp_assert.h"
 #include "compose.hpp"
 #include <libxml++/libxml++.h>
+#include <boost/algorithm/string.hpp>
 
 using std::string;
 using boost::function;
@@ -39,8 +41,7 @@ Asset::Asset ()
 
 }
 
-/** Create an Asset from a given file.  The ID will
- *  be extracted from the file.
+/** Create an Asset from a given file.
  *  @param file File name.
  */
 Asset::Asset (boost::filesystem::path file)
@@ -49,20 +50,30 @@ Asset::Asset (boost::filesystem::path file)
 
 }
 
-/** Create an Asset with a specified ID.
- *  @param id ID to use.
- */
-Asset::Asset (string id)
+Asset::Asset (string id, boost::filesystem::path file)
 	: Object (id)
+	, _file (file)
 {
 
 }
 
 void
-Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
+Asset::write_to_pkl (xmlpp::Node* node, boost::filesystem::path root, Standard standard) const
 {
-	assert (!_file.empty ());
-	
+	DCP_ASSERT (!_file.empty ());
+
+	optional<boost::filesystem::path> path = relative_to_root (
+		boost::filesystem::canonical (root),
+		boost::filesystem::canonical (_file)
+		);
+
+	if (!path) {
+		/* The path of this asset is not within our DCP, so we assume it's an external
+		   (referenced) one.
+		*/
+		return;
+	}
+
 	xmlpp::Node* asset = node->add_child ("Asset");
 	asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
 	asset->add_child("AnnotationText")->add_child_text (_id);
@@ -74,17 +85,26 @@ Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
 void
 Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
 {
-	assert (!_file.empty ());
+	DCP_ASSERT (!_file.empty ());
+
+	optional<boost::filesystem::path> path = relative_to_root (
+		boost::filesystem::canonical (root),
+		boost::filesystem::canonical (_file)
+		);
+
+	if (!path) {
+		/* The path of this asset is not within our DCP, so we assume it's an external
+		   (referenced) one.
+		*/
+		return;
+	}
 
 	xmlpp::Node* asset = node->add_child ("Asset");
 	asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
 	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
 	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-	optional<boost::filesystem::path> path = relative_to_root (root, _file);
-	if (!path) {
-		throw MiscError (String::compose ("Asset %1 is not within the directory %2", _file, root));
-	}
-	chunk->add_child("Path")->add_child_text (path.get().string ());
+
+	chunk->add_child("Path")->add_child_text (path.get().generic_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 (_file)));
@@ -93,8 +113,8 @@ Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
 string
 Asset::hash (function<void (float)> progress) const
 {
-	assert (!_file.empty ());
-		
+	DCP_ASSERT (!_file.empty ());
+
 	if (_hash.empty ()) {
 		_hash = make_digest (_file, progress);
 	}
@@ -103,20 +123,25 @@ Asset::hash (function<void (float)> progress) const
 }
 
 bool
-Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, function<void (NoteType, string)> note) const
+Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, NoteHandler note) const
 {
 	if (_hash != other->_hash) {
-		note (ERROR, "Asset hashes differ");
+		note (DCP_ERROR, "Asset: hashes differ");
 		return false;
 	}
 
 	return true;
 }
 
+/** Set the file that holds this asset on disk.  Calling this function
+ *  clears this object's store of its hash, so you should call ::hash
+ *  after this.
+ *
+ *  @param file New file's path.
+ */
 void
 Asset::set_file (boost::filesystem::path file) const
 {
 	_file = boost::filesystem::absolute (file);
 	_hash.clear ();
 }
-