X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=5b64b6ccfe73ffe72bd1049a1c3e227d6d19ddff;hb=201b6fdf572c04424d870ac4d07d1d1a8725b24c;hp=aaa79dc75660bd2877f52254a6c952e0bf386f7f;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git diff --git a/src/asset.cc b/src/asset.cc index aaa79dc7..5b64b6cc 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -1,36 +1,53 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2018 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 * @brief Asset class. */ +#include "raw_convert.h" #include "asset.h" #include "util.h" #include "exceptions.h" +#include "dcp_assert.h" #include "compose.hpp" +#include "pkl.h" #include -#include +#include using std::string; -using boost::lexical_cast; using boost::function; +using boost::shared_ptr; using boost::optional; using namespace dcp; @@ -40,8 +57,7 @@ Asset::Asset () } -/** Create an Asset from a given file. The ID will - * be extracted from the file. +/** Create an Asset from a given file. * @param file File name. */ Asset::Asset (boost::filesystem::path file) @@ -50,74 +66,108 @@ 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::add_to_pkl (shared_ptr pkl, 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); - asset->add_child("AnnotationText")->add_child_text (_id); - asset->add_child("Hash")->add_child_text (hash ()); - asset->add_child("Size")->add_child_text (lexical_cast (boost::filesystem::file_size (_file))); - asset->add_child("Type")->add_child_text (pkl_type (standard)); + 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; + } + + pkl->add_asset (_id, _id, hash(), boost::filesystem::file_size (_file.get()), pkl_type (pkl->standard())); } void Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const { - assert (!_file.empty ()); + DCP_ASSERT (_file); + write_file_to_assetmap (node, root, _file.get(), _id); +} + +void +Asset::write_file_to_assetmap (xmlpp::Node* node, boost::filesystem::path root, boost::filesystem::path file, string id) +{ + optional path = relative_to_root ( + boost::filesystem::canonical (root), + boost::filesystem::canonical (file) + ); + + 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("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 (lexical_cast (boost::filesystem::file_size (_file))); + chunk->add_child("Length")->add_child_text (raw_convert (boost::filesystem::file_size (file))); } 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 (ERROR, "Asset hashes differ"); + note (DCP_ERROR, "Asset: hashes differ"); return false; } return true; } +/** Set the file that holds this asset on disk. Calling this function + * clears this object's store of its hash, so you should call ::hash + * after this. + * + * @param file New file's path. + */ void Asset::set_file (boost::filesystem::path file) const { _file = boost::filesystem::absolute (file); - _hash.clear (); + _hash = optional (); +} + +void +Asset::set_hash (string hash) +{ + _hash = hash; } -