X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjson_server.cc;h=8c626ad1f0e2186d48d205f050dfececbf6de0bc;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=c7a3ca144e4c5974c7e632ba970955c6eb9f103c;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index c7a3ca144..8c626ad1f 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -1,45 +1,52 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include "json_server.h" -#include "job_manager.h" -#include "job.h" -#include "util.h" + #include "film.h" +#include "job.h" +#include "job_manager.h" +#include "json_server.h" #include "transcode_job.h" +#include "util.h" +#include +#include +#include +#include #include -using std::string; -using std::stringstream; + using std::cout; -using std::map; +using std::dynamic_pointer_cast; using std::list; -using boost::thread; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::make_shared; +using std::map; +using std::shared_ptr; +using std::string; using boost::asio::ip::tcp; +using boost::thread; +using dcp::raw_convert; + #define MAX_LENGTH 512 + enum State { AWAITING_G, AWAITING_E, @@ -48,11 +55,18 @@ enum State { READING_URL, }; + JSONServer::JSONServer (int port) { +#ifdef DCPOMATIC_LINUX + auto t = new thread (boost::bind (&JSONServer::run, this, port)); + pthread_setname_np (t->native_handle(), "json-server"); +#else new thread (boost::bind (&JSONServer::run, this, port)); +#endif } + void JSONServer::run (int port) try @@ -61,7 +75,7 @@ try tcp::acceptor a (io_service, tcp::endpoint (tcp::v4 (), port)); while (true) { try { - shared_ptr s (new tcp::socket (io_service)); + auto s = make_shared(io_service); a.accept (*s); handle (s); } @@ -75,6 +89,7 @@ catch (...) } + void JSONServer::handle (shared_ptr socket) { @@ -90,11 +105,11 @@ JSONServer::handle (shared_ptr socket) break; } - char* p = data; - char* e = data + len; + auto p = data; + auto e = data + len; while (p != e) { - State old_state = state; + auto old_state = state; switch (state) { case AWAITING_G: if (*p == 'G') { @@ -136,14 +151,15 @@ JSONServer::handle (shared_ptr socket) } } + 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"; + auto r = split_get_request (url); + for (auto const& i: r) { + cout << i.first << " => " << i.second << "\n"; } string action; @@ -151,48 +167,42 @@ JSONServer::request (string url, shared_ptr socket) action = r["action"]; } - stringstream json; + string json; if (action == "status") { - list > jobs = JobManager::instance()->get (); + auto jobs = JobManager::instance()->get(); - json << "{ \"jobs\": ["; - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - - json << "{ "; + json += "{ \"jobs\": ["; + for (auto i = jobs.cbegin(); i != jobs.cend(); ++i) { + json += "{ "; if ((*i)->film()) { - json << "\"dcp\": \"" << (*i)->film()->dcp_name() << "\", "; + json += "\"dcp\": \"" + (*i)->film()->dcp_name() + "\", "; } - json << "\"name\": \"" << (*i)->json_name() << "\", "; - if ((*i)->progress ()) { - json << "\"progress\": " << (*i)->progress().get() << ", "; + json += "\"name\": \"" + (*i)->json_name() + "\", "; + if ((*i)->progress()) { + json += "\"progress\": " + raw_convert((*i)->progress().get()) + ", "; } else { - json << "\"progress\": unknown, "; + json += "\"progress\": unknown, "; } - json << "\"status\": \"" << (*i)->json_status() << "\""; - json << " }"; + json += "\"status\": \"" + (*i)->json_status() + "\""; + json += " }"; - list >::iterator j = i; + auto j = i; ++j; if (j != jobs.end ()) { - json << ", "; + json += ", "; } } - json << "] }"; - - if (json.str().empty ()) { - json << "{ }"; - } + json += "] }"; } - stringstream reply; - reply << "HTTP/1.1 200 OK\r\n" - << "Content-Length: " << json.str().length() << "\r\n" - << "Content-Type: application/json\r\n" - << "\r\n" - << json.str () << "\r\n"; - cout << "reply: " << json.str() << "\n"; - boost::asio::write (*socket, boost::asio::buffer (reply.str().c_str(), reply.str().length())); + string reply = "HTTP/1.1 200 OK\r\n" + "Content-Length: " + raw_convert(json.length()) + "\r\n" + "Content-Type: application/json\r\n" + "\r\n" + + json + "\r\n"; + cout << "reply: " << json << "\n"; + boost::asio::write (*socket, boost::asio::buffer(reply.c_str(), reply.length())); }