OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "UrlHandler.h" | 8 #include "UrlHandler.h" |
9 | 9 |
10 #include "microhttpd.h" | 10 #include "microhttpd.h" |
11 #include "../Request.h" | 11 #include "../Request.h" |
12 #include "../Response.h" | 12 #include "../Response.h" |
13 | 13 |
14 using namespace Response; | 14 using namespace Response; |
15 | 15 |
16 bool CmdHandler::canHandle(const char* method, const char* url) { | 16 bool CmdHandler::canHandle(const char* method, const char* url) { |
17 const char* kBasePath = "/cmd"; | 17 const char* kBasePath = "/cmd"; |
18 return 0 == strncmp(url, kBasePath, strlen(kBasePath)); | 18 return 0 == strncmp(url, kBasePath, strlen(kBasePath)); |
19 } | 19 } |
20 | 20 |
21 int CmdHandler::handle(Request* request, MHD_Connection* connection, | 21 int CmdHandler::handle(Request* request, MHD_Connection* connection, |
22 const char* url, const char* method, | 22 const char* url, const char* method, |
23 const char* upload_data, size_t* upload_data_size) { | 23 const char* upload_data, size_t* upload_data_size) { |
24 SkTArray<SkString> commands; | 24 SkTArray<SkString> commands; |
25 SkStrSplit(url, "/", &commands); | 25 SkStrSplit(url, "/", &commands); |
26 | 26 |
27 if (!request->fPicture.get() || commands.count() > 3) { | 27 if (!request->hasPicture() || commands.count() > 3) { |
28 return MHD_NO; | 28 return MHD_NO; |
29 } | 29 } |
30 | 30 |
31 // /cmd or /cmd/N | 31 // /cmd or /cmd/N |
32 if (0 == strcmp(method, MHD_HTTP_METHOD_GET)) { | 32 if (0 == strcmp(method, MHD_HTTP_METHOD_GET)) { |
33 int n; | 33 int n; |
34 if (commands.count() == 1) { | 34 if (commands.count() == 1) { |
35 n = request->fDebugCanvas->getSize() - 1; | 35 n = request->getLastOp(); |
36 } else { | 36 } else { |
37 sscanf(commands[1].c_str(), "%d", &n); | 37 sscanf(commands[1].c_str(), "%d", &n); |
38 } | 38 } |
39 return SendJSON(connection, request, n); | 39 |
| 40 SkAutoTUnref<SkData> data(request->getJsonOps(n)); |
| 41 return SendData(connection, data, "application/json"); |
40 } | 42 } |
41 | 43 |
42 // /cmd/N, for now only delete supported | 44 // /cmd/N, for now only delete supported |
43 if (commands.count() == 2 && 0 == strcmp(method, MHD_HTTP_METHOD_DELETE)) { | 45 if (commands.count() == 2 && 0 == strcmp(method, MHD_HTTP_METHOD_DELETE)) { |
44 int n; | 46 int n; |
45 sscanf(commands[1].c_str(), "%d", &n); | 47 sscanf(commands[1].c_str(), "%d", &n); |
46 request->fDebugCanvas->deleteDrawCommandAt(n); | 48 request->fDebugCanvas->deleteDrawCommandAt(n); |
47 return SendOK(connection); | 49 return SendOK(connection); |
48 } | 50 } |
49 | 51 |
50 // /cmd/N/[0|1] | 52 // /cmd/N/[0|1] |
51 if (commands.count() == 3 && 0 == strcmp(method, MHD_HTTP_METHOD_POST)) { | 53 if (commands.count() == 3 && 0 == strcmp(method, MHD_HTTP_METHOD_POST)) { |
52 int n, toggle; | 54 int n, toggle; |
53 sscanf(commands[1].c_str(), "%d", &n); | 55 sscanf(commands[1].c_str(), "%d", &n); |
54 sscanf(commands[2].c_str(), "%d", &toggle); | 56 sscanf(commands[2].c_str(), "%d", &toggle); |
55 request->fDebugCanvas->toggleCommand(n, toggle); | 57 request->fDebugCanvas->toggleCommand(n, toggle); |
56 return SendOK(connection); | 58 return SendOK(connection); |
57 } | 59 } |
58 | 60 |
59 return MHD_NO; | 61 return MHD_NO; |
60 } | 62 } |
61 | 63 |
OLD | NEW |