X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=7ab6d284d84650e0bedd3f5674519979fb002912;hb=76932aeca7ba1f23f0eb93b6a4b801385d419a08;hp=54e196fe0acb4d5e6a0b9ab343ef46c63ad91bb2;hpb=010a8b2700389b10c7567963edcf7a02a1920e15;p=dcpomatic.git diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 54e196fe0..7ab6d284d 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -27,9 +27,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 +43,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,7 +52,7 @@ 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" @@ -58,6 +60,8 @@ help (string n) << " -r, --no-remote do not use any remote servers\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"; @@ -100,7 +104,7 @@ print_dump (shared_ptr film) } else { cout << "\tno colour conversion\n"; } - + } shared_ptr audio = dynamic_pointer_cast (c); @@ -111,6 +115,61 @@ print_dump (shared_ptr film) } } +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[]) { @@ -120,6 +179,8 @@ main (int argc, char* argv[]) optional json_port; bool keep_going = false; bool dump = false; + bool servers = false; + bool dcp_path = false; int option_index = 0; while (true) { @@ -131,12 +192,14 @@ main (int argc, char* argv[]) { "no-remote", no_argument, 0, 'r'}, { "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, "vhfnrj:kAsd", long_options, &option_index); if (c == -1) { break; @@ -167,21 +230,34 @@ 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); } film_dir = argv[optind]; - + + dcpomatic_setup_path_encoding (); dcpomatic_setup (); signal_manager = new SignalManager (); - + if (no_remote) { - ServerFinder::instance()->disable (); + EncodeServerFinder::instance()->disable (); } if (json_port) { @@ -201,7 +277,7 @@ main (int argc, char* argv[]) print_dump (film); exit (EXIT_SUCCESS); } - + ContentList content = film->content (); for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { vector paths = (*i)->paths (); @@ -229,7 +305,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 (); } @@ -241,7 +319,7 @@ main (int argc, char* argv[]) for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { if (progress) { cout << (*i)->name() << ": "; - + if ((*i)->progress ()) { cout << (*i)->status() << " \n"; } else { @@ -282,9 +360,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; } - -