Use optional<> more.
[dcpomatic.git] / src / tools / dcpomatic_kdm_cli.cc
index de89a9c7c2446f120c20f72ec5203a63e3a368e6..bc7dd60c66b0d5e329a89d3edca8ea93d0714ede 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,7 +29,6 @@
 #include "lib/config.h"
 #include "lib/exceptions.h"
 #include "lib/emailer.h"
-#include <locked_sstream.h>
 #include <dcp/certificate.h>
 #include <getopt.h>
 #include <iostream>
@@ -40,6 +39,8 @@ using std::cerr;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
+using boost::optional;
+using boost::bind;
 
 static void
 help ()
@@ -82,10 +83,10 @@ time_from_string (string t)
 static boost::posix_time::time_duration
 duration_from_string (string d)
 {
-       locked_stringstream s (d);
        int N;
-       string unit;
-       s >> N >> unit;
+       char unit_buf[64] = "\0";
+       sscanf (d.c_str(), "%d %63s", &N, unit_buf);
+       string const unit (unit_buf);
 
        if (N == 0) {
                cerr << "Could not understand duration \"" << d << "\"\n";
@@ -106,16 +107,71 @@ duration_from_string (string d)
        exit (EXIT_FAILURE);
 }
 
+static bool
+always_overwrite ()
+{
+       return true;
+}
+
+void
+write_files (list<ScreenKDM> screen_kdms, bool zip, boost::filesystem::path output, dcp::NameFormat::Map values, bool verbose)
+{
+       if (zip) {
+               int const N = CinemaKDMs::write_zip_files (
+                       CinemaKDMs::collect (screen_kdms),
+                       output,
+                       Config::instance()->kdm_container_name_format(),
+                       Config::instance()->kdm_filename_format(),
+                       values,
+                       bind (&always_overwrite)
+                       );
+
+               if (verbose) {
+                       cout << "Wrote " << N << " ZIP files to " << output << "\n";
+               }
+       } else {
+               int const N = ScreenKDM::write_files (
+                       screen_kdms, output, Config::instance()->kdm_filename_format(), values,
+                       bind (&always_overwrite)
+                       );
+
+               if (verbose) {
+                       cout << "Wrote " << N << " KDM files to " << output << "\n";
+               }
+       }
+}
+
+shared_ptr<Cinema>
+find_cinema (string cinema_name)
+{
+       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 &&
+               find ((*i)->emails.begin(), (*i)->emails.end(), cinema_name) == (*i)->emails.end()) {
+
+               ++i;
+       }
+
+       if (i == cinemas.end ()) {
+               cerr << program_name << ": could not find cinema \"" << cinema_name << "\"\n";
+               exit (EXIT_FAILURE);
+       }
+
+       return *i;
+}
+
 int main (int argc, char* argv[])
 {
-       boost::filesystem::path output;
-       boost::optional<boost::posix_time::ptime> valid_from;
-       boost::optional<boost::posix_time::ptime> valid_to;
-       string certificate_file;
+       optional<boost::filesystem::path> output;
+       optional<boost::posix_time::ptime> valid_from;
+       optional<boost::posix_time::ptime> valid_to;
+       optional<string> certificate_file;
        bool zip = false;
-       string cinema_name;
+       optional<string> cinema_name;
        bool cinemas = false;
-       string duration_string;
+       optional<string> duration_string;
        bool verbose = false;
        dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
 
@@ -196,7 +252,7 @@ int main (int argc, char* argv[])
                exit (EXIT_SUCCESS);
        }
 
-       if (duration_string.empty() && !valid_to) {
+       if (!duration_string && !valid_to) {
                error ("you must specify a --valid-duration or --valid-to");
        }
 
@@ -210,15 +266,15 @@ int main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       if (cinema_name.empty() && certificate_file.empty()) {
+       if (!cinema_name && !certificate_file) {
                error ("you must specify either a cinema, a screen or a certificate file");
        }
 
-       if (!duration_string.empty ()) {
-               valid_to = valid_from.get() + duration_from_string (duration_string);
+       if (duration_string) {
+               valid_to = valid_from.get() + duration_from_string (*duration_string);
        }
 
-       string const film_dir = argv[optind];
+       boost::filesystem::path const film_dir = argv[optind];
 
        dcpomatic_setup_path_encoding ();
        dcpomatic_setup ();
@@ -231,7 +287,7 @@ int main (int argc, char* argv[])
                        cout << "Read film " << film->name () << "\n";
                }
        } catch (std::exception& e) {
-               cerr << program_name << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
+               cerr << program_name << ": error reading film `" << film_dir.string() << "' (" << e.what() << ")\n";
                exit (EXIT_FAILURE);
        }
 
@@ -249,69 +305,37 @@ int main (int argc, char* argv[])
 
        boost::filesystem::path cpl = cpls.front().cpl_file;
 
-       if (cinema_name.empty ()) {
+       if (!cinema_name) {
 
-               if (output.empty ()) {
+               if (!output) {
                        error ("you must specify --output");
                }
 
-               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, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
+                       certificate, vector<dcp::Certificate>(), cpl, dcp::LocalTime (*valid_from), dcp::LocalTime (*valid_to), formulation
                        );
-               kdm.as_xml (output);
+               kdm.as_xml (*output);
                if (verbose) {
-                       cout << "Generated KDM " << output << " for certificate.\n";
+                       cout << "Generated KDM " << *output << " for certificate.\n";
                }
        } else {
 
-               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 &&
-                       find ((*i)->emails.begin(), (*i)->emails.end(), cinema_name) == (*i)->emails.end()) {
-
-                       ++i;
-               }
-
-               if (i == cinemas.end ()) {
-                       cerr << program_name << ": could not find cinema \"" << cinema_name << "\"\n";
-                       exit (EXIT_FAILURE);
-               }
-
-               if (output.empty ()) {
+               if (!output) {
                        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();
+               values['b'] = dcp::LocalTime(*valid_from).date() + " " + dcp::LocalTime(*valid_from).time_of_day(true, false);
+               values['e'] = dcp::LocalTime(*valid_to).date() + " " + dcp::LocalTime(*valid_to).time_of_day(true, false);
 
                try {
                        list<ScreenKDM> screen_kdms = film->make_kdms (
-                               (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
+                               find_cinema(*cinema_name)->screens(), cpl, valid_from.get(), valid_to.get(), formulation
                                );
 
-                       if (zip) {
-                               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 (screen_kdms, output, Config::instance()->kdm_filename_format(), values);
-
-                               if (verbose) {
-                                       cout << "Wrote KDM files to " << output << "\n";
-                               }
-                       }
+                       write_files (screen_kdms, zip, *output, values, verbose);
                } catch (FileError& e) {
                        cerr << argv[0] << ": " << e.what() << " (" << e.file().string() << ")\n";
                        exit (EXIT_FAILURE);