Mostly-merge master.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 7c5852fcc5054e61de99805b8eb465317733e4b3..d95b2ed99f63fac0a2c0e923c4272bedf1fa69ae 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
-#include <libdcp/version.h>
+#include <dcp/version.h>
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/transcode_job.h"
@@ -31,6 +31,9 @@
 #include "lib/cross.h"
 #include "lib/config.h"
 #include "lib/log.h"
+#include "lib/ui_signaller.h"
+#include "lib/server_finder.h"
+#include "lib/json_server.h"
 
 using std::string;
 using std::cerr;
@@ -45,11 +48,13 @@ help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
             << "  -v, --version      show DCP-o-matic version\n"
-            << "  -h, --help         show this help\n"
-            << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
-            << "  -f, --flags        show flags passed to C++ compiler on build\n"
+            << "  -h, --help         show this help\n"
+            << "  -d, --deps         list DCP-o-matic dependency details and quit\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"
+            << "  -j, --json <port>  run a JSON server on the specified port\n"
+            << "  -k, --keep-going   keep running even when the job is complete\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
@@ -61,6 +66,8 @@ main (int argc, char* argv[])
        bool progress = true;
        bool no_remote = false;
        int log_level = 0;
+       int json_port = 0;
+       bool keep_going = false;
 
        int option_index = 0;
        while (1) {
@@ -72,10 +79,12 @@ main (int argc, char* argv[])
                        { "no-progress", no_argument, 0, 'n'},
                        { "no-remote", no_argument, 0, 'r'},
                        { "log-level", required_argument, 0, 'l' },
+                       { "json", required_argument, 0, 'j' },
+                       { "keep-going", no_argument, 0, 'k' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdfnrl:j:k", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -103,6 +112,12 @@ main (int argc, char* argv[])
                case 'l':
                        log_level = atoi (optarg);
                        break;
+               case 'j':
+                       json_port = atoi (optarg);
+                       break;
+               case 'k':
+                       keep_going = true;
+                       break;
                }
        }
 
@@ -114,9 +129,14 @@ main (int argc, char* argv[])
        film_dir = argv[optind];
                        
        dcpomatic_setup ();
+       ui_signaller = new UISignaller ();
 
        if (no_remote) {
-               Config::instance()->set_servers (vector<ServerDescription*> ());
+               ServerFinder::instance()->disable ();
+       }
+
+       if (json_port) {
+               new JSONServer (json_port);
        }
 
        cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -167,7 +187,7 @@ main (int argc, char* argv[])
                        if (progress) {
                                cout << (*i)->name() << ": ";
                                
-                               float const p = (*i)->overall_progress ();
+                               float const p = (*i)->progress ();
                                
                                if (p >= 0) {
                                        cout << (*i)->status() << "                         \n";
@@ -198,6 +218,17 @@ main (int argc, char* argv[])
                }
        }
 
+       if (keep_going) {
+               while (1) {
+                       dcpomatic_sleep (3600);
+               }
+       }
+
+       /* This is just to stop valgrind reporting leaks due to JobManager
+          indirectly holding onto codecs.
+       */
+       JobManager::drop ();
+       
        return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }