Fix isdcf name ATMOS test.

[dcpomatic.git] / src / lib / kdm_cli.cc

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index 56977b52160811b20c966ca60232ed945abc8de7..a76155a2c8d8a4bd6ad17bbe9f508e5fb7561c59 100644 (file)
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -70,8 +70,8 @@ help (std::function<void (string)> out)
        out ("  -e, --email                              email KDMs to cinemas");
        out ("  -z, --zip                                ZIP each cinema's KDMs into its own file");
        out ("  -v, --verbose                            be verbose");
-       out ("  -c, --cinema                             specify a cinema, either by name or email address");
-       out ("  -S, --screen                             screen description");
+       out ("  -c, --cinema                             cinema name (when using -C) or name/email (to filter cinemas)");
+       out ("  -S, --screen                             screen name (when using -C) or screen name (to filter screens when using -c)");
        out ("  -C, --certificate                        file containing projector certificate");
        out ("  -T, --trusted-device                     file containing a trusted device's certificate");
        out ("      --list-cinemas                       list known cinemas from the DCP-o-matic settings");
@@ -357,8 +357,8 @@ from_dkdm (
                        int const offset_hour = i->cinema ? i->cinema->utc_offset_hour() : 0;
                        int const offset_minute = i->cinema ? i->cinema->utc_offset_minute() : 0;
 
-                       dcp::LocalTime begin(valid_from, offset_hour, offset_minute);
-                       dcp::LocalTime end(valid_to, offset_hour, offset_minute);
+                       dcp::LocalTime begin(valid_from, dcp::UTCOffset(offset_hour, offset_minute));
+                       dcp::LocalTime end(valid_to, dcp::UTCOffset(offset_hour, offset_minute));
 
                        auto const kdm = kdm_from_dkdm(
                                                        dkdm,
@@ -423,7 +423,7 @@ try
        optional<string> cinema_name;
        shared_ptr<Cinema> cinema;
        optional<boost::filesystem::path> certificate;
-       string screen;
+       optional<string> screen;
        list<shared_ptr<Screen>> screens;
        optional<dcp::EncryptedKDM> dkdm;
        optional<boost::posix_time::ptime> valid_from;
@@ -440,6 +440,9 @@ try
 
        program_name = argv[0];
 
+       /* Reset getopt() so we can call this method several times in one test process */
+       optind = 1;
+
        int option_index = 0;
        while (true) {
                static struct option long_options[] = {
@@ -535,6 +538,9 @@ try
                        cinema = make_shared<Cinema>(optarg, list<string>(), "", 0, 0);
                        break;
                case 'S':
+                       /* Similarly, this could be the name of a new (temporary) screen or the name of a screen
+                        * to search for.
+                        */
                        screen = optarg;
                        break;
                case 'C':
@@ -558,7 +564,7 @@ try
        if (certificate) {
                /* Make a new screen and add it to the current cinema */
                dcp::CertificateChain chain(dcp::file_to_string(*certificate));
-               auto screen_to_add = std::make_shared<Screen>(screen, "", chain.leaf(), boost::none, vector<TrustedDevice>());
+               auto screen_to_add = std::make_shared<Screen>(screen.get_value_or(""), "", chain.leaf(), boost::none, vector<TrustedDevice>());
                if (cinema) {
                        cinema->add_screen(screen_to_add);
                }
@@ -596,6 +602,9 @@ try
                }
 
                screens = find_cinema (*cinema_name)->screens ();
+               if (screen) {
+                       screens.erase(std::remove_if(screens.begin(), screens.end(), [&screen](shared_ptr<Screen> s) { return s->name != *screen; }), screens.end());
+               }
        }
 
        if (duration_string) {