From 5dc19ffd92349be8525592cf78fb267e2f067a86 Mon Sep 17 00:00:00 2001 Message-Id: <5dc19ffd92349be8525592cf78fb267e2f067a86.1715338140.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 6 Jun 2010 10:48:21 +0100 Subject: [PATCH] More commands. Organization: Straylight/Edgeware From: Richard Kettlewell --- lib/client-stubs.c | 8 +++++++ lib/client-stubs.h | 22 ++++++++++++++++++++ lib/client.c | 52 +++++++++++++--------------------------------- scripts/protocol | 20 ++++++++++++++++-- 4 files changed, 63 insertions(+), 39 deletions(-) diff --git a/lib/client-stubs.c b/lib/client-stubs.c index 68d041d..1661a0c 100644 --- a/lib/client-stubs.c +++ b/lib/client-stubs.c @@ -175,6 +175,10 @@ int disorder_playlists(disorder_client *c, char ***playlistsp, int *nplaylistsp) return disorder_simple_list(c, playlistsp, nplaylistsp, "playlists", (char *)0); } +int disorder_prefs(disorder_client *c, const char *track, struct kvp **prefsp) { + return pairlist(c, prefsp, "prefs", track, (char *)0); +} + int disorder_queue(disorder_client *c, struct queue_entry **queuep) { return somequeue(c, "queue", queuep); } @@ -239,6 +243,10 @@ int disorder_schedule_del(disorder_client *c, const char *event) { return disorder_simple(c, 0, "schedule-del", event, (char *)0); } +int disorder_schedule_get(disorder_client *c, const char *id, struct kvp **actiondatap) { + return pairlist(c, actiondatap, "schedule-get", id, (char *)0); +} + int disorder_schedule_list(disorder_client *c, char ***idsp, int *nidsp) { return disorder_simple_list(c, idsp, nidsp, "schedule-list", (char *)0); } diff --git a/lib/client-stubs.h b/lib/client-stubs.h index 8a4ece5..0d3d727 100644 --- a/lib/client-stubs.h +++ b/lib/client-stubs.h @@ -377,6 +377,17 @@ int disorder_playlist_unlock(disorder_client *c); */ int disorder_playlists(disorder_client *c, char ***playlistsp, int *nplaylistsp); +/** @brief Get all the preferences for a track + * + * + * + * @param c Client + * @param track Track name + * @param prefsp Track preferences + * @return 0 on success, non-0 on error + */ +int disorder_prefs(disorder_client *c, const char *track, struct kvp **prefsp); + /** @brief List the queue * * @@ -525,6 +536,17 @@ int disorder_scratch(disorder_client *c, const char *id); */ int disorder_schedule_del(disorder_client *c, const char *event); +/** @brief Get the details of scheduled event + * + * + * + * @param c Client + * @param id Event ID + * @param actiondatap Details of event + * @return 0 on success, non-0 on error + */ +int disorder_schedule_get(disorder_client *c, const char *id, struct kvp **actiondatap); + /** @brief List scheduled events * * This just lists IDs. Use 'schedule-get' to retrieve more detail diff --git a/lib/client.c b/lib/client.c index c907e7c..2434369 100644 --- a/lib/client.c +++ b/lib/client.c @@ -659,29 +659,36 @@ char *disorder_user(disorder_client *c) { return c->user; } -static void pref_error_handler(const char *msg, +static void pairlist_error_handler(const char *msg, void attribute((unused)) *u) { - disorder_error(0, "error handling 'prefs' reply: %s", msg); + disorder_error(0, "error handling key-value pair reply: %s", msg); } -/** @brief Get all preferences for a trcak +/** @brief Get a list of key-value pairs * @param c Client - * @param track Track name * @param kp Where to store linked list of preferences + * @param cmd Command + * @param ... Arguments * @return 0 on success, non-0 on error */ -int disorder_prefs(disorder_client *c, const char *track, struct kvp **kp) { +static int pairlist(disorder_client *c, struct kvp **kp, const char *cmd, ...) { char **vec, **pvec; int nvec, npvec, n, rc; struct kvp *k; + va_list ap; - if((rc = disorder_simple_list(c, &vec, &nvec, "prefs", track, (char *)0))) + va_start(ap, cmd); + rc = disorder_simple_v(c, 0, cmd, ap); + va_end(ap); + if(rc) return rc; + if((rc = readlist(c, &vec, &nvec))) + return rc; for(n = 0; n < nvec; ++n) { - if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pref_error_handler, 0))) + if(!(pvec = split(vec[n], &npvec, SPLIT_QUOTES, pairlist_error_handler, 0))) return -1; if(npvec != 2) { - pref_error_handler("malformed response", 0); + pairlist_error_handler("malformed response", 0); return -1; } *kp = k = xmalloc(sizeof *k); @@ -808,35 +815,6 @@ int disorder_rtp_address(disorder_client *c, char **addressp, char **portp) { return 0; } -/** @brief Get details of a scheduled event - * @param c Client - * @param id Event ID - * @param actiondatap Where to put details - * @return 0 on success, non-0 on error - */ -int disorder_schedule_get(disorder_client *c, const char *id, - struct kvp **actiondatap) { - char **lines, **bits; - int rc, nbits; - - *actiondatap = 0; - if((rc = disorder_simple_list(c, &lines, NULL, - "schedule-get", id, (char *)0))) - return rc; - while(*lines) { - if(!(bits = split(*lines++, &nbits, SPLIT_QUOTES, 0, 0))) { - disorder_error(0, "invalid schedule-get reply: cannot split line"); - return -1; - } - if(nbits != 2) { - disorder_error(0, "invalid schedule-get reply: wrong number of fields"); - return -1; - } - kvp_set(actiondatap, bits[0], bits[1]); - } - return 0; -} - /** @brief Add a scheduled event * @param c Client * @param when When to trigger the event diff --git a/scripts/protocol b/scripts/protocol index ea28966..a7b36ed 100755 --- a/scripts/protocol +++ b/scripts/protocol @@ -31,6 +31,7 @@ use strict; # boolean True or false. "yes" or "no" on the wire. # list In commands: a list of strings in the command. # In returns: a list of lines in the response. +# pair-list In returns: a list of key-value pairs in a response body. # body In commands: a list of strings as a command body. # In returns: a list of strings as a response body. # queue In returns: a list of queue entries in a response body. @@ -86,6 +87,8 @@ sub c_out_decl { } elsif($type eq 'list' or $type eq 'body') { return ("char ***${name}p", "int *n${name}p"); + } elsif($type eq 'pair-list') { + return ("struct kvp **${name}p"); } elsif($type eq 'queue' or $type eq 'queue-one') { return ("struct queue_entry **${name}p"); } elsif($type eq 'user') { @@ -123,6 +126,8 @@ sub c_return_docs { } elsif($type eq 'list' or $type eq 'body') { return (" * \@param ${name}p $descr\n", " * \@param n${name}p Number of elements in ${name}p\n"); + } elsif($type eq 'pair-list') { + return (" * \@param ${name}p $descr\n"); } elsif($type eq 'queue' or $type eq 'queue-one') { return (" * \@param ${name}p $descr\n"); } elsif($type eq 'user') { @@ -225,6 +230,9 @@ sub simple { push(@c, " return somequeue(c, \"$cmd\", $return->[1]p);\n"); } elsif($return->[0] eq 'queue-one') { push(@c, " return onequeue(c, \"$cmd\", $return->[1]p);\n"); + } elsif($return->[0] eq 'pair-list') { + push(@c, " return pairlist(c, $return->[1]p, \"$cmd\"", + map(", $_->[1]", @$args), ", (char *)0);\n"); } else { die "$0: C API: unknown type '$return->[0]' for '$cmd'\n"; } @@ -475,7 +483,11 @@ simple("playlists", [], ["body", "playlists", "Playlist names"]); -# TODO prefs +simple("prefs", + "Get all the preferences for a track", + "", + [["string", "track", "Track name"]], + ["pair-list", "prefs", "Track preferences"]); simple("queue", "List the queue", @@ -563,7 +575,11 @@ simple("schedule-del", "Users can always delete their own scheduled events; with the admin right you can delete any event.", [["string", "event", "ID of event to delete"]]); -# TODO schedule-get +simple("schedule-get", + "Get the details of scheduled event", + "", + [["string", "id", "Event ID"]], + ["pair-list", "actiondata", "Details of event"]); simple("schedule-list", "List scheduled events", -- [mdw]