X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm_cli.cc;h=5126e1954c10405b1929c2acf0a72e1b188afa11;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=cf28ec53f722efb5e0e0f76af50417021fe6211f;hpb=4121af462c1e8b98866ca206a64678fcba96fde7;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index cf28ec53f..5126e1954 100644
--- 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,7 @@
 #include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
-#include "lib/safe_stringstream.h"
+#include "lib/emailer.h"
 #include <dcp/certificate.h>
 #include <getopt.h>
 #include <iostream>
@@ -45,8 +46,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,10 +81,10 @@ time_from_string (string t)
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
-	SafeStringStream s (d);
 	int N;
-	string unit;
-	s >> N >> unit;
+	char unit_buf[64] = "\0";
+	sscanf (d.c_str(), "%d %64s", &N, unit_buf);
+	string const unit (unit_buf);
 
 	if (N == 0) {
 		cerr << "Could not understand duration \"" << d << "\"\n";
@@ -189,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);
 	}
@@ -254,7 +255,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 +266,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,20 +283,29 @@ int main (int argc, char* argv[])
 			output = ".";
 		}
 
+		dcp::NameFormat::Map values;
+		values['f'] = film->name();
+		values['b'] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day();
+		values['e'] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day();
+
 		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 (
+					CinemaKDMs::collect (screen_kdms),
+					output,
+					Config::instance()->kdm_filename_format(),
+					values
+					);
 
 				if (verbose) {
 					cout << "Wrote ZIP files to " << output << "\n";
 				}
 			} else {
-				ScreenKDM::write_files (film, screen_kdms, output);
+				ScreenKDM::write_files (screen_kdms, output, Config::instance()->kdm_filename_format(), values);
 
 				if (verbose) {
 					cout << "Wrote KDM files to " << output << "\n";