X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=7e60ecc5300dfc80af79c8a524c5193a887b650e;hb=1dc082f3295f64a9fd4a103078a1dbb5121a865d;hp=86bd54c56d700e21446d3c3a016f24011f8a440a;hpb=da2f0d96f3c5ffa73bfecd9df613b23200e862f7;p=libdcp.git

diff --git a/src/asset.cc b/src/asset.cc
index 86bd54c5..7e60ecc5 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,121 +18,96 @@
 */
 
 /** @file  src/asset.cc
- *  @brief Parent class for assets of DCPs.
+ *  @brief Asset class.
  */
 
-#include <iostream>
-#include <fstream>
-#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 directory, string mxf_name, sigc::signal1<void, float>* progress, int fps, int length)
-	: _directory (directory)
-	, _mxf_name (mxf_name)
-	, _progress (progress)
-	, _fps (fps)
-	, _length (length)
-	, _uuid (make_uuid ())
+#include "exceptions.h"
+#include "dcp_assert.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 ()
 {
-	
-}
 
-void
-Asset::write_to_pkl (ostream& s) const
-{
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-	  << "      <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
-	  << "      <Hash>" << _digest << "</Hash>\n"
-	  << "      <Size>" << filesystem::file_size(mxf_path()) << "</Size>\n"
-	  << "      <Type>application/mxf</Type>\n"
-	  << "    </Asset>\n";
 }
 
-void
-Asset::write_to_assetmap (ostream& s) const
+/** Create an Asset from a given file.
+ *  @param file File name.
+ */
+Asset::Asset (boost::filesystem::path file)
+	: _file (file)
 {
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-	  << "      <ChunkList>\n"
-	  << "        <Chunk>\n"
-	  << "          <Path>" << _mxf_name << "</Path>\n"
-	  << "          <VolumeIndex>1</VolumeIndex>\n"
-	  << "          <Offset>0</Offset>\n"
-	  << "          <Length>" << filesystem::file_size(mxf_path()) << "</Length>\n"
-	  << "        </Chunk>\n"
-	  << "      </ChunkList>\n"
-	  << "    </Asset>\n";
+
 }
 
 void
-Asset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
+Asset::write_to_pkl (xmlpp::Node* node, Standard standard) 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);
+	DCP_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));
 }
 
-filesystem::path
-Asset::mxf_path () const
+void
+Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
 {
-	filesystem::path p;
-	p /= _directory;
-	p /= _mxf_name;
-	return p;
+	DCP_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)));
 }
 
-list<string>
-Asset::equals (Asset const & other, EqualityFlags flags) const
+string
+Asset::hash (function<void (float)> progress) const
 {
-	list<string> notes;
-	
-	switch (flags) {
-	case LIBDCP_METADATA:
-		break;
-	case MXF_BITWISE:
-		if (filesystem::file_size (mxf_path()) != filesystem::file_size (other.mxf_path())) {
-			notes.push_back (mxf_path().string() + " and " + other.mxf_path().string() + " sizes differ");
-			return notes;
-		}
+	DCP_ASSERT (!_file.empty ());
 		
-		ifstream a (mxf_path().c_str(), ios::binary);
-		ifstream b (other.mxf_path().c_str(), ios::binary);
-
-		int buffer_size = 65536;
-		char abuffer[buffer_size];
-		char bbuffer[buffer_size];
-
-		int n = filesystem::file_size (mxf_path ());
-
-		while (n) {
-			int const t = min (n, buffer_size);
-			a.read (abuffer, t);
-			b.read (bbuffer, t);
+	if (_hash.empty ()) {
+		_hash = make_digest (_file, progress);
+	}
 
-			for (int i = 0; i < t; ++i) {
-				if (abuffer[i] != bbuffer[i]) {
-					notes.push_back (mxf_path().string() + " and " + other.mxf_path().string() + " content differs");
-					return notes;
-				}
-			}
+	return _hash;
+}
 
-			n -= t;
-		}
+bool
+Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, NoteHandler note) const
+{
+	if (_hash != other->_hash) {
+		note (DCP_ERROR, "Asset: hashes differ");
+		return false;
 	}
 
-	return notes;
+	return true;
 }
+
+void
+Asset::set_file (boost::filesystem::path file) const
+{
+	_file = boost::filesystem::absolute (file);
+	_hash.clear ();
+}
+