-
- list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
- json << "{ \"jobs\": [";
- for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
-
- json << "{ "
- << "\"name\": \"" << (*i)->json_name() << "\", "
- << "\"progress\": " << (*i)->progress () << ", "
- << "\"status\": \"" << (*i)->json_status() << "\"";
-
- json << " }";
-
- list<shared_ptr<Job> >::iterator j = i;
+
+ auto jobs = JobManager::instance()->get();
+
+ json += "{ \"jobs\": [";
+ for (auto i = jobs.cbegin(); i != jobs.cend(); ++i) {
+ json += "{ ";
+
+ if ((*i)->film()) {
+ json += "\"dcp\": \"" + (*i)->film()->dcp_name() + "\", ";
+ }
+
+ json += "\"name\": \"" + (*i)->json_name() + "\", ";
+ if ((*i)->progress()) {
+ json += "\"progress\": " + raw_convert<string>((*i)->progress().get()) + ", ";
+ } else {
+ json += "\"progress\": unknown, ";
+ }
+ json += "\"status\": \"" + (*i)->json_status() + "\"";
+ json += " }";
+
+ auto j = i;