#include "log.h"
#include "zipper.h"
#include "dcpomatic_log.h"
+#include "kdm_with_metadata.h"
#include <boost/foreach.hpp>
#include "i18n.h"
using std::runtime_error;
using boost::shared_ptr;
using boost::function;
+using boost::optional;
void
CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const
name_values['c'] = cinema->name;
BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
- name_values['s'] = i->screen->name;
name_values['i'] = i->kdm_id ();
string const name = careful_string_filter(name_format.get(name_values, ".xml"));
zipper.add (name, i->kdm_as_xml());
CinemaKDMs ck;
list<KDMWithMetadataPtr>::iterator i = screen_kdms.begin ();
- ck.cinema = (*i)->screen->cinema;
+ ck.cinema = (*i)->cinema();
ck.screen_kdms.push_back (*i);
list<KDMWithMetadataPtr>::iterator j = i;
++i;
screen_kdms.remove (*j);
while (i != screen_kdms.end ()) {
- if ((*i)->screen->cinema == ck.cinema) {
+ if ((*i)->cinema() == ck.cinema) {
ck.screen_kdms.push_back (*i);
list<KDMWithMetadataPtr>::iterator j = i;
++i;
string screens;
BOOST_FOREACH (KDMWithMetadataPtr j, i.screen_kdms) {
- screens += j->screen->name + ", ";
+ optional<string> screen_name = j->get('n');
+ if (screen_name) {
+ screens += *screen_name + ", ";
+ }
}
boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
using std::cout;
using std::list;
using boost::shared_ptr;
+using boost::optional;
int
write_files (
/* Write KDMs to the specified directory */
BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
- name_values['c'] = i->screen->cinema ? i->screen->cinema->name : "";
- name_values['s'] = i->screen->name;
name_values['i'] = i->kdm_id ();
boost::filesystem::path out = directory / careful_string_filter(name_format.get(name_values, ".xml"));
if (!boost::filesystem::exists (out) || confirm_overwrite (out)) {
return written;
}
+
+
+optional<string>
+KDMWithMetadata::get (char k) const
+{
+ dcp::NameFormat::Map::const_iterator i = _name_values.find (k);
+ if (i == _name_values.end()) {
+ return optional<string>();
+ }
+
+ return i->second;
+}
#include <dcp/name_format.h>
#include <boost/shared_ptr.hpp>
-namespace dcpomatic {
- class Screen;
-}
+class Cinema;
-/** Simple class to collect a screen and an encrypted KDM */
class KDMWithMetadata
{
public:
- KDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s)
- : screen (s)
+ KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema)
+ : _name_values (name_values)
+ , _cinema (cinema)
{}
virtual ~KDMWithMetadata () {}
virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
virtual std::string kdm_id () const = 0;
- boost::shared_ptr<dcpomatic::Screen> screen;
+ dcp::NameFormat::Map const& name_values () const {
+ return _name_values;
+ }
+
+ boost::optional<std::string> get (char k) const;
+
+ boost::shared_ptr<Cinema> cinema () const {
+ return _cinema;
+ }
+
+private:
+ dcp::NameFormat::Map _name_values;
+ boost::shared_ptr<Cinema> _cinema;
};
class DCPKDMWithMetadata : public KDMWithMetadata
{
public:
- DCPKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, dcp::EncryptedKDM k)
- : KDMWithMetadata (s)
+ DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM k)
+ : KDMWithMetadata (name_values, cinema)
, kdm (k)
{}
class ECinemaKDMWithMetadata : public KDMWithMetadata
{
public:
- ECinemaKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, EncryptedECinemaKDM k)
- : KDMWithMetadata (s)
+ ECinemaKDMWithMetadata (dcp::NameValues::Map const& name_values, boost::shared_ptr<Cinema> cinema, EncryptedECinemaKDM k)
+ : KDMWithMetadata (name_values, cinema)
, kdm (k)
{}
dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
);
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
/* Encrypt */
screen_kdms.push_back (
KDMWithMetadataPtr(
- new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get()))
+ new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get()))
)
);
}
kdm.add_key (j);
}
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
/* Encrypt */
screen_kdms.push_back (
KDMWithMetadataPtr(
new DCPKDMWithMetadata(
- i,
+ name_values,
+ i->cinema,
kdm.encrypt(
signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
disable_forensic_marking_audio
);
- kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm)));
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
+ kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
}
continue;
}
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
screen_kdms.push_back (
KDMWithMetadataPtr(
new DCPKDMWithMetadata(
- i,
+ name_values,
+ i->cinema,
kdm_from_dkdm(
dkdm,
i->recipient.get(),
for_audio
);
- screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm)));
+ dcp::NameFormat::Map name_values;
+ if (i->cinema) {
+ name_values['c'] = i->cinema->name;
+ }
+ name_values['s'] = i->name;
+
+ screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
}