X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=80b010825b57eb95f72acf39d801bc2a9185fef2;hb=7bca4c05ca38b218c252b0fe98a866806d9a2ded;hp=d99043cf1d7c9a506379c6870abfc3dc89576f19;hpb=d86d3f66f88623bea44033db4855206dd3a5e830;p=libdcp.git

diff --git a/src/asset.cc b/src/asset.cc
index d99043cf..80b01082 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014 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
@@ -18,107 +18,105 @@
 */
 
 /** @file  src/asset.cc
- *  @brief Parent class for assets of DCPs.
+ *  @brief Asset class.
  */
 
-#include <iostream>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/function.hpp>
-#include <libxml++/nodes/element.h>
-#include "AS_DCP.h"
-#include "KM_util.h"
+#include "raw_convert.h"
 #include "asset.h"
 #include "util.h"
-#include "metadata.h"
-
-using namespace std;
-using namespace boost;
-using namespace libdcp;
-
-Asset::Asset (boost::filesystem::path directory, boost::filesystem::path file_name)
-	: _directory (directory)
-	, _file_name (file_name)
-	, _uuid (make_uuid ())
-	, _edit_rate (0)
-	, _entry_point (0)
-	, _intrinsic_duration (0)
-	, _duration (0)
+#include "exceptions.h"
+#include "compose.hpp"
+#include <libxml++/libxml++.h>
+
+using std::string;
+using boost::function;
+using boost::optional;
+using namespace dcp;
+
+/** Create an Asset with a randomly-generated ID */
+Asset::Asset ()
 {
-	if (_file_name.empty ()) {
-		_file_name = _uuid + ".xml";
-	}
+
+}
+
+/** Create an Asset from a given file.  The ID will
+ *  be extracted from the file.
+ *  @param file File name.
+ */
+Asset::Asset (boost::filesystem::path file)
+	: _file (file)
+{
+
+}
+
+/** Create an Asset with a specified ID.
+ *  @param id ID to use.
+ */
+Asset::Asset (string id)
+	: Object (id)
+{
+
 }
 
 void
-Asset::write_to_pkl (xmlpp::Node* node) const
+Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
 {
+	assert (!_file.empty ());
+	
 	xmlpp::Node* asset = node->add_child ("Asset");
-	asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
-	asset->add_child("AnnotationText")->add_child_text (_file_name.string ());
-	asset->add_child("Hash")->add_child_text (digest ());
-	asset->add_child("Size")->add_child_text (lexical_cast<string> (filesystem::file_size(path())));
-	asset->add_child("Type")->add_child_text ("application/mxf");
+	asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
+	asset->add_child("AnnotationText")->add_child_text (_id);
+	asset->add_child("Hash")->add_child_text (hash ());
+	asset->add_child("Size")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
+	asset->add_child("Type")->add_child_text (pkl_type (standard));
 }
 
 void
-Asset::write_to_assetmap (xmlpp::Node* node) const
+Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
 {
+	assert (!_file.empty ());
+
 	xmlpp::Node* asset = node->add_child ("Asset");
-	asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+	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");
-	chunk->add_child("Path")->add_child_text (_file_name.string ());
+	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("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text ("0");
-	chunk->add_child("Length")->add_child_text (lexical_cast<string> (filesystem::file_size(path())));
-}
-
-filesystem::path
-Asset::path () const
-{
-	filesystem::path p;
-	p /= _directory;
-	p /= _file_name;
-	return p;
+	chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
 }
 
 string
-Asset::digest () const
+Asset::hash (function<void (float)> progress) const
 {
-	if (_digest.empty ()) {
-		_digest = make_digest (path().string(), 0);
+	assert (!_file.empty ());
+		
+	if (_hash.empty ()) {
+		_hash = make_digest (_file, progress);
 	}
 
-	return _digest;
-}
-
-void
-Asset::compute_digest (boost::function<void (float)> progress)
-{
-	if (!_digest.empty ()) {
-		return;
-	}
-
-	_digest = make_digest (path().string(), &progress);
+	return _hash;
 }
 
 bool
-Asset::equals (shared_ptr<const Asset> other, EqualityOptions, boost::function<void (NoteType, string)> note) const
+Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, function<void (NoteType, string)> note) const
 {
-	if (_edit_rate != other->_edit_rate) {
-		note (ERROR, "asset edit rates differ");
+	if (_hash != other->_hash) {
+		note (DCP_ERROR, "Asset hashes differ");
 		return false;
 	}
-	
-	if (_intrinsic_duration != other->_intrinsic_duration) {
-		note (ERROR, "asset intrinsic durations differ");
-	}
-
-	if (_duration != other->_duration) {
-		note (ERROR, "asset durations differ");
-	}
 
 	return true;
 }
+
+void
+Asset::set_file (boost::filesystem::path file) const
+{
+	_file = boost::filesystem::absolute (file);
+	_hash.clear ();
+}
+