X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjson_server.cc;h=e06ee22c3d0b75f44fd82a5b5293cb0970941646;hp=1035c248fccbb3b5abc873e848765214e1c6ebc0;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hpb=f07d5125a7b609320682689abe40781f096ca25e diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index 1035c248f..e06ee22c3 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -139,22 +139,22 @@ void JSONServer::request (string url, shared_ptr socket) { cout << "request: " << url << "\n"; - + map r = split_get_request (url); for (map::iterator i = r.begin(); i != r.end(); ++i) { cout << i->first << " => " << i->second << "\n"; } - + string action; if (r.find ("action") != r.end ()) { action = r["action"]; } - + stringstream json; if (action == "status") { - + list > jobs = JobManager::instance()->get (); - + json << "{ \"jobs\": ["; for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { @@ -163,7 +163,7 @@ JSONServer::request (string url, shared_ptr socket) if ((*i)->film()) { json << "\"dcp\": \"" << (*i)->film()->dcp_name() << "\", "; } - + json << "\"name\": \"" << (*i)->json_name() << "\", "; if ((*i)->progress ()) { json << "\"progress\": " << (*i)->progress().get() << ", "; @@ -172,7 +172,7 @@ JSONServer::request (string url, shared_ptr socket) } json << "\"status\": \"" << (*i)->json_status() << "\""; json << " }"; - + list >::iterator j = i; ++j; if (j != jobs.end ()) { @@ -180,12 +180,12 @@ JSONServer::request (string url, shared_ptr socket) } } json << "] }"; - + if (json.str().empty ()) { json << "{ }"; } } - + stringstream reply; reply << "HTTP/1.1 200 OK\r\n" << "Content-Length: " << json.str().length() << "\r\n"