X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fmakedcp.cc;h=e73930d3cf0760c33a00b1aa2a939e7475e7aeee;hb=0efe8420071f0184d668bc363a1096b8ffc33b2d;hp=ec775eb718d348bbfe1fe8a63ad7d91d672a70aa;hpb=960ade12d9db8439f1cf7e114c7ddb04548e1997;p=dcpomatic.git

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index ec775eb71..e73930d3c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -20,22 +20,27 @@
 #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_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;
+using std::string;
+using std::cerr;
+using std::cout;
+using std::vector;
+using std::pair;
+using std::list;
+using boost::shared_ptr;
 
 static void
 help (string n)
@@ -44,8 +49,8 @@ help (string 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"
-	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
+	     << "  -r, --no-remote    do not use any remote servers\n"
 	     << "\n"
 	     << "<FILM> is the film directory.\n";
 }
@@ -54,8 +59,9 @@ int
 main (int argc, char* argv[])
 {
 	string film_dir;
-	bool test_mode = false;
 	bool progress = true;
+	bool no_remote = false;
+	int log_level = 0;
 
 	int option_index = 0;
 	while (1) {
@@ -63,12 +69,13 @@ main (int argc, char* argv[])
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
-			{ "test", no_argument, 0, 't'},
 			{ "no-progress", no_argument, 0, 'n'},
+			{ "no-remote", no_argument, 0, 'r'},
+			{ "log-level", required_argument, 0, 'l' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdtn", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -76,7 +83,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << DVDOMATIC_VERSION << "\n";
+			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
@@ -84,12 +91,15 @@ main (int argc, char* argv[])
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
-		case 't':
-			test_mode = true;
-			break;
 		case 'n':
 			progress = false;
 			break;
+		case 'r':
+			no_remote = true;
+			break;
+		case 'l':
+			log_level = atoi (optarg);
+			break;
 		}
 	}
 
@@ -102,6 +112,10 @@ main (int argc, char* argv[])
 			
 	dvdomatic_setup ();
 
+	if (no_remote) {
+		Config::instance()->set_servers (vector<ServerDescription*> ());
+	}
+
 	cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
 	char buf[256];
 	if (gethostname (buf, 256) == 0) {
@@ -109,47 +123,46 @@ main (int argc, char* argv[])
 	}
 	cout << "\n";
 
-	if (test_mode) {
-		libdcp::enable_test_mode ();
-		cout << dependency_version_summary() << "\n";
-	}
-
-	Film* film = 0;
+	shared_ptr<Film> film;
 	try {
-		film = new Film (film_dir, true);
+		film.reset (new Film (film_dir, true));
 	} catch (std::exception& e) {
 		cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
 		exit (EXIT_FAILURE);
 	}
 
+	film->log()->set_level ((Log::Level) log_level);
+
 	cout << "\nMaking ";
-	if (film->dcp_ab ()) {
+	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";
 
-	film->make_dcp (true);
-
-	list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+	film->make_dcp ();
 
-	bool all_done = false;
+	bool should_stop = false;
 	bool first = true;
-	while (!all_done) {
+	bool error = false;
+	while (!should_stop) {
 
 		dvdomatic_sleep (5);
 
+		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+
 		if (!first && progress) {
 			cout << "\033[" << jobs.size() << "A";
 			cout.flush ();
 		}
 
 		first = false;
-		
-		all_done = true;
+
+		int unfinished = 0;
+		int finished_in_error = 0;
+
 		for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
 			if (progress) {
 				cout << (*i)->name() << ": ";
@@ -162,9 +175,14 @@ main (int argc, char* argv[])
 					cout << ": Running           \n";
 				}
 			}
-			
+
 			if (!(*i)->finished ()) {
-				all_done = false;
+				++unfinished;
+			}
+
+			if ((*i)->finished_in_error ()) {
+				++finished_in_error;
+				error = true;
 			}
 
 			if (!progress && (*i)->finished_in_error ()) {
@@ -174,9 +192,13 @@ main (int argc, char* argv[])
 				cout << (*i)->status() << "\n";
 			}
 		}
+
+		if (unfinished == 0 || finished_in_error != 0) {
+			should_stop = true;
+		}
 	}
 
-	return 0;
+	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }