Basic support for trusted device lists in KDMs (#750).

[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 67ba2db9a7165149e5c10821cfdb7cffb39a6680..2f8212a619fe2acc0e5035ea93b3d04031ff67a4 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -21,14 +21,16 @@
  *  @brief Command-line program to generate KDMs.
  */
 
-#include <getopt.h>
-#include <dcp/certificate.h>
 #include "lib/film.h"
 #include "lib/cinema.h"
-#include "lib/kdm.h"
+#include "lib/screen_kdm.h"
+#include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
+#include "lib/emailer.h"
 #include "lib/safe_stringstream.h"
+#include <dcp/certificate.h>
+#include <getopt.h>
 #include <iostream>
 
 using std::string;
@@ -188,7 +190,7 @@ int main (int argc, char* argv[])
        if (cinemas) {
                list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
                for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
-                       cout << (*i)->name << " (" << (*i)->email << ")\n";
+                       cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
                }
                exit (EXIT_SUCCESS);
        }
@@ -253,7 +255,7 @@ int main (int argc, char* argv[])
                }
 
                dcp::Certificate certificate (dcp::file_to_string (certificate_file));
-               dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
+               dcp::EncryptedKDM kdm = film->make_kdm (certificate, vector<dcp::Certificate>(), cpl, valid_from.get(), valid_to.get(), formulation);
                kdm.as_xml (output);
                if (verbose) {
                        cout << "Generated KDM " << output << " for certificate.\n";
@@ -262,7 +264,11 @@ int main (int argc, char* argv[])
 
                list<shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
                list<shared_ptr<Cinema> >::const_iterator i = cinemas.begin();
-               while (i != cinemas.end() && (*i)->name != cinema_name && (*i)->email != cinema_name) {
+               while (
+                       i != cinemas.end() &&
+                       (*i)->name != cinema_name &&
+                       find ((*i)->emails.begin(), (*i)->emails.end(), cinema_name) == (*i)->emails.end()) {
+
                        ++i;
                }
 
@@ -276,18 +282,18 @@ int main (int argc, char* argv[])
                }
 
                try {
+                       list<ScreenKDM> screen_kdms = film->make_kdms (
+                               (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+                               );
+
                        if (zip) {
-                               write_kdm_zip_files (
-                                       film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
-                                       );
+                               CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
 
                                if (verbose) {
                                        cout << "Wrote ZIP files to " << output << "\n";
                                }
                        } else {
-                               write_kdm_files (
-                                       film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
-                                       );
+                               ScreenKDM::write_files (film->name(), screen_kdms, output);
 
                                if (verbose) {
                                        cout << "Wrote KDM files to " << output << "\n";