Switch "command-like" options --list-cinemas and --list-dkdm-cpls to actual commands.

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

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index 28b4012ea227310d89ee2fca3145f2d31d0ff348..f63fd2a550d30275c1a3ed16e468ddf79efb12d2 100644 (file)
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -57,7 +57,11 @@ using namespace dcpomatic;
 static void
 help (std::function<void (string)> out)
 {
-       out (String::compose("Syntax: %1 [OPTION] <FILM|CPL-ID|DKDM>", program_name));
+       out (String::compose("Syntax: %1 [OPTION] [COMMAND] <FILM|CPL-ID|DKDM>", program_name));
+       out ("Commands:");
+       out ("create          create KDMs; default if no other command is specified");
+       out ("list-cinemas    list known cinemas from DCP-o-matic settings");
+       out ("list-dkdm-cpls  list CPLs for which DCP-o-matic has DKDMs");
        out ("  -h, --help                               show this help");
        out ("  -o, --output <path>                      output file or directory");
        out ("  -K, --filename-format <format>           filename format for KDMs");
@@ -75,9 +79,9 @@ help (std::function<void (string)> out)
        out ("  -S, --screen <name>                      screen name (when using -C) or screen name (to filter screens when using -c)");
        out ("  -C, --projector-certificate <file>       file containing projector certificate");
        out ("  -T, --trusted-device-certificate <file>  file containing a trusted device's certificate");
+       out ("      --decryption-key <file>              file containing the private key which can decrypt the given DKDM");
+       out ("                                           (DCP-o-matic's configured private key will be used otherwise)");
        out ("      --cinemas-file <file>                use the given file as a list of cinemas instead of the current configuration");
-       out ("      --list-cinemas                       list known cinemas from the DCP-o-matic settings");
-       out ("      --list-dkdm-cpls                     list CPLs for which DCP-o-matic has DKDMs");
        out ("");
        out ("CPL-ID must be the ID of a CPL that is mentioned in DCP-o-matic's DKDM list.");
        out ("");
@@ -245,7 +249,6 @@ from_film (
                        }
                }
 
-
                if (find_if(
                        period_checks.begin(),
                        period_checks.end(),
@@ -449,14 +452,14 @@ try
        optional<string> cinema_name;
        shared_ptr<Cinema> cinema;
        optional<boost::filesystem::path> projector_certificate;
+       optional<boost::filesystem::path> decryption_key;
        optional<string> screen;
        vector<shared_ptr<Screen>> screens;
        optional<dcp::EncryptedKDM> dkdm;
        optional<dcp::LocalTime> valid_from;
        optional<dcp::LocalTime> valid_to;
        bool zip = false;
-       bool list_cinemas = false;
-       bool list_dkdm_cpls = false;
+       string command = "create";
        optional<string> duration_string;
        bool verbose = false;
        dcp::Formulation formulation = dcp::Formulation::MODIFIED_TRANSITIONAL_1;
@@ -490,13 +493,12 @@ try
                        { "screen", required_argument, 0, 'S' },
                        { "projector-certificate", required_argument, 0, 'C' },
                        { "trusted-device-certificate", required_argument, 0, 'T' },
-                       { "list-cinemas", no_argument, 0, 'B' },
-                       { "list-dkdm-cpls", no_argument, 0, 'D' },
+                       { "decryption-key", required_argument, 0, 'G' },
                        { "cinemas-file", required_argument, 0, 'E' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:BDE:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:E:G:", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -580,11 +582,8 @@ try
                                screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg))));
                        }
                        break;
-               case 'B':
-                       list_cinemas = true;
-                       break;
-               case 'D':
-                       list_dkdm_cpls = true;
+               case 'G':
+                       decryption_key = optarg;
                        break;
                case 'E':
                        cinemas_file = optarg;
@@ -592,6 +591,26 @@ try
                }
        }
 
+       vector<string> commands = {
+               "create",
+               "list-cinemas",
+               "list-dkdm-cpls"
+       };
+
+       if (optind < argc - 1) {
+               /* Command with some KDM / CPL / whever specified afterwards */
+               command = argv[optind++];
+       } else if (optind < argc) {
+               /* Look for a valid command, hoping that it's not the name of the KDM / CPL / whatever */
+               if (std::find(commands.begin(), commands.end(), argv[optind]) != commands.end()) {
+                       command = argv[optind];
+               }
+       }
+
+       if (std::find(commands.begin(), commands.end(), command) == commands.end()) {
+               throw KDMCLIError(String::compose("Unrecognised command %1", command));
+       }
+
        if (cinemas_file) {
                Config::instance()->set_cinemas_file(*cinemas_file);
        }
@@ -606,7 +625,7 @@ try
                screens.push_back(screen_to_add);
        }
 
-       if (list_cinemas) {
+       if (command == "list-cinemas") {
                auto cinemas = Config::instance()->cinemas ();
                for (auto i: cinemas) {
                        out (String::compose("%1 (%2)", i->name, Email::address_list(i->emails)));
@@ -614,7 +633,7 @@ try
                return {};
        }
 
-       if (list_dkdm_cpls) {
+       if (command == "list-dkdm-cpls") {
                dump_dkdm_group (Config::instance()->dkdms(), 0, out);
                return {};
        }
@@ -680,9 +699,11 @@ try
                        throw KDMCLIError ("could not find film or CPL ID corresponding to " + thing);
                }
 
+               string const key = decryption_key ? dcp::file_to_string(*decryption_key) : Config::instance()->decryption_chain()->key().get();
+
                from_dkdm (
                        screens,
-                       dcp::DecryptedKDM (*dkdm, Config::instance()->decryption_chain()->key().get()),
+                       dcp::DecryptedKDM(*dkdm, key),
                        verbose,
                        output,
                        container_name_format,