X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=2d70fb578cd1b0629e904a1fb65702b3fa5c6b6f;hp=00087d6a0c9425a2a0e9db46b757c6e7215dbbda;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23 diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 00087d6a0..2d70fb578 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -33,6 +33,7 @@ #include "lib/ratio.h" #include "lib/video_content.h" #include "lib/audio_content.h" +#include "lib/dcpomatic_log.h" #include #include #include @@ -46,25 +47,28 @@ using std::vector; using std::pair; using std::setw; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; static void help (string n) { cerr << "Syntax: " << n << " [OPTION] []\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 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 run a JSON server on the specified port\n" + << " -k, --keep-going keep running even when the job is complete\n" + << " -s, --servers 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 directory containing config.xml and cinemas.xml\n" + << " --dump just dump a summary of the film's settings; don't encode\n" + << " --no-check don't check project's content files for changes before making the DCP\n" << "\n" << " is the film directory.\n"; } @@ -73,7 +77,7 @@ static void print_dump (shared_ptr film) { cout << film->dcp_name (true) << "\n" - << film->container()->nickname() << " at " << ((film->resolution() == RESOLUTION_2K) ? "2K" : "4K") << "\n" + << film->container()->container_nickname() << " at " << ((film->resolution() == RESOLUTION_2K) ? "2K" : "4K") << "\n" << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n" << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n" << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n"; @@ -82,18 +86,20 @@ print_dump (shared_ptr 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() - << " bottom " << c->video->bottom_crop() << "\n" - << "\tscale " << c->video->scale().name() << "\n"; + << " bottom " << c->video->bottom_crop() << "\n"; + if (c->video->custom_ratio()) { + cout << "\tscale to custom ratio " << *c->video->custom_ratio() << ":1\n"; + } if (c->video->colour_conversion()) { if (c->video->colour_conversion().get().preset()) { cout << "\tcolour conversion " @@ -116,52 +122,63 @@ print_dump (shared_ptr film) } static void -show_servers () +list_servers () { while (true) { int N = 0; - list servers = EncodeServerFinder::instance()->servers (); + list servers = EncodeServerFinder::instance()->servers(); - if (Config::instance()->use_any_servers ()) { - if (servers.empty ()) { - cout << "No encoding servers found.\n"; - ++N; - } else { - cout << std::left << setw(24) << "Host" << " Threads\n"; - ++N; - BOOST_FOREACH (EncodeServerDescription const & i, servers) { - cout << std::left << setw(24) << i.host_name() << " " << i.threads() << "\n"; - ++N; - } - } + /* 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. + */ + + if (servers.empty() && Config::instance()->servers().empty()) { + cout << "No encoding servers found or configured.\n"; + ++N; } else { - vector configured_servers = Config::instance()->servers(); - if (configured_servers.empty()) { - cout << "No configured servers, and DCP-o-matic is not set to search for any server.\n"; - ++N; - } else { - cout << std::left << setw(24) << "Host" << " Status Threads\n"; - ++N; - BOOST_FOREACH (string const & i, Config::instance()->servers()) { - cout << std::left << setw(24) << i << " "; - optional threads; - BOOST_FOREACH (EncodeServerDescription const & j, servers) { - if (i == j.host_name()) { - threads = j.threads(); - } - } - if (static_cast(threads)) { - cout << "UP " << threads.get() << "\n"; + cout << std::left << setw(24) << "Host" << " Status Threads\n"; + ++N; + + /* Report the state of configured servers */ + BOOST_FOREACH (string i, Config::instance()->servers()) { + cout << std::left << setw(24) << i << " "; + + /* See if this server is on the active list; if so, remove it and note + the number of threads it is offering. + */ + optional threads; + list::iterator j = servers.begin (); + while (j != servers.end ()) { + if (i == j->host_name() && j->current_link_version()) { + threads = j->threads(); + list::iterator tmp = j; + ++tmp; + servers.erase (j); + j = tmp; } else { - cout << "DOWN\n"; + ++j; } - ++N; } + if (static_cast(threads)) { + cout << "UP " << threads.get() << "\n"; + } else { + cout << "DOWN\n"; + } + ++N; } - } + /* Now report any left that have been found by broadcast */ + BOOST_FOREACH (EncodeServerDescription const & i, servers) { + 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; + } + } - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); for (int i = 0; i < N; ++i) { cout << "\033[1A\033[2K"; @@ -180,8 +197,11 @@ main (int argc, char* argv[]) optional json_port; bool keep_going = false; bool dump = false; - bool servers = false; + optional servers; + bool list_servers_ = false; bool dcp_path = false; + optional config; + bool check = true; int option_index = 0; while (true) { @@ -194,14 +214,17 @@ 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' }, + { "config", required_argument, 0, 'c' }, /* Just using A, B, C ... from here on */ { "dump", no_argument, 0, 'A' }, + { "no-check", no_argument, 0, 'B' }, { 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:ldc:B", long_options, &option_index); if (c == -1) { break; @@ -236,17 +259,47 @@ 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; progress = false; break; + case 'c': + config = optarg; + break; + case 'B': + check = false; + break; } } + if (config) { + State::override_path = *config; + } + 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 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); } @@ -270,7 +323,7 @@ main (int argc, char* argv[]) } if (threads) { - Config::instance()->set_num_local_encoding_threads (threads.get ()); + Config::instance()->set_master_encoding_threads (threads.get ()); } shared_ptr film; @@ -287,6 +340,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 paths = (*i)->paths (); @@ -302,69 +357,12 @@ main (int argc, char* argv[]) cout << "\nMaking DCP for " << film->name() << "\n"; } - film->make_dcp (); - - bool should_stop = false; - bool first = true; - bool error = false; - while (!should_stop) { - - dcpomatic_sleep (5); - - list > jobs = JobManager::instance()->get (); - - if (!first && progress) { - for (size_t i = 0; i < jobs.size(); ++i) { - cout << "\033[1A\033[2K"; - } - cout.flush (); - } - - first = false; - - int unfinished = 0; - int finished_in_error = 0; - - BOOST_FOREACH (shared_ptr i, jobs) { - if (progress) { - cout << i->name(); - if (!i->sub_name().empty()) { - cout << "; " << i->sub_name(); - } - cout << ": "; - - if (i->progress ()) { - cout << i->status() << " \n"; - } else { - cout << ": Running \n"; - } - } - - if (!i->finished ()) { - ++unfinished; - } - - if (i->finished_in_error ()) { - ++finished_in_error; - error = true; - } - - if (!progress && i->finished_in_error ()) { - /* We won't see this error if we haven't been showing progress, - so show it now. - */ - cout << i->status() << "\n"; - } - } - - if (unfinished == 0 || finished_in_error != 0) { - should_stop = true; - } - } + film->make_dcp (false, check); + bool const error = show_jobs_on_console (progress); if (keep_going) { while (true) { - dcpomatic_sleep (3600); + dcpomatic_sleep_seconds (3600); } }