Fix (I think) AuthenticatedPublic signer.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 58c821a7c9f370d056283e4039be2f74abb29e27..06b87953e4631dd42a1cff4a2b680bb0cafc2ba5 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -24,7 +24,9 @@
 #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 "asset.h"
@@ -50,31 +52,27 @@ Asset::Asset (string directory, string file_name, int edit_rate, int intrinsic_d
 }
 
 void
-Asset::write_to_pkl (ostream& s) const
+Asset::write_to_pkl (xmlpp::Node* node) const
 {
-       s << "    <Asset>\n"
-         << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "      <AnnotationText>" << _file_name << "</AnnotationText>\n"
-         << "      <Hash>" << digest() << "</Hash>\n"
-         << "      <Size>" << filesystem::file_size(path()) << "</Size>\n"
-         << "      <Type>application/mxf</Type>\n"
-         << "    </Asset>\n";
+       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);
+       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");
 }
 
 void
-Asset::write_to_assetmap (ostream& s) const
+Asset::write_to_assetmap (xmlpp::Node* node) const
 {
-       s << "    <Asset>\n"
-         << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "      <ChunkList>\n"
-         << "        <Chunk>\n"
-         << "          <Path>" << _file_name << "</Path>\n"
-         << "          <VolumeIndex>1</VolumeIndex>\n"
-         << "          <Offset>0</Offset>\n"
-         << "          <Length>" << filesystem::file_size(path()) << "</Length>\n"
-         << "        </Chunk>\n"
-         << "      </ChunkList>\n"
-         << "    </Asset>\n";
+       xmlpp::Node* asset = node->add_child ("Asset");
+       asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+       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);
+       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
@@ -90,29 +88,36 @@ string
 Asset::digest () const
 {
        if (_digest.empty ()) {
-               _digest = make_digest (path().string());
+               _digest = make_digest (path().string(), 0);
        }
 
        return _digest;
 }
 
+void
+Asset::compute_digest (boost::function<void (float)> progress)
+{
+       if (!_digest.empty ()) {
+               return;
+       }
+
+       _digest = make_digest (path().string(), &progress);
+}
 
 bool
 Asset::equals (shared_ptr<const Asset> other, EqualityOptions, boost::function<void (NoteType, string)> note) const
 {
        if (_edit_rate != other->_edit_rate) {
-               note (ERROR, "MXF edit rates differ");
+               note (ERROR, "asset edit rates differ");
                return false;
        }
        
        if (_intrinsic_duration != other->_intrinsic_duration) {
-               note (ERROR, "MXF intrinsic durations differ");
-               return false;
+               note (ERROR, "asset intrinsic durations differ");
        }
 
        if (_duration != other->_duration) {
-               note (ERROR, "MXF durations differ");
-               return false;
+               note (ERROR, "asset durations differ");
        }
 
        return true;