Store successful DCP encodes.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 52a113cbb4c72d6693faf84677a430cc3fc81e3e..f049c0c919cc6fc12a6b87150ba6b0a0b85a8976 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -33,6 +33,7 @@
 #include "lib/ratio.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
+#include "lib/dcpomatic_log.h"
 #include <dcp/version.h>
 #include <boost/foreach.hpp>
 #include <getopt.h>
@@ -65,6 +66,7 @@ help (string 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"
+            << "  -c, --config <dir>   directory containing config.xml and cinemas.xml\n"
             << "      --dump           just dump a summary of the film's settings; don't encode\n"
             << "\n"
             << "<FILM> is the film directory.\n";
@@ -83,13 +85,13 @@ print_dump (shared_ptr<Film> film)
                cout << "\n"
                     << c->path(0) << "\n"
                     << "\tat " << c->position().seconds ()
-                    << " length " << c->full_length().seconds ()
+                    << " length " << c->full_length(film).seconds ()
                     << " start trim " << c->trim_start().seconds ()
                     << " end trim " << c->trim_end().seconds () << "\n";
 
                if (c->video) {
                        cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
-                            << "\t" << c->active_video_frame_rate() << "fps\n"
+                            << "\t" << c->active_video_frame_rate(film) << "fps\n"
                             << "\tcrop left " << c->video->left_crop()
                             << " right " << c->video->right_crop()
                             << " top " << c->video->top_crop()
@@ -121,7 +123,7 @@ list_servers ()
 {
        while (true) {
                int N = 0;
-               list<EncodeServerDescription> servers = EncodeServerFinder::instance()->good_servers ();
+               list<EncodeServerDescription> servers = EncodeServerFinder::instance()->servers();
 
                /* This is a bit fiddly because we want to list configured servers that are down as well
                   as all those (configured and found by broadcast) that are up.
@@ -144,7 +146,7 @@ list_servers ()
                                optional<int> threads;
                                list<EncodeServerDescription>::iterator j = servers.begin ();
                                while (j != servers.end ()) {
-                                       if (i == j->host_name()) {
+                                       if (i == j->host_name() && j->current_link_version()) {
                                                threads = j->threads();
                                                list<EncodeServerDescription>::iterator tmp = j;
                                                ++tmp;
@@ -164,14 +166,13 @@ list_servers ()
 
                        /* Now report any left that have been found by broadcast */
                        BOOST_FOREACH (EncodeServerDescription const & i, servers) {
-                               cout << std::left << setw(24) << i.host_name() << " UP     " << i.threads() << "\n";
+                               if (i.current_link_version()) {
+                                       cout << std::left << setw(24) << i.host_name() << " UP     " << i.threads() << "\n";
+                               } else {
+                                       cout << std::left << setw(24) << i.host_name() << " bad version\n";
+                               }
                                ++N;
                        }
-
-                       /* And those that have a bad version */
-                       BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->good_servers()) {
-                               cout << std::left << setw(24) << i.host_name() << " bad version\n";
-                       }
                }
 
                dcpomatic_sleep (1);
@@ -196,6 +197,7 @@ main (int argc, char* argv[])
        optional<boost::filesystem::path> servers;
        bool list_servers_ = false;
        bool dcp_path = false;
+       optional<boost::filesystem::path> config;
 
        int option_index = 0;
        while (true) {
@@ -211,12 +213,13 @@ main (int argc, char* argv[])
                        { "servers", required_argument, 0, 's' },
                        { "list-servers", no_argument, 0, 'l' },
                        { "dcp-path", no_argument, 0, 'd' },
+                       { "config", required_argument, 0, 'c' },
                        /* 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:kAs:ld", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -260,9 +263,16 @@ main (int argc, char* argv[])
                        dcp_path = true;
                        progress = false;
                        break;
+               case 'c':
+                       config = optarg;
+                       break;
                }
        }
 
+       if (config) {
+               State::override_path = *config;
+       }
+
        if (servers) {
                FILE* f = fopen_boost (*servers, "r");
                if (!f) {
@@ -322,6 +332,8 @@ main (int argc, char* argv[])
                exit (EXIT_SUCCESS);
        }
 
+       dcpomatic_log = film->log ();
+
        ContentList content = film->content ();
        for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
                vector<boost::filesystem::path> paths = (*i)->paths ();