Make -S parameter to dcpomatic2_kdm_cli also filter screens (#2324).

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

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index 0ec648e0489d1a9eb88db033fbfbe14e9d35731d..79e65f9de4a2dcba16324aac9779d7357df13171 100644 (file)
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -250,7 +250,7 @@ from_film (
                }
                write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
                if (email) {
-                       send_emails ({kdms}, container_name_format, filename_format, film->dcp_name());
+                       send_emails ({kdms}, container_name_format, filename_format, film->dcp_name(), {});
                }
        } catch (FileError& e) {
                throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string()));
@@ -374,7 +374,7 @@ from_dkdm (
                        dcp::NameFormat::Map name_values;
                        name_values['c'] = i->cinema ? i->cinema->name : "";
                        name_values['s'] = i->name;
-                       name_values['f'] = dkdm.annotation_text().get_value_or("");
+                       name_values['f'] = kdm.content_title_text();
                        name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
                        name_values['e'] = end.date() + " " + end.time_of_day(true, false);
                        name_values['i'] = kdm.cpl_id();
@@ -383,7 +383,7 @@ from_dkdm (
                }
                write_files (kdms, zip, output, container_name_format, filename_format, verbose, out);
                if (email) {
-                       send_emails ({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or(""));
+                       send_emails ({kdms}, container_name_format, filename_format, dkdm.annotation_text().get_value_or(""), {});
                }
        } catch (FileError& e) {
                throw KDMCLIError (String::compose("%1 (%2)", e.what(), e.file().string()));
@@ -422,7 +422,8 @@ try
        auto filename_format = Config::instance()->kdm_filename_format();
        optional<string> cinema_name;
        shared_ptr<Cinema> cinema;
-       string screen_description;
+       optional<boost::filesystem::path> certificate;
+       optional<string> screen;
        list<shared_ptr<Screen>> screens;
        optional<dcp::EncryptedKDM> dkdm;
        optional<boost::posix_time::ptime> valid_from;
@@ -439,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[] = {
@@ -534,19 +538,14 @@ try
                        cinema = make_shared<Cinema>(optarg, list<string>(), "", 0, 0);
                        break;
                case 'S':
-                       screen_description = optarg;
+                       /* 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':
-               {
-                       /* Make a new screen and add it to the current cinema */
-                       dcp::CertificateChain chain (dcp::file_to_string(optarg));
-                       auto screen = std::make_shared<Screen>(screen_description, "", chain.leaf(), boost::none, vector<TrustedDevice>());
-                       if (cinema) {
-                               cinema->add_screen (screen);
-                       }
-                       screens.push_back (screen);
+                       certificate = optarg;
                        break;
-               }
                case 'T':
                        /* A trusted device ends up in the last screen we made */
                        if (!screens.empty ()) {
@@ -562,6 +561,16 @@ 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.get_value_or(""), "", chain.leaf(), boost::none, vector<TrustedDevice>());
+               if (cinema) {
+                       cinema->add_screen(screen_to_add);
+               }
+               screens.push_back(screen_to_add);
+       }
+
        if (list_cinemas) {
                auto cinemas = Config::instance()->cinemas ();
                for (auto i: cinemas) {
@@ -593,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) {