#include <boost/date_time.hpp>
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
-#include <libdcp/crypt_chain.h>
+#include <libdcp/signer_chain.h>
#include <libdcp/cpl.h>
+#include <libdcp/signer.h>
+#include <libdcp/util.h>
+#include <libdcp/kdm.h>
#include "film.h"
#include "job.h"
#include "util.h"
using std::pair;
using std::map;
using std::vector;
-using std::ifstream;
-using std::ofstream;
using std::setfill;
using std::min;
using std::make_pair;
using boost::starts_with;
using boost::optional;
using libdcp::Size;
+using libdcp::Signer;
-int const Film::state_version = 4;
+int const Film::state_version = 5;
/** Construct a Film object in a given directory.
*
}
}
- set_directory (result.string ());
+ set_directory (result);
_log.reset (new FileLog (file ("log")));
_playlist->set_sequence_video (_sequence_video);
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth();
+ if (encrypted ()) {
+ s << "_E";
+ } else {
+ s << "_P";
+ }
+
if (_interop) {
s << "_I";
} else {
}
/** @return The path to the directory to write video frame info files to */
-string
+boost::filesystem::path
Film::info_dir () const
{
boost::filesystem::path p;
p /= "info";
p /= video_identifier ();
- return dir (p.string());
+ return dir (p);
}
-string
+boost::filesystem::path
Film::internal_video_mxf_dir () const
{
return dir ("video");
}
-string
+boost::filesystem::path
Film::internal_video_mxf_filename () const
{
return video_identifier() + ".mxf";
}
-string
+boost::filesystem::path
Film::video_mxf_filename () const
{
return filename_safe_name() + "_video.mxf";
}
-string
+boost::filesystem::path
Film::audio_mxf_filename () const
{
return filename_safe_name() + "_audio.mxf";
void
Film::write_metadata () const
{
- if (!boost::filesystem::exists (directory())) {
- boost::filesystem::create_directory (directory());
+ if (!boost::filesystem::exists (directory ())) {
+ boost::filesystem::create_directory (directory ());
}
LocaleGuard lg;
- boost::filesystem::create_directories (directory());
+ boost::filesystem::create_directories (directory ());
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Metadata");
root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
root->add_child("Interop")->add_child_text (_interop ? "1" : "0");
root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
+ root->add_child("Key")->add_child_text (_key.hex ());
_playlist->as_xml (root->add_child ("Playlist"));
- doc.write_to_file_formatted (file ("metadata.xml"));
+ doc.write_to_file_formatted (file("metadata.xml").string ());
_dirty = false;
}
cxml::Document f ("Metadata");
f.read_file (file ("metadata.xml"));
+
+ int const version = f.number_child<int> ("Version");
_name = f.string_child ("Name");
_use_dci_name = f.bool_child ("UseDCIName");
_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
_video_frame_rate = f.number_child<int> ("VideoFrameRate");
_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
+ _encrypted = f.bool_child ("Encrypted");
_audio_channels = f.number_child<int> ("AudioChannels");
_sequence_video = f.bool_child ("SequenceVideo");
_three_d = f.bool_child ("ThreeD");
_interop = f.bool_child ("Interop");
-
- _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
+ _key = libdcp::Key (f.string_child ("Key"));
+ _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), version);
_dirty = false;
}
/** Given a directory name, return its full path within the Film's directory.
* The directory (and its parents) will be created if they do not exist.
*/
-string
-Film::dir (string d) const
+boost::filesystem::path
+Film::dir (boost::filesystem::path d) const
{
boost::filesystem::path p;
p /= _directory;
boost::filesystem::create_directories (p);
- return p.string ();
+ return p;
}
/** Given a file or directory name, return its full path within the Film's directory.
* Any required parent directories will be created.
*/
-string
-Film::file (string f) const
+boost::filesystem::path
+Film::file (boost::filesystem::path f) const
{
boost::filesystem::path p;
p /= _directory;
boost::filesystem::create_directories (p.parent_path ());
- return p.string ();
+ return p;
}
/** @return a DCI-compliant name for a DCP of this film */
if (!dm.audio_language.empty ()) {
d << "_" << dm.audio_language;
- if (!dm.subtitle_language.empty() && with_subtitles()) {
+ if (!dm.subtitle_language.empty()) {
d << "-" << dm.subtitle_language;
} else {
d << "-XX";
void
-Film::set_directory (string d)
+Film::set_directory (boost::filesystem::path d)
{
_directory = d;
_dirty = true;
_dci_date = boost::gregorian::day_clock::local_day ();
}
-string
+boost::filesystem::path
Film::info_path (int f, Eyes e) const
{
boost::filesystem::path p;
/* info_dir() will already have added any initial bit of the path,
so don't call file() on this.
*/
- return p.string ();
+ return p;
}
-string
+boost::filesystem::path
Film::j2c_path (int f, Eyes e, bool t) const
{
boost::filesystem::path p;
}
p /= s.str();
- return file (p.string ());
+ return file (p);
}
-/** Make an educated guess as to whether we have a complete DCP
- * or not.
- * @return true if we do.
- */
-
-bool
-Film::have_dcp () const
+/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */
+list<boost::filesystem::path>
+Film::dcps () const
{
- try {
- libdcp::DCP dcp (dir (dcp_name()));
- dcp.read ();
- } catch (...) {
- return false;
- }
+ list<boost::filesystem::path> out;
+
+ boost::filesystem::path const dir = directory ();
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+ if (
+ boost::filesystem::is_directory (*i) &&
+ i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
+ ) {
+
+ try {
+ libdcp::DCP dcp (*i);
+ dcp.read ();
+ out.push_back (i->path().leaf ());
+ } catch (...) {
- return true;
+ }
+ }
+ }
+
+ return out;
}
shared_ptr<Player>
_playlist->remove (c);
}
+void
+Film::move_content_earlier (shared_ptr<Content> c)
+{
+ _playlist->move_earlier (c);
+}
+
+void
+Film::move_content_later (shared_ptr<Content> c)
+{
+ _playlist->move_later (c);
+}
+
Time
Film::length () const
{
return _playlist->best_dcp_frame_rate ();
}
+bool
+Film::content_paths_valid () const
+{
+ return _playlist->content_paths_valid ();
+}
+
void
Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{
return libdcp::Size ();
}
-void
-Film::make_kdms (
- list<shared_ptr<Screen> > screens,
+libdcp::KDM
+Film::make_kdm (
+ shared_ptr<libdcp::Certificate> target,
+ boost::filesystem::path dcp_dir,
boost::posix_time::ptime from,
- boost::posix_time::ptime until,
- string directory
+ boost::posix_time::ptime until
) const
{
- string const cd = Config::instance()->crypt_chain_directory ();
- if (boost::filesystem::is_empty (cd)) {
- libdcp::make_crypt_chain (cd);
- }
-
- libdcp::CertificateChain chain;
-
- {
- boost::filesystem::path p (cd);
- p /= "ca.self-signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p.string ())));
- }
-
- {
- boost::filesystem::path p (cd);
- p /= "intermediate.signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p.string ())));
- }
-
- {
- boost::filesystem::path p (cd);
- p /= "leaf.signed.pem";
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p.string ())));
- }
+ shared_ptr<const Signer> signer = make_signer ();
- boost::filesystem::path signer_key (cd);
- signer_key /= "leaf.key";
-
- /* Find the DCP to make the KDM for */
- string const dir = this->directory ();
- list<string> dcps;
- for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
- if (boost::filesystem::is_directory (*i) && i->path().leaf() != "j2c" && i->path().leaf() != "wavs") {
- dcps.push_back (i->path().string());
- }
+ libdcp::DCP dcp (dir (dcp_dir.string ()));
+
+ try {
+ dcp.read ();
+ } catch (...) {
+ throw KDMError (_("Could not read DCP to make KDM for"));
}
+
+ time_t now = time (0);
+ struct tm* tm = localtime (&now);
+ string const issue_date = libdcp::tm_to_string (tm);
+
+ dcp.cpls().front()->set_mxf_keys (key ());
+
+ return libdcp::KDM (dcp.cpls().front(), signer, target, from, until, "DCP-o-matic", issue_date);
+}
- if (dcps.empty()) {
- throw KDMError ("Could not find DCP to make KDM for");
- } else if (dcps.size() > 1) {
- throw KDMError ("More than one possible DCP to make KDM for");
- }
+list<libdcp::KDM>
+Film::make_kdms (
+ list<shared_ptr<Screen> > screens,
+ boost::filesystem::path dcp,
+ boost::posix_time::ptime from,
+ boost::posix_time::ptime until
+ ) const
+{
+ list<libdcp::KDM> kdms;
for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
-
- libdcp::DCP dcp (dcps.front ());
- dcp.read ();
-
- /* XXX: single CPL only */
- shared_ptr<xmlpp::Document> kdm = dcp.cpls().front()->make_kdm (
- chain, signer_key.string(), (*i)->certificate, from, until, _interop, libdcp::MXFMetadata (), Config::instance()->dcp_metadata ()
- );
-
- boost::filesystem::path out = directory;
- out /= "kdm.xml";
- kdm->write_to_file_formatted (out.string());
+ kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until));
}
+
+ return kdms;
}
-
projects / dcpomatic.git / blobdiff