Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[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 cf28ec53f722efb5e0e0f76af50417021fe6211f..4c527ee0c59ca9afd29835af62f0c44a5ddcdb45 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -27,7 +28,8 @@
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
-#include "lib/safe_stringstream.h"
+#include "lib/emailer.h"
+#include <locked_sstream.h>
 #include <dcp/certificate.h>
 #include <getopt.h>
 #include <iostream>
@@ -45,8 +47,8 @@ help ()
        cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n"
                "  -h, --help             show this help\n"
                "  -o, --output           output file or directory\n"
-               "  -f, --valid-from       valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
-               "  -t, --valid-to         valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n"
+               "  -f, --valid-from       valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
+               "  -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"
                "      --formulation      modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
                "  -z, --zip              ZIP each cinema's KDMs into its own file\n"
@@ -80,7 +82,7 @@ time_from_string (string t)
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
-       SafeStringStream s (d);
+       locked_stringstream s (d);
        int N;
        string unit;
        s >> N >> unit;
@@ -189,7 +191,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);
        }
@@ -254,7 +256,9 @@ 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, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+                       );
                kdm.as_xml (output);
                if (verbose) {
                        cout << "Generated KDM " << output << " for certificate.\n";
@@ -263,7 +267,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;
                }
 
@@ -277,19 +285,18 @@ int main (int argc, char* argv[])
                }
 
                try {
-                       list<ScreenKDM> screen_kdms = ScreenKDM::collect (
-                               (*i)->screens(),
-                               film->make_kdms ((*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation)
+                       list<ScreenKDM> screen_kdms = film->make_kdms (
+                               (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
                                );
 
                        if (zip) {
-                               CinemaKDMs::write_zip_files (film, CinemaKDMs::collect (screen_kdms), output);
+                               CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
 
                                if (verbose) {
                                        cout << "Wrote ZIP files to " << output << "\n";
                                }
                        } else {
-                               ScreenKDM::write_files (film, screen_kdms, output);
+                               ScreenKDM::write_files (film->name(), screen_kdms, output);
 
                                if (verbose) {
                                        cout << "Wrote KDM files to " << output << "\n";