Rename ScreenKDM -> KDMWithMetadata

[dcpomatic.git] / src / tools / dcpomatic_kdm_cli.cc

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index ece45c73edacb95f951cf5e8656dc95f182c1117..1aad31cb534d7d1fd656bad295b55de3afc95110 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,7 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
@@ -42,10 +42,12 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::vector;
+using std::runtime_error;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 static void
 help ()
@@ -59,8 +61,8 @@ help ()
                "  -t, --valid-to                           valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n"
                "  -d, --valid-duration                     valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
                "  -F, --formulation                        modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
-               "  -a, --disable-forensic-marking-picture   disable forensic of pictures essences\n"
-               "  -a, --disable-forensic-marking-audio     disable forensic of audio essences (optionally above a given channel, e.g 12)\n"
+               "  -a, --disable-forensic-marking-picture   disable forensic marking of pictures essences\n"
+               "  -a, --disable-forensic-marking-audio     disable forensic marking of audio essences (optionally above a given channel, e.g 12)\n"
                "  -z, --zip                                ZIP each cinema's KDMs into its own file\n"
                "  -v, --verbose                            be verbose\n"
                "  -c, --cinema                             specify a cinema, either by name or email address\n"
@@ -128,7 +130,7 @@ always_overwrite ()
 
 void
 write_files (
-       list<ScreenKDM> screen_kdms,
+       list<shared_ptr<KDMWithMetadata> > screen_kdms,
        bool zip,
        boost::filesystem::path output,
        dcp::NameFormat container_name_format,
@@ -151,7 +153,7 @@ write_files (
                        cout << "Wrote " << N << " ZIP files to " << output << "\n";
                }
        } else {
-               int const N = ScreenKDM::write_files (
+               int const N = KDMWithMetadata::write_files (
                        screen_kdms, output, filename_format, values,
                        bind (&always_overwrite)
                        );
@@ -227,17 +229,35 @@ from_film (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<ScreenKDM> screen_kdms = film->make_kdms (
-                       screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
-                       );
+               list<shared_ptr<KDMWithMetadata> > kdms;
 
-               write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+               BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+                       if (i->recipient) {
+                               dcp::EncryptedKDM const kdm = film->make_kdm (
+                                               i->recipient.get(),
+                                               i->trusted_device_thumbprints(),
+                                               cpl,
+                                               dcp::LocalTime(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+                                               dcp::LocalTime(valid_to,   i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+                                               formulation,
+                                               disable_forensic_marking_picture,
+                                               disable_forensic_marking_audio
+                                               );
+
+                               kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
+                       }
+               }
+
+               write_files (kdms, zip, output, container_name_format, filename_format, values, verbose);
        } catch (FileError& e) {
                cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
                exit (EXIT_FAILURE);
        } catch (KDMError& e) {
                cerr << program_name << ": " << e.what() << "\n";
                exit (EXIT_FAILURE);
+       } catch (runtime_error& e) {
+               cerr << program_name << ": " << e.what() << "\n";
+               exit (EXIT_FAILURE);
        }
 }
 
@@ -325,24 +345,26 @@ from_dkdm (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<ScreenKDM> screen_kdms;
+               list<shared_ptr<KDMWithMetadata> > screen_kdms;
                BOOST_FOREACH (shared_ptr<Screen> i, screens) {
                        if (!i->recipient) {
                                continue;
                        }
 
                        screen_kdms.push_back (
-                               ScreenKDM (
-                                       i,
-                                       kdm_from_dkdm (
-                                               dkdm,
-                                               i->recipient.get(),
-                                               i->trusted_device_thumbprints(),
-                                               dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-                                               dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-                                               formulation,
-                                               disable_forensic_marking_picture,
-                                               disable_forensic_marking_audio
+                               shared_ptr<KDMWithMetadata>(
+                                       new DCPKDMWithMetadata(
+                                               i,
+                                               kdm_from_dkdm(
+                                                       dkdm,
+                                                       i->recipient.get(),
+                                                       i->trusted_device_thumbprints(),
+                                                       dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                                       dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                                       formulation,
+                                                       disable_forensic_marking_picture,
+                                                       disable_forensic_marking_audio
+                                                       )
                                                )
                                        )
                                );
@@ -500,7 +522,8 @@ int main (int argc, char* argv[])
                case 'C':
                {
                        /* Make a new screen and add it to the current cinema */
-                       shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<TrustedDevice>()));
+                       dcp::CertificateChain chain (dcp::file_to_string(optarg));
+                       shared_ptr<Screen> screen (new Screen (screen_description, "", chain.leaf(), vector<TrustedDevice>()));
                        if (cinema) {
                                cinema->add_screen (screen);
                        }