X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fmakedcp.cc;h=d3608059c3c0e47fde5c4a46d9f8d35fad1ca60c;hb=e1e7827d75df6ea11b6bfd2aabd3eb3fb1f2e701;hp=76cda8202bf3ccfbf87ee614087f11c2530982c1;hpb=bb767c7e338414beee132af3e96829c1448e214b;p=dcpomatic.git

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 76cda8202..d3608059c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -20,16 +20,21 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
+#include <libdcp/test_mode.h>
+#include <libdcp/version.h>
 #include "format.h"
 #include "film.h"
 #include "filter.h"
 #include "transcode_job.h"
-#include "make_mxf_job.h"
 #include "make_dcp_job.h"
 #include "job_manager.h"
 #include "ab_transcode_job.h"
 #include "util.h"
 #include "scaler.h"
+#include "version.h"
+#include "cross.h"
+#include "config.h"
+#include "log.h"
 
 using namespace std;
 using namespace boost;
@@ -37,49 +42,96 @@ using namespace boost;
 static void
 help (string n)
 {
-	cerr << "Syntax: " << n << " [--help] [--deps] [--film <film>]\n";
+	cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
+	     << "  -v, --version      show DVD-o-matic version\n"
+	     << "  -h, --help         show this help\n"
+	     << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
+	     << "  -c, --config       list configuration settings that affect output and quit\n"
+	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
+	     << "  -n, --no-progress  do not print progress to stdout\n"
+	     << "\n"
+	     << "<FILM> is the film directory.\n";
 }
 
 int
 main (int argc, char* argv[])
 {
 	string film_dir;
+	bool test_mode = false;
+	bool progress = true;
+	int log_level = 1;
 
+	int option_index = 0;
 	while (1) {
 		static struct option long_options[] = {
+			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
-			{ "film", required_argument, 0, 'f'},
+			{ "config", no_argument, 0, 'c'},
+			{ "test", no_argument, 0, 't'},
+			{ "no-progress", no_argument, 0, 'n'},
+			{ "log-level", required_argument, 0, 'l' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int option_index = 0;
-		int c = getopt_long (argc, argv, "hdf:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdctnl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
 		}
 
 		switch (c) {
+		case 'v':
+			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
 			exit (EXIT_SUCCESS);
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
-		case 'f':
-			film_dir = optarg;
+		case 't':
+			test_mode = true;
+			break;
+		case 'n':
+			progress = false;
+			break;
+		case 'c':
+			cout << "Colour LUT " << colour_lut_index_to_name (Config::instance()->colour_lut_index()) << "; "
+			     << "J2K bandwidth " << Config::instance()->j2k_bandwidth() << "; ";
+#ifdef DVDOMATIC_DEBUG
+			cout << "built in debug mode\n";
+#else
+			cout << "built in optimised mode\n";
+#endif			
+			exit (EXIT_SUCCESS);
+		case 'l':
+			log_level = atoi (optarg);
 			break;
 		}
 	}
 
-	if (film_dir.empty ()) {
+	if (optind >= argc) {
 		help (argv[0]);
 		exit (EXIT_FAILURE);
 	}
+
+	film_dir = argv[optind];
 			
 	dvdomatic_setup ();
 
+	cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+	char buf[256];
+	if (gethostname (buf, 256) == 0) {
+		cout << " on " << buf;
+	}
+	cout << "\n";
+
+	if (test_mode) {
+		libdcp::enable_test_mode ();
+		cout << dependency_version_summary() << "\n";
+	}
+
 	Film* film = 0;
 	try {
 		film = new Film (film_dir, true);
@@ -88,11 +140,14 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
+	film->log()->set_level ((Log::Level) log_level);
+
 	cout << "\nMaking ";
 	if (film->dcp_ab ()) {
 		cout << "A/B ";
 	}
 	cout << "DCP for " << film->name() << "\n";
+	cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
 	cout << "Content: " << film->content() << "\n";
 	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
 	cout << "Filters: " << f.first << " " << f.second << "\n";
@@ -104,10 +159,10 @@ main (int argc, char* argv[])
 	bool all_done = false;
 	bool first = true;
 	while (!all_done) {
-		
-		sleep (5);
-		
-		if (!first) {
+
+		dvdomatic_sleep (5);
+
+		if (!first && progress) {
 			cout << "\033[" << jobs.size() << "A";
 			cout.flush ();
 		}
@@ -116,19 +171,28 @@ main (int argc, char* argv[])
 		
 		all_done = true;
 		for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
-			cout << (*i)->name() << ": ";
-
-			float const p = (*i)->overall_progress ();
-
-			if (p >= 0) {
-				cout << (*i)->status() << "                         \n";
-			} else {
-				cout << ": Running           \n";
+			if (progress) {
+				cout << (*i)->name() << ": ";
+				
+				float const p = (*i)->overall_progress ();
+				
+				if (p >= 0) {
+					cout << (*i)->status() << "                         \n";
+				} else {
+					cout << ": Running           \n";
+				}
 			}
 			
 			if (!(*i)->finished ()) {
 				all_done = false;
 			}
+
+			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";
+			}
 		}
 	}