X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=7d3a9813aa81b8a5be5546a63527eb782d69059f;hb=cfea0afd5971ee749142616fe7bc0bb70526619e;hp=96196b41e3a999a284ca9db7803bd93471c5ce32;hpb=595d4fbfee788edfad7f9f8dfe7e76ee634c1a94;p=libdcp.git diff --git a/src/asset.cc b/src/asset.cc index 96196b41..7d3a9813 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -1,20 +1,34 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/asset.cc @@ -25,8 +39,10 @@ #include "asset.h" #include "util.h" #include "exceptions.h" +#include "dcp_assert.h" #include "compose.hpp" #include +#include using std::string; using boost::function; @@ -48,61 +64,84 @@ Asset::Asset (boost::filesystem::path file) } -/** Create an Asset with a specified ID. - * @param id ID to use. +/** Create an Asset from a given file with a known ID. + * @param file File name. + * @param id ID. */ -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); + + optional path = relative_to_root ( + boost::filesystem::canonical (root), + boost::filesystem::canonical (_file.get()) + ); + + 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); asset->add_child("Hash")->add_child_text (hash ()); - asset->add_child("Size")->add_child_text (raw_convert (boost::filesystem::file_size (_file))); + asset->add_child("Size")->add_child_text (raw_convert (boost::filesystem::file_size (_file.get()))); asset->add_child("Type")->add_child_text (pkl_type (standard)); } void Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const { - assert (!_file.empty ()); + DCP_ASSERT (_file); + + optional path = relative_to_root ( + boost::filesystem::canonical (root), + boost::filesystem::canonical (_file.get()) + ); + + 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 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 (boost::filesystem::file_size (_file))); + chunk->add_child("Length")->add_child_text (raw_convert (boost::filesystem::file_size (_file.get()))); } string Asset::hash (function progress) const { - assert (!_file.empty ()); - - if (_hash.empty ()) { - _hash = make_digest (_file, progress); + DCP_ASSERT (_file); + + if (!_hash) { + _hash = make_digest (_file.get(), progress); } - return _hash; + return _hash.get(); } bool -Asset::equals (boost::shared_ptr other, EqualityOptions, function note) const +Asset::equals (boost::shared_ptr other, EqualityOptions, NoteHandler note) const { if (_hash != other->_hash) { note (DCP_ERROR, "Asset: hashes differ"); @@ -112,10 +151,21 @@ Asset::equals (boost::shared_ptr other, EqualityOptions, function (); +} + +void +Asset::set_hash (string hash) +{ + _hash = hash; } -