X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=4facdd4d1a868df0e67d9cac2e28861d3434ed21;hb=9517ca7ed03b43297d44753f63a867dc6ee7175a;hp=8c33b7d83a983f4917bf98ee413bf0cf7186d635;hpb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 8c33b7d83..4facdd4d1 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 #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"
+#include "lib/json_server.h"
 
 using std::string;
 using std::cerr;
@@ -41,6 +41,7 @@ using std::vector;
 using std::pair;
 using std::list;
 using boost::shared_ptr;
+using boost::optional;
 
 static void
 help (string n)
@@ -48,10 +49,10 @@ help (string n)
 	cerr << "Syntax: " << n << " [OPTION] <FILM>\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"
 	     << "  -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"
+	     << "  -j, --json <port>  run a JSON server on the specified port\n"
 	     << "  -k, --keep-going   keep running even when the job is complete\n"
 	     << "\n"
 	     << "<FILM> is the film directory.\n";
@@ -63,6 +64,7 @@ main (int argc, char* argv[])
 	string film_dir;
 	bool progress = true;
 	bool no_remote = false;
+	optional<int> json_port;
 	bool keep_going = false;
 
 	int option_index = 0;
@@ -70,15 +72,15 @@ main (int argc, char* argv[])
 		static struct option long_options[] = {
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
-			{ "deps", no_argument, 0, 'd'},
 			{ "flags", no_argument, 0, 'f'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
+			{ "json", required_argument, 0, 'j'},
 			{ "keep-going", no_argument, 0, 'k' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhfnrj:k", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -91,9 +93,6 @@ main (int argc, char* argv[])
 		case 'h':
 			help (argv[0]);
 			exit (EXIT_SUCCESS);
-		case 'd':
-			cout << dependency_version_summary () << "\n";
-			exit (EXIT_SUCCESS);
 		case 'f':
 			cout << dcpomatic_cxx_flags << "\n";
 			exit (EXIT_SUCCESS);
@@ -103,6 +102,9 @@ main (int argc, char* argv[])
 		case 'r':
 			no_remote = true;
 			break;
+		case 'j':
+			json_port = atoi (optarg);
+			break;
 		case 'k':
 			keep_going = true;
 			break;
@@ -118,11 +120,15 @@ main (int argc, char* argv[])
 			
 	dcpomatic_setup ();
 	ui_signaller = new UISignaller ();
-
+	
 	if (no_remote) {
 		ServerFinder::instance()->disable ();
 	}
 
+	if (json_port) {
+		new JSONServer (json_port.get ());
+	}
+
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
 	char buf[256];
 	if (gethostname (buf, 256) == 0) {
@@ -139,6 +145,17 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
+	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 << "\nMaking DCP for " << film->name() << "\n";
 
 	film->make_dcp ();
@@ -166,9 +183,7 @@ main (int argc, char* argv[])
 			if (progress) {
 				cout << (*i)->name() << ": ";
 				
-				float const p = (*i)->progress ();
-				
-				if (p >= 0) {
+				if ((*i)->progress ()) {
 					cout << (*i)->status() << "			    \n";
 				} else {
 					cout << ": Running	     \n";
@@ -207,6 +222,8 @@ main (int argc, char* argv[])
 	   indirectly holding onto codecs.
 	*/
 	JobManager::drop ();
+
+	ServerFinder::drop ();
 	
 	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }