X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=cfd8b3eaeeca57686c9a4f69ded64b28e5e618ab;hb=1f7f758273eb3c98356438da897b7709f8cb87f0;hp=f885412efaf9d1ae0ebd7febd5cb7db5d3175d3e;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index f885412ef..cfd8b3eae 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,9 +28,10 @@ #include "lib/config.h" #include "lib/log.h" #include "lib/signal_manager.h" -#include "lib/server_finder.h" +#include "lib/encode_server_finder.h" #include "lib/json_server.h" #include "lib/ratio.h" +#include "lib/video_content.h" #include "lib/audio_content.h" #include #include @@ -42,6 +44,7 @@ using std::cerr; using std::cout; using std::vector; using std::pair; +using std::setw; using std::list; using boost::shared_ptr; using boost::optional; @@ -50,14 +53,17 @@ using boost::dynamic_pointer_cast; static void help (string n) { - cerr << "Syntax: " << n << " [OPTION] \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" << "\n" << " is the film directory.\n"; @@ -80,19 +86,18 @@ print_dump (shared_ptr film) << " start trim " << c->trim_start().seconds () << " end trim " << c->trim_end().seconds () << "\n"; - shared_ptr video = dynamic_pointer_cast (c); - if (video) { - cout << "\t" << video->video_size().width << "x" << video->video_size().height << "\n" - << "\t" << video->video_frame_rate() << "fps\n" - << "\tcrop left " << video->left_crop() - << " right " << video->right_crop() - << " top " << video->top_crop() - << " bottom " << video->bottom_crop() << "\n" - << "\tscale " << video->scale().name() << "\n"; - if (video->colour_conversion()) { - if (video->colour_conversion().get().preset()) { + if (c->video) { + cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n" + << "\t" << c->active_video_frame_rate() << "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"; + if (c->video->colour_conversion()) { + if (c->video->colour_conversion().get().preset()) { cout << "\tcolour conversion " - << PresetColourConversion::all()[video->colour_conversion().get().preset().get()].name + << PresetColourConversion::all()[c->video->colour_conversion().get().preset().get()].name << "\n"; } else { cout << "\tcustom colour conversion\n"; @@ -103,23 +108,80 @@ print_dump (shared_ptr film) } - shared_ptr audio = dynamic_pointer_cast (c); - if (audio) { - cout << "\t" << audio->audio_delay() << " delay\n" - << "\t" << audio->audio_gain() << " gain\n"; + if (c->audio) { + cout << "\t" << c->audio->delay() << " delay\n" + << "\t" << c->audio->gain() << " gain\n"; } } } +static void +show_servers () +{ + while (true) { + int N = 0; + 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; + } + } + } 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"; + } else { + cout << "DOWN\n"; + } + ++N; + } + } + } + + + dcpomatic_sleep (1); + + for (int i = 0; i < N; ++i) { + cout << "\033[1A\033[2K"; + } + } +} + + int main (int argc, char* argv[]) { - string film_dir; + boost::filesystem::path film_dir; bool progress = true; bool no_remote = false; + optional threads; optional json_port; bool keep_going = false; bool dump = false; + bool servers = false; + bool dcp_path = false; int option_index = 0; while (true) { @@ -129,14 +191,17 @@ main (int argc, char* argv[]) { "flags", no_argument, 0, 'f'}, { "no-progress", no_argument, 0, 'n'}, { "no-remote", no_argument, 0, 'r'}, + { "threads", required_argument, 0, 't'}, { "json", required_argument, 0, 'j'}, { "keep-going", no_argument, 0, 'k' }, + { "servers", no_argument, 0, 's' }, + { "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, "vhfnrj:kA", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrt:j:kAsd", long_options, &option_index); if (c == -1) { break; @@ -158,6 +223,9 @@ main (int argc, char* argv[]) case 'r': no_remote = true; break; + case 't': + threads = atoi (optarg); + break; case 'j': json_port = atoi (optarg); break; @@ -167,9 +235,21 @@ main (int argc, char* argv[]) case 'A': dump = true; break; + case 's': + servers = true; + break; + case 'd': + dcp_path = true; + progress = false; + break; } } + if (servers) { + show_servers (); + exit (EXIT_SUCCESS); + } + if (optind >= argc) { help (argv[0]); exit (EXIT_FAILURE); @@ -177,23 +257,28 @@ main (int argc, char* argv[]) film_dir = argv[optind]; + dcpomatic_setup_path_encoding (); dcpomatic_setup (); signal_manager = new SignalManager (); if (no_remote) { - ServerFinder::instance()->disable (); + EncodeServerFinder::instance()->stop (); } if (json_port) { new JSONServer (json_port.get ()); } + if (threads) { + Config::instance()->set_master_encoding_threads (threads.get ()); + } + shared_ptr film; try { film.reset (new Film (film_dir)); film->read_metadata (); } catch (std::exception& e) { - cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n"; + cerr << argv[0] << ": error reading film `" << film_dir.string() << "' (" << e.what() << ")\n"; exit (EXIT_FAILURE); } @@ -229,7 +314,9 @@ main (int argc, char* argv[]) list > jobs = JobManager::instance()->get (); if (!first && progress) { - cout << "\033[" << jobs.size() << "A"; + for (size_t i = 0; i < jobs.size(); ++i) { + cout << "\033[1A\033[2K"; + } cout.flush (); } @@ -238,31 +325,35 @@ main (int argc, char* argv[]) int unfinished = 0; int finished_in_error = 0; - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { + BOOST_FOREACH (shared_ptr i, jobs) { if (progress) { - cout << (*i)->name() << ": "; + cout << i->name(); + if (!i->sub_name().empty()) { + cout << "; " << i->sub_name(); + } + cout << ": "; - if ((*i)->progress ()) { - cout << (*i)->status() << " \n"; + if (i->progress ()) { + cout << i->status() << " \n"; } else { cout << ": Running \n"; } } - if (!(*i)->finished ()) { + if (!i->finished ()) { ++unfinished; } - if ((*i)->finished_in_error ()) { + if (i->finished_in_error ()) { ++finished_in_error; error = true; } - if (!progress && (*i)->finished_in_error ()) { + 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"; + cout << i->status() << "\n"; } } @@ -282,9 +373,11 @@ main (int argc, char* argv[]) */ JobManager::drop (); - ServerFinder::drop (); + EncodeServerFinder::drop (); + + if (dcp_path && !error) { + cout << film->dir (film->dcp_name (false)).string() << "\n"; + } return error ? EXIT_FAILURE : EXIT_SUCCESS; } - -