X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=f55a425ce6a521d48719bee761f74a294023d878;hb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;hp=86c3cf4b14881a3268a96758d9716242af373362;hpb=9525e7726e4d488f193957d4fcf1cc1725581ae8;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 86c3cf4b1..f55a425ce 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,20 +20,19 @@
 #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 "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"
+#include <dcp/version.h>
+#include "lib/film.h"
+#include "lib/filter.h"
+#include "lib/transcode_job.h"
+#include "lib/job_manager.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+#include "lib/version.h"
+#include "lib/cross.h"
+#include "lib/config.h"
+#include "lib/log.h"
+#include "lib/ui_signaller.h"
+#include "lib/server_finder.h"
 
 using std::string;
 using std::cerr;
@@ -50,9 +49,10 @@ help (string n)
 	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
 	     << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
-	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\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"
+	     << "  -k, --keep-going   keep running even when the job is complete\n"
 	     << "\n"
 	     << "<FILM> is the film directory.\n";
 }
@@ -61,25 +61,24 @@ int
 main (int argc, char* argv[])
 {
 	string film_dir;
-	bool test_mode = false;
 	bool progress = true;
 	bool no_remote = false;
-	int log_level = 0;
+	bool keep_going = false;
 
 	int option_index = 0;
-	while (1) {
+	while (true) {
 		static struct option long_options[] = {
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
-			{ "test", no_argument, 0, 't'},
+			{ "flags", no_argument, 0, 'f'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
-			{ "log-level", required_argument, 0, 'l' },
+			{ "keep-going", no_argument, 0, 'k' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -95,17 +94,17 @@ main (int argc, char* argv[])
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
-		case 't':
-			test_mode = true;
-			break;
+		case 'f':
+			cout << dcpomatic_cxx_flags << "\n";
+			exit (EXIT_SUCCESS);
 		case 'n':
 			progress = false;
 			break;
 		case 'r':
 			no_remote = true;
 			break;
-		case 'l':
-			log_level = atoi (optarg);
+		case 'k':
+			keep_going = true;
 			break;
 		}
 	}
@@ -118,9 +117,10 @@ main (int argc, char* argv[])
 	film_dir = argv[optind];
 			
 	dcpomatic_setup ();
+	ui_signaller = new UISignaller ();
 
 	if (no_remote) {
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		ServerFinder::instance()->disable ();
 	}
 
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -130,30 +130,27 @@ main (int argc, char* argv[])
 	}
 	cout << "\n";
 
-	if (test_mode) {
-		libdcp::enable_test_mode ();
-		cout << dependency_version_summary() << "\n";
-	}
-
 	shared_ptr<Film> film;
 	try {
-		film.reset (new Film (film_dir, true));
+		film.reset (new Film (film_dir));
+		film->read_metadata ();
 	} 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->ab()) {
-		cout << "A/B ";
+	ContentList content = film->content ();
+	for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
+		vector<boost::filesystem::path> paths = (*i)->paths ();
+		for (vector<boost::filesystem::path>::const_iterator j = paths.begin(); j != paths.end(); ++j) {
+			if (!boost::filesystem::exists (*j)) {
+				cerr << argv[0] << ": content file " << *j << " not found.\n";
+				exit (EXIT_FAILURE);
+			}
+		}
 	}
-	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";
+		
+	cout << "\nMaking DCP for " << film->name() << "\n";
 
 	film->make_dcp ();
 
@@ -180,12 +177,12 @@ main (int argc, char* argv[])
 			if (progress) {
 				cout << (*i)->name() << ": ";
 				
-				float const p = (*i)->overall_progress ();
+				float const p = (*i)->progress ();
 				
 				if (p >= 0) {
-					cout << (*i)->status() << "                         \n";
+					cout << (*i)->status() << "			    \n";
 				} else {
-					cout << ": Running           \n";
+					cout << ": Running	     \n";
 				}
 			}
 
@@ -211,6 +208,17 @@ main (int argc, char* argv[])
 		}
 	}
 
+	if (keep_going) {
+		while (true) {
+			dcpomatic_sleep (3600);
+		}
+	}
+
+	/* This is just to stop valgrind reporting leaks due to JobManager
+	   indirectly holding onto codecs.
+	*/
+	JobManager::drop ();
+	
 	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }