X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=ca6c79cb8b9b4f96b63d6e93122714df653e5ad8;hb=9e2f6b6df1e54d3d13bfa9332a1c2c03f63428db;hp=31681a7fca7c7e9341f89b0cba2dd7ee041e7dad;hpb=5209385eefbee08d19080e998c785c8efe8b84d2;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 31681a7fc..ca6c79cb8 100644
--- 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,7 +66,9 @@ 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"
+	     << "      --no-check       don't check project's content files for changes before making the DCP\n"
 	     << "\n"
 	     << "<FILM> is the film directory.\n";
 }
@@ -83,13 +86,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 +124,7 @@ list_servers ()
 {
 	while (true) {
 		int N = 0;
-		list<EncodeServerDescription> servers = EncodeServerFinder::instance()->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 +147,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,7 +167,11 @@ 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;
 			}
 		}
@@ -191,6 +198,8 @@ main (int argc, char* argv[])
 	optional<boost::filesystem::path> servers;
 	bool list_servers_ = false;
 	bool dcp_path = false;
+	optional<boost::filesystem::path> config;
+	bool check = true;
 
 	int option_index = 0;
 	while (true) {
@@ -206,12 +215,14 @@ 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' },
+			{ "no-check", no_argument, 0, 'B' },
 			{ 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:B", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -255,9 +266,19 @@ main (int argc, char* argv[])
 			dcp_path = true;
 			progress = false;
 			break;
+		case 'c':
+			config = optarg;
+			break;
+		case 'B':
+			check = false;
+			break;
 		}
 	}
 
+	if (config) {
+		State::override_path = *config;
+	}
+
 	if (servers) {
 		FILE* f = fopen_boost (*servers, "r");
 		if (!f) {
@@ -317,6 +338,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 ();
@@ -332,65 +355,8 @@ 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<shared_ptr<Job> > 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<Job> 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) {