projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of custom DCP filename components.
[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 2a6ce9e12620aa5360bf132b2c010f9f189a6487..38808596ec25f01605fc0d48217e44823388fa6d 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>
/*
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.
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
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/>.
*/
*/
@@
-28,7
+29,7
@@
#include "lib/config.h"
#include "lib/exceptions.h"
#include "lib/emailer.h"
#include "lib/config.h"
#include "lib/exceptions.h"
#include "lib/emailer.h"
-#include
"lib/safe_stringstream.h"
+#include
<locked_sstream.h>
#include <dcp/certificate.h>
#include <getopt.h>
#include <iostream>
#include <dcp/certificate.h>
#include <getopt.h>
#include <iostream>
@@
-81,7
+82,7
@@
time_from_string (string t)
static boost::posix_time::time_duration
duration_from_string (string d)
{
static boost::posix_time::time_duration
duration_from_string (string d)
{
-
SafeStringS
tream s (d);
+
locked_strings
tream s (d);
int N;
string unit;
s >> N >> unit;
int N;
string unit;
s >> N >> unit;
@@
-255,7
+256,9
@@
int main (int argc, char* argv[])
}
dcp::Certificate certificate (dcp::file_to_string (certificate_file));
}
dcp::Certificate certificate (dcp::file_to_string (certificate_file));
- dcp::EncryptedKDM kdm = film->make_kdm (certificate, vector<dcp::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";
kdm.as_xml (output);
if (verbose) {
cout << "Generated KDM " << output << " for certificate.\n";
@@
-281,19
+284,29
@@
int main (int argc, char* argv[])
output = ".";
}
output = ".";
}
+ dcp::NameFormat::Map values;
+ values["film_name"] = film->name();
+ values["from"] = dcp::LocalTime(valid_from.get()).date() + " " + dcp::LocalTime(valid_from.get()).time_of_day();
+ values["to"] = dcp::LocalTime(valid_to.get()).date() + " " + dcp::LocalTime(valid_to.get()).time_of_day();
+
try {
list<ScreenKDM> screen_kdms = film->make_kdms (
(*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
);
if (zip) {
try {
list<ScreenKDM> screen_kdms = film->make_kdms (
(*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
);
if (zip) {
- CinemaKDMs::write_zip_files (film->name(), 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 {
if (verbose) {
cout << "Wrote ZIP files to " << output << "\n";
}
} else {
- ScreenKDM::write_files (
film->name(), screen_kdms, output
);
+ ScreenKDM::write_files (
screen_kdms, output, Config::instance()->kdm_filename_format(), values
);
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";