From 2d5c6f23650ae3a912badc8b059c83d40c61a0fa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 Apr 2020 01:06:13 +0200 Subject: [PATCH] Derive Screen from a new class KDMRecipient. --- src/lib/kdm_recipient.cc | 45 ++++++++++++++++++++++++++++++++++++++++ src/lib/kdm_recipient.h | 43 ++++++++++++++++++++++++++++++++++++++ src/lib/screen.cc | 17 ++------------- src/lib/screen.h | 14 +++++-------- src/lib/wscript | 1 + 5 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 src/lib/kdm_recipient.cc create mode 100644 src/lib/kdm_recipient.h diff --git a/src/lib/kdm_recipient.cc b/src/lib/kdm_recipient.cc new file mode 100644 index 000000000..d05192ac6 --- /dev/null +++ b/src/lib/kdm_recipient.cc @@ -0,0 +1,45 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic 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. + + DCP-o-matic 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 DCP-o-matic. If not, see . + +*/ + +#include "kdm_recipient.h" + +KDMRecipient::KDMRecipient (cxml::ConstNodePtr node) + : name (node->string_child("Name")) + , notes (node->optional_string_child("Notes").get_value_or ("")) +{ + if (node->optional_string_child("Certificate")) { + recipient = dcp::Certificate (node->string_child("Certificate")); + } else if (node->optional_string_child("Recipient")) { + recipient = dcp::Certificate (node->string_child("Recipient")); + } +} + + +void +KDMRecipient::as_xml (xmlpp::Element* parent) const +{ + parent->add_child("Name")->add_child_text(name); + if (recipient) { + parent->add_child("Recipient")->add_child_text(recipient->certificate(true)); + } + + parent->add_child("Notes")->add_child_text(notes); +} + diff --git a/src/lib/kdm_recipient.h b/src/lib/kdm_recipient.h new file mode 100644 index 000000000..ee4e8c39c --- /dev/null +++ b/src/lib/kdm_recipient.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic 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. + + DCP-o-matic 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 DCP-o-matic. If not, see . + +*/ + +#include +#include +#include +#include +#include + +class KDMRecipient +{ +public: + KDMRecipient (std::string const& name_, std::string const& notes_, boost::optional recipient_) + : name (name_) + , notes (notes_) + , recipient (recipient_) + {} + + explicit KDMRecipient (cxml::ConstNodePtr); + + virtual void as_xml (xmlpp::Element *) const; + + std::string name; + std::string notes; + boost::optional recipient; +}; diff --git a/src/lib/screen.cc b/src/lib/screen.cc index c4bcb41c7..2441efccb 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -34,15 +34,8 @@ using boost::optional; using namespace dcpomatic; Screen::Screen (cxml::ConstNodePtr node) - : name (node->string_child("Name")) - , notes (node->optional_string_child("Notes").get_value_or ("")) + : KDMRecipient (node) { - if (node->optional_string_child ("Certificate")) { - recipient = dcp::Certificate (node->string_child ("Certificate")); - } else if (node->optional_string_child ("Recipient")) { - recipient = dcp::Certificate (node->string_child ("Recipient")); - } - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) { if (boost::algorithm::starts_with(i->content(), "-----BEGIN CERTIFICATE-----")) { trusted_devices.push_back (TrustedDevice(dcp::Certificate(i->content()))); @@ -55,13 +48,7 @@ Screen::Screen (cxml::ConstNodePtr node) void Screen::as_xml (xmlpp::Element* parent) const { - parent->add_child("Name")->add_child_text (name); - if (recipient) { - parent->add_child("Recipient")->add_child_text (recipient->certificate (true)); - } - - parent->add_child("Notes")->add_child_text (notes); - + KDMRecipient::as_xml (parent); BOOST_FOREACH (TrustedDevice i, trusted_devices) { parent->add_child("TrustedDevice")->add_child_text(i.as_string()); } diff --git a/src/lib/screen.h b/src/lib/screen.h index a564f1ed3..013afff85 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -22,6 +22,7 @@ #define DCPOMATIC_SCREEN_H #include "kdm_with_metadata.h" +#include "kdm_recipient.h" #include "trusted_device.h" #include #include @@ -40,14 +41,12 @@ namespace dcpomatic { * `recipient' (i.e. the mediablock) and the certificates/thumbprints * of any trusted devices. */ -class Screen +class Screen : public KDMRecipient { public: - Screen (std::string const & na, std::string const & no, boost::optional rec, std::vector td) - : name (na) - , notes (no) - , recipient (rec) - , trusted_devices (td) + Screen (std::string const & name_, std::string const & notes_, boost::optional recipient_, std::vector trusted_devices_) + : KDMRecipient (name_, notes_, recipient_) + , trusted_devices (trusted_devices_) {} explicit Screen (cxml::ConstNodePtr); @@ -56,9 +55,6 @@ public: std::vector trusted_device_thumbprints () const; boost::shared_ptr cinema; - std::string name; - std::string notes; - boost::optional recipient; std::vector trusted_devices; }; diff --git a/src/lib/wscript b/src/lib/wscript index 508e5f990..828f0290b 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -125,6 +125,7 @@ sources = """ j2k_encoder.cc json_server.cc kdm_with_metadata.cc + kdm_recipient.cc lock_file_checker.cc log.cc log_entry.cc -- 2.30.2