projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
734a654
)
Display sub-job name in the CLI client.
author
Carl Hetherington
<cth@carlh.net>
Tue, 5 Jul 2016 15:05:07 +0000
(16:05 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 5 Jul 2016 15:05:07 +0000
(16:05 +0100)
src/tools/dcpomatic_cli.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index b9d322a66ff3b114c05b29f22a63d223be3bdf44..eaf868fcaecd548ef9a0e75356ff8d85dfdc6bf9 100644
(file)
--- a/
src/tools/dcpomatic_cli.cc
+++ b/
src/tools/dcpomatic_cli.cc
@@
-315,31
+315,31
@@
main (int argc, char* argv[])
int unfinished = 0;
int finished_in_error = 0;
int unfinished = 0;
int finished_in_error = 0;
-
for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i
) {
+
BOOST_FOREACH (shared_ptr<Job> i, jobs
) {
if (progress) {
if (progress) {
- cout <<
(*i)->
name() << ": ";
+ cout <<
i->name() << "; " << i->sub_
name() << ": ";
- if (
(*i)
->progress ()) {
- cout <<
(*i)->status() << "
\n";
+ if (
i
->progress ()) {
+ cout <<
i->status() << "
\n";
} else {
cout << ": Running \n";
}
}
} else {
cout << ": Running \n";
}
}
- if (!
(*i)
->finished ()) {
+ if (!
i
->finished ()) {
++unfinished;
}
++unfinished;
}
- if (
(*i)
->finished_in_error ()) {
+ if (
i
->finished_in_error ()) {
++finished_in_error;
error = true;
}
++finished_in_error;
error = true;
}
- if (!progress &&
(*i)
->finished_in_error ()) {
+ if (!progress &&
i
->finished_in_error ()) {
/* We won't see this error if we haven't been showing progress,
so show it now.
*/
/* We won't see this error if we haven't been showing progress,
so show it now.
*/
- cout <<
(*i)
->status() << "\n";
+ cout <<
i
->status() << "\n";
}
}
}
}