projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress...
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_cli.cc
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index ff948e9fbbae1472089acfc10594c0c914c03f0e..0b946181a09a84319a015a8928838b51525cb5a2 100644
(file)
--- a/
src/tools/dcpomatic_cli.cc
+++ b/
src/tools/dcpomatic_cli.cc
@@
-20,7
+20,7
@@
#include <iostream>
#include <iomanip>
#include <getopt.h>
#include <iostream>
#include <iomanip>
#include <getopt.h>
-#include <
lib
dcp/version.h>
+#include <dcp/version.h>
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/transcode_job.h"
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/transcode_job.h"
@@
-33,7
+33,6
@@
#include "lib/log.h"
#include "lib/ui_signaller.h"
#include "lib/server_finder.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;
using std::string;
using std::cerr;
@@
-53,7
+52,6
@@
help (string 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"
<< " -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";
<< " -k, --keep-going keep running even when the job is complete\n"
<< "\n"
<< "<FILM> is the film directory.\n";
@@
-65,7
+63,6
@@
main (int argc, char* argv[])
string film_dir;
bool progress = true;
bool no_remote = false;
string film_dir;
bool progress = true;
bool no_remote = false;
- int json_port = 0;
bool keep_going = false;
int option_index = 0;
bool keep_going = false;
int option_index = 0;
@@
-77,12
+74,11
@@
main (int argc, char* argv[])
{ "flags", no_argument, 0, 'f'},
{ "no-progress", no_argument, 0, 'n'},
{ "no-remote", no_argument, 0, 'r'},
{ "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 }
};
{ "keep-going", no_argument, 0, 'k' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhdfnr
j:
k", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index);
if (c == -1) {
break;
if (c == -1) {
break;
@@
-107,9
+103,6
@@
main (int argc, char* argv[])
case 'r':
no_remote = true;
break;
case 'r':
no_remote = true;
break;
- case 'j':
- json_port = atoi (optarg);
- break;
case 'k':
keep_going = true;
break;
case 'k':
keep_going = true;
break;
@@
-130,10
+123,6
@@
main (int argc, char* argv[])
ServerFinder::instance()->disable ();
}
ServerFinder::instance()->disable ();
}
- if (json_port) {
- new JSONServer (json_port);
- }
-
cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
char buf[256];
if (gethostname (buf, 256) == 0) {
cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
char buf[256];
if (gethostname (buf, 256) == 0) {
@@
-150,10
+139,18
@@
main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
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";
cout << "\nMaking DCP for " << film->name() << "\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 ();
film->make_dcp ();
@@
-180,9
+177,7
@@
main (int argc, char* argv[])
if (progress) {
cout << (*i)->name() << ": ";
if (progress) {
cout << (*i)->name() << ": ";
- float const p = (*i)->progress ();
-
- if (p >= 0) {
+ if ((*i)->progress ()) {
cout << (*i)->status() << " \n";
} else {
cout << ": Running \n";
cout << (*i)->status() << " \n";
} else {
cout << ": Running \n";