Rename --trusted-device to --trusted-device-certificate in the KDM CLI.

[dcpomatic.git] / src / lib / dkdm_recipient.cc

diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index b15487c8ab4935864334ec27957ba0b4fc5ba4a2..4e56a37c4627423a9d8fecd0d1daeaca51b7c3a0 100644 (file)
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -19,9 +19,10 @@
 */
 
 
+#include "config.h"
 #include "dkdm_recipient.h"
-#include "kdm_with_metadata.h"
 #include "film.h"
+#include "kdm_with_metadata.h"
 #include <dcp/raw_convert.h>
 
 
@@ -38,9 +39,6 @@ DKDMRecipient::DKDMRecipient (cxml::ConstNodePtr node)
        for (auto i: node->node_children("Email")) {
                emails.push_back (i->content());
        }
-
-       utc_offset_hour = node->number_child<int>("UTCOffsetHour");
-       utc_offset_minute = node->number_child<int>("UTCOffsetMinute");
 }
 
 
@@ -50,11 +48,8 @@ DKDMRecipient::as_xml (xmlpp::Element* node) const
        KDMRecipient::as_xml (node);
 
        for (auto i: emails) {
-               node->add_child("Email")->add_child_text(i);
+               cxml::add_text_child(node, "Email", i);
        }
-
-       node->add_child("UTCOffsetHour")->add_child_text(raw_convert<string>(utc_offset_hour));
-       node->add_child("UTCOffsetMinute")->add_child_text(raw_convert<string>(utc_offset_minute));
 }
 
 
@@ -63,32 +58,26 @@ kdm_for_dkdm_recipient (
        shared_ptr<const Film> film,
        boost::filesystem::path cpl,
        shared_ptr<DKDMRecipient> recipient,
-       boost::posix_time::ptime valid_from,
-       boost::posix_time::ptime valid_to
+       dcp::LocalTime valid_from,
+       dcp::LocalTime valid_to
        )
 {
        if (!recipient->recipient) {
-               return KDMWithMetadataPtr();
+               return {};
        }
 
-       dcp::LocalTime const begin(valid_from, recipient->utc_offset_hour, recipient->utc_offset_minute);
-       dcp::LocalTime const end  (valid_to,   recipient->utc_offset_hour, recipient->utc_offset_minute);
+       auto signer = Config::instance()->signer_chain();
+       if (!signer->valid()) {
+               throw InvalidSignerError();
+       }
 
-       auto const kdm = film->make_kdm (
-                       recipient->recipient.get(),
-                       vector<string>(),
-                       cpl,
-                       begin,
-                       end,
-                       dcp::Formulation::MODIFIED_TRANSITIONAL_1,
-                       true,
-                       0
-                       );
+       auto const decrypted_kdm = film->make_kdm(cpl, valid_from, valid_to);
+       auto const kdm = decrypted_kdm.encrypt(signer, recipient->recipient.get(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
        dcp::NameFormat::Map name_values;
        name_values['f'] = kdm.content_title_text();
-       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+       name_values['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false);
+       name_values['e'] = valid_to.date() + " " + valid_to.time_of_day(true, false);
        name_values['i'] = kdm.cpl_id();
 
        return make_shared<KDMWithMetadata>(name_values, nullptr, recipient->emails, kdm);