#include "parse/asset_map.h"
#include "reel.h"
#include "cpl.h"
-#include "encryption.h"
+#include "signer.h"
#include "kdm.h"
using std::string;
using std::stringstream;
using std::ofstream;
using std::ostream;
+using std::copy;
+using std::back_inserter;
+using std::make_pair;
using boost::shared_ptr;
using boost::lexical_cast;
using namespace libdcp;
-DCP::DCP (string directory)
+DCP::DCP (boost::filesystem::path directory)
: _directory (directory)
{
boost::filesystem::create_directories (directory);
}
void
-DCP::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr<Encryption> crypt) const
+DCP::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr<const Signer> signer) const
{
for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
- (*i)->write_xml (interop, metadata, crypt);
+ (*i)->write_xml (interop, metadata, signer);
}
string pkl_uuid = make_uuid ();
- string pkl_path = write_pkl (pkl_uuid, interop, metadata, crypt);
+ string pkl_path = write_pkl (pkl_uuid, interop, metadata, signer);
write_volindex ();
write_assetmap (pkl_uuid, boost::filesystem::file_size (pkl_path), interop, metadata);
}
std::string
-DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, shared_ptr<Encryption> crypt) const
+DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, shared_ptr<const Signer> signer) const
{
assert (!_cpls.empty ());
pkl = doc.create_root_node("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL");
}
- if (crypt) {
+ if (signer) {
pkl->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
}
(*i)->write_to_pkl (asset_list);
}
- if (crypt) {
- sign (pkl, crypt->certificates, crypt->signer_key, interop);
+ if (signer) {
+ signer->sign (pkl, interop);
}
- doc.write_to_file_formatted (p.string (), "UTF-8");
+ doc.write_to_file (p.string (), "UTF-8");
return p.string ();
}
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
root->add_child("Index")->add_child_text ("1");
- doc.write_to_file_formatted (p.string (), "UTF-8");
+ doc.write_to_file (p.string (), "UTF-8");
}
void
}
root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
- root->add_child("Creator")->add_child_text (metadata.creator);
- root->add_child("VolumeCount")->add_child_text ("1");
- root->add_child("IssueDate")->add_child_text (metadata.issue_date);
- root->add_child("Issuer")->add_child_text (metadata.issuer);
+ root->add_child("AnnotationText")->add_child_text ("Created by " + metadata.creator);
+ if (interop) {
+ root->add_child("VolumeCount")->add_child_text ("1");
+ root->add_child("IssueDate")->add_child_text (metadata.issue_date);
+ root->add_child("Issuer")->add_child_text (metadata.issuer);
+ root->add_child("Creator")->add_child_text (metadata.creator);
+ } else {
+ root->add_child("Creator")->add_child_text (metadata.creator);
+ root->add_child("VolumeCount")->add_child_text ("1");
+ root->add_child("IssueDate")->add_child_text (metadata.issue_date);
+ root->add_child("Issuer")->add_child_text (metadata.issuer);
+ }
+
xmlpp::Node* asset_list = root->add_child ("AssetList");
xmlpp::Node* asset = asset_list->add_child ("Asset");
(*i)->write_to_assetmap (asset_list);
}
- doc.write_to_file_formatted (p.string (), "UTF-8");
+ /* This must not be the _formatted version otherwise signature digests will be wrong */
+ doc.write_to_file (p.string (), "UTF-8");
}
-
void
DCP::read (bool require_mxfs)
{
- Files files;
+ read_assets ();
+ read_cpls (require_mxfs);
+}
+void
+DCP::read_assets ()
+{
shared_ptr<parse::AssetMap> asset_map;
try {
boost::filesystem::path p = _directory;
}
} catch (FileError& e) {
- boost::throw_exception (FileError ("could not load AssetMap file", files.asset_map));
+ boost::throw_exception (FileError ("could not load AssetMap file", _files.asset_map));
}
for (list<shared_ptr<libdcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) {
delete p;
if (root == "CompositionPlaylist") {
- files.cpls.push_back (t.string());
+ _files.cpls.push_back (t.string());
} else if (root == "PackingList") {
- if (files.pkl.empty ()) {
- files.pkl = t.string();
+ if (_files.pkl.empty ()) {
+ _files.pkl = t.string();
} else {
boost::throw_exception (DCPReadError ("duplicate PKLs found"));
}
}
}
- if (files.cpls.empty ()) {
+ if (_files.cpls.empty ()) {
boost::throw_exception (FileError ("no CPL files found", ""));
}
- if (files.pkl.empty ()) {
+ if (_files.pkl.empty ()) {
boost::throw_exception (FileError ("no PKL file found", ""));
}
shared_ptr<parse::PKL> pkl;
try {
- pkl.reset (new parse::PKL (files.pkl));
+ pkl.reset (new parse::PKL (_files.pkl));
} catch (FileError& e) {
- boost::throw_exception (FileError ("could not load PKL file", files.pkl));
+ boost::throw_exception (FileError ("could not load PKL file", _files.pkl));
}
- /* Cross-check */
- /* XXX */
+ _asset_maps.push_back (make_pair (boost::filesystem::absolute (_directory).string(), asset_map));
+}
- for (list<string>::iterator i = files.cpls.begin(); i != files.cpls.end(); ++i) {
- _cpls.push_back (shared_ptr<CPL> (new CPL (_directory, *i, asset_map, require_mxfs)));
+void
+DCP::read_cpls (bool require_mxfs)
+{
+ for (list<string>::iterator i = _files.cpls.begin(); i != _files.cpls.end(); ++i) {
+ _cpls.push_back (shared_ptr<CPL> (new CPL (_directory, *i, _asset_maps, require_mxfs)));
}
}
void
DCP::add_kdm (KDM const & kdm)
{
- list<KDMCipher> ciphers = kdm.ciphers ();
+ list<KDMKey> keys = kdm.keys ();
for (list<shared_ptr<CPL> >::iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
- for (list<KDMCipher>::iterator j = ciphers.begin(); j != ciphers.end(); ++j) {
+ for (list<KDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
if (j->cpl_id() == (*i)->id()) {
(*i)->add_kdm (kdm);
}
}
}
}
+
+void
+DCP::add_assets_from (DCP const & ov)
+{
+ copy (ov._asset_maps.begin(), ov._asset_maps.end(), back_inserter (_asset_maps));
+}
projects / libdcp.git / blobdiff