mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-27 03:10:26 +00:00
Code Issues Releases Wiki Activity

First code for new jsonrpc api

Browse Source
This commit is contained in:
jcorporation 2018-06-14 23:57:57 +01:00
parent 96a7b8a5c9
commit 3df104e72d
4 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -50,6 +50,7 @@ set(SOURCES
src/mpd_client.c
src/mongoose/mongoose.c
src/frozen/frozen.c
src/json_encode.c
)
add_executable(mympd ${SOURCES})

3
htdocs/js/mpd.js
View File

@ -856,7 +856,8 @@ function parseListDBtags(obj) {
' </div>'+
'</div></div>';
$('#BrowseDatabaseAlbumCards').append(card);
$.ajax({url: "/api", mimeType: "text/plain", contentType:"text/plain", method: "POST", data: "MPD_API_GET_ARTISTALBUMTITLES," + obj.searchstr + ","+obj.data[item].value}).done(function( data ) {
$.ajax({url: "/jsonrpc", contentType:"application/json", method: "POST",
data: JSON.stringify({"cmd":"MPD_API_GET_ARTISTALBUMTITLES", "data": { "albumartist": obj.searchstr, "album": obj.data[item].value}})}).done(function( data ) {
var obj = JSON.parse(data);
parseListTitles(obj);
});

53
src/mpd_client.c
View File

@ -60,6 +60,59 @@ static inline enum mpd_cmd_ids get_cmd_id(const char *cmd)
return -1;
}
void callback_mympd_jsonrpc(struct mg_connection *nc, const struct mg_str msg)
{
size_t n = 0;
char *cmd;
int int_buf;
int je;
float float_buf;
char *p_charbuf1;
char *p_charbuf2;
char *p_charbuf3;
#ifdef DEBUG
fprintf(stdout,"Got request: %s\n",msg.p);
#endif
json_scanf(msg.p, msg.len, "{cmd:%Q}", &cmd);
enum mpd_cmd_ids cmd_id = get_cmd_id(cmd);
if(cmd_id == -1)
return;
switch(cmd_id) {
case MPD_API_GET_ARTISTALBUMTITLES:
je = json_scanf(msg.p, msg.len, "{ data: { albumartist:%Q, album:%Q } }", &p_charbuf1, &p_charbuf2);
if (je == 2)
n = mympd_put_songs_in_album(mpd.buf, p_charbuf1, p_charbuf2);
free(p_charbuf1);
free(p_charbuf2);
break;
}
free(cmd);
if(mpd.conn_state == MPD_CONNECTED && mpd_connection_get_error(mpd.conn) != MPD_ERROR_SUCCESS)
{
#ifdef DEBUG
fprintf(stdout,"Error: %s\n",mpd_connection_get_error_message(mpd.conn));
#endif
n = snprintf(mpd.buf, MAX_SIZE, "{\"type\":\"error\", \"data\": \"%s\"}",
mpd_connection_get_error_message(mpd.conn));
/* Try to recover error */
if (!mpd_connection_clear_error(mpd.conn))
mpd.conn_state = MPD_FAILURE;
}
if(n > 0) {
#ifdef DEBUG
fprintf(stdout,"Send http response:\n %s\n",mpd.buf);
#endif
mg_send_http_chunk(nc, mpd.buf, n);
}
}
void callback_mympd(struct mg_connection *nc, const struct mg_str msg)
{
enum mpd_cmd_ids cmd_id = get_cmd_id(msg.p);

12
src/mympd.c
View File

@ -52,6 +52,15 @@ static void handle_api(struct mg_connection *nc, struct http_message *hm) {
mg_send_http_chunk(nc, "", 0); /* Send empty chunk, the end of response */
}
static void handle_jsonrpc(struct mg_connection *nc, struct http_message *hm) {
mg_printf(nc, "%s", "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");
char buf[1000] = {0};
memcpy(buf, hm->body.p,sizeof(buf) - 1 < hm->body.len ? sizeof(buf) - 1 : hm->body.len);
struct mg_str d = {buf, strlen(buf)};
callback_mympd_jsonrpc(nc, d);
mg_send_http_chunk(nc, "", 0); /* Send empty chunk, the end of response */
}
static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
switch(ev) {
case MG_EV_WEBSOCKET_HANDSHAKE_DONE: {
@ -80,6 +89,9 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
if (mg_vcmp(&hm->uri, "/api") == 0) {
handle_api(nc, hm);
}
else if (mg_vcmp(&hm->uri, "/jsonrpc") == 0) {
handle_jsonrpc(nc, hm);
}
else {
mg_serve_http(nc, hm, s_http_server_opts);
}