Fix crash when dragging and dropping the only DKDM.

[dcpomatic.git] / src / tools / dcpomatic_cli.cc

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 2a70a3003844d860c9328046fd88bf7651b5e475..31681a7fca7c7e9341f89b0cba2dd7ee041e7dad 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -54,17 +54,18 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] [<FILM>]\n"
-            << "  -v, --version      show DCP-o-matic version\n"
-            << "  -h, --help         show this help\n"
-            << "  -f, --flags        show flags passed to C++ compiler on build\n"
-            << "  -n, --no-progress  do not print progress to stdout\n"
-            << "  -r, --no-remote    do not use any remote servers\n"
-            << "  -t, --threads      specify number of local encoding threads (overriding configuration)\n"
-            << "  -j, --json <port>  run a JSON server on the specified port\n"
-            << "  -k, --keep-going   keep running even when the job is complete\n"
-            << "  -s, --servers      just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n"
-            << "  -d, --dcp-path     echo DCP's path to stdout on successful completion (implies -n)\n"
-            << "      --dump         just dump a summary of the film's settings; don't encode\n"
+            << "  -v, --version        show DCP-o-matic version\n"
+            << "  -h, --help           show this help\n"
+            << "  -f, --flags          show flags passed to C++ compiler on build\n"
+            << "  -n, --no-progress    do not print progress to stdout\n"
+            << "  -r, --no-remote      do not use any remote servers\n"
+            << "  -t, --threads        specify number of local encoding threads (overriding configuration)\n"
+            << "  -j, --json <port>    run a JSON server on the specified port\n"
+            << "  -k, --keep-going     keep running even when the job is complete\n"
+            << "  -s, --servers <file> specify servers to use in a text file\n"
+            << "  -l, --list-servers   just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n"
+            << "  -d, --dcp-path       echo DCP's path to stdout on successful completion (implies -n)\n"
+            << "      --dump           just dump a summary of the film's settings; don't encode\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
@@ -116,7 +117,7 @@ print_dump (shared_ptr<Film> film)
 }
 
 static void
-show_servers ()
+list_servers ()
 {
        while (true) {
                int N = 0;
@@ -187,7 +188,8 @@ main (int argc, char* argv[])
        optional<int> json_port;
        bool keep_going = false;
        bool dump = false;
-       bool servers = false;
+       optional<boost::filesystem::path> servers;
+       bool list_servers_ = false;
        bool dcp_path = false;
 
        int option_index = 0;
@@ -201,14 +203,15 @@ main (int argc, char* argv[])
                        { "threads", required_argument, 0, 't'},
                        { "json", required_argument, 0, 'j'},
                        { "keep-going", no_argument, 0, 'k' },
-                       { "servers", no_argument, 0, 's' },
+                       { "servers", required_argument, 0, 's' },
+                       { "list-servers", no_argument, 0, 'l' },
                        { "dcp-path", no_argument, 0, 'd' },
                        /* Just using A, B, C ... from here on */
                        { "dump", no_argument, 0, 'A' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhfnrt:j:kAsd", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ld", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -243,7 +246,10 @@ main (int argc, char* argv[])
                        dump = true;
                        break;
                case 's':
-                       servers = true;
+                       servers = optarg;
+                       break;
+               case 'l':
+                       list_servers_ = true;
                        break;
                case 'd':
                        dcp_path = true;
@@ -253,7 +259,24 @@ main (int argc, char* argv[])
        }
 
        if (servers) {
-               show_servers ();
+               FILE* f = fopen_boost (*servers, "r");
+               if (!f) {
+                       cerr << "Could not open servers list file " << *servers << "\n";
+                       exit (EXIT_FAILURE);
+               }
+               vector<string> servers;
+               while (!feof (f)) {
+                       char buffer[128];
+                       if (fscanf (f, "%s.127", buffer) == 1) {
+                               servers.push_back (buffer);
+                       }
+               }
+               fclose (f);
+               Config::instance()->set_servers (servers);
+       }
+
+       if (list_servers_) {
+               list_servers ();
                exit (EXIT_SUCCESS);
        }