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);
}
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);
}
*/
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
*
*
*/
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
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);
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
# 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.
} 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') {
} 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') {
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";
}
[],
["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",
"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",