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

diff --git a/src/asset.cc b/src/asset.cc
index 59d106b5..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,76 +18,105 @@
 */
 
 /** @file  src/asset.cc
- *  @brief Parent class for assets of DCPs.
+ *  @brief Asset class.
  */
 
-#include <iostream>
-#include <boost/filesystem.hpp>
-#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 (string mxf_path, sigc::signal1<void, float>* progress, int fps, int length)
-	: _mxf_path (mxf_path)
-	, _progress (progress)
-	, _fps (fps)
-	, _length (length)
-	, _uuid (make_uuid ())
+#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 ()
 {
-	
+
+}
+
+/** 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 (ostream& s) const
+Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
 {
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-#if BOOST_FILESYSTEM_VERSION == 3
-	  << "      <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
-#else		
-	  << "      <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
-#endif		
-	  << "      <Hash>" << _digest << "</Hash>\n"
-	  << "      <Size>" << filesystem::file_size(_mxf_path) << "</Size>\n"
-	  << "      <Type>application/mxf</Type>\n"
-	  << "    </Asset>\n";
+	assert (!_file.empty ());
+	
+	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);
+	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 (ostream& s) 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:" + _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("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)));
+}
+
+string
+Asset::hash (function<void (float)> progress) const
 {
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-	  << "      <ChunkList>\n"
-	  << "        <Chunk>\n"
-#if BOOST_FILESYSTEM_VERSION == 3		
-	  << "          <Path>" << filesystem::path(_mxf_path).filename().string() << "</Path>\n"
-#else		
-	  << "          <Path>" << filesystem::path(_mxf_path).filename() << "</Path>\n"
-#endif		
-	  << "          <VolumeIndex>1</VolumeIndex>\n"
-	  << "          <Offset>0</Offset>\n"
-	  << "          <Length>" << filesystem::file_size(_mxf_path) << "</Length>\n"
-	  << "        </Chunk>\n"
-	  << "      </ChunkList>\n"
-	  << "    </Asset>\n";
+	assert (!_file.empty ());
+		
+	if (_hash.empty ()) {
+		_hash = make_digest (_file, progress);
+	}
+
+	return _hash;
+}
+
+bool
+Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, function<void (NoteType, string)> note) const
+{
+	if (_hash != other->_hash) {
+		note (DCP_ERROR, "Asset hashes differ");
+		return false;
+	}
+
+	return true;
 }
 
 void
-Asset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
+Asset::set_file (boost::filesystem::path file) const
 {
-	writer_info->ProductVersion = Metadata::instance()->product_version;
-	writer_info->CompanyName = Metadata::instance()->company_name;
-	writer_info->ProductName = Metadata::instance()->product_name.c_str();
-
-	writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
-	unsigned int c;
-	Kumu::hex2bin (_uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
-	assert (c == Kumu::UUID_Length);
+	_file = boost::filesystem::absolute (file);
+	_hash.clear ();
 }
+