* @brief DisOrder-specific expansions
*/
-#include <config.h>
-#include "types.h"
-
-#include "sink.h"
-#include "client.h"
-#include "cgi.h"
-#include "macros-disorder.h"
-#include "lookups.h"
+#include "disorder-cgi.h"
/** @brief For error template */
-char *error_string;
+char *dcgi_error_string;
/** @brief Locate a track by ID */
static struct queue_entry *findtrack(const char *id) {
struct queue_entry *q;
- lookups(DC_PLAYING);
- if(playing && !strcmp(playing->id, id))
- return playing;
- lookups(DC_QUEUE);
- for(q = queue; q; q = q->next)
+ dcgi_lookup(DCGI_PLAYING);
+ if(dcgi_playing && !strcmp(dcgi_playing->id, id))
+ return dcgi_playing;
+ dcgi_lookup(DCGI_QUEUE);
+ for(q = dcgi_queue; q; q = q->next)
if(!strcmp(q->id, id))
return q;
- lookups(DC_RECENT);
- for(q = recent; q; q = q->next)
+ dcgi_lookup(DCGI_RECENT);
+ for(q = dcgi_recent; q; q = q->next)
if(!strcmp(q->id, id))
return q;
+ return NULL;
}
/** @brief Return @p i as a string */
void attribute((unused)) *u) {
const char *v;
- if(client) {
- if(disorder_version(client, (char **)&v))
+ if(dcgi_client) {
+ if(disorder_version(dcgi_client, (char **)&v))
v = "(cannot get version)";
} else
v = "(server not running)";
- return sink_write(output, cgi_sgmlquote(v)) < 0 ? -1 : 0;
+ return sink_writes(output, cgi_sgmlquote(v)) < 0 ? -1 : 0;
}
/* @version
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- return sink_write(output,
- cgi_sgmlquote(disorder_short_version_string)) < 0 ? -1 : 0;
+ return sink_writes(output,
+ cgi_sgmlquote(disorder_short_version_string)) < 0 ? -1 : 0;
}
/* @url
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- return sink_write(output,
- cgi_sgmlquote(config->url)) < 0 ? -1 : 0;
+ return sink_writes(output,
+ cgi_sgmlquote(config->url)) < 0 ? -1 : 0;
}
/* @arg{NAME}
void attribute((unused)) *u) {
const char *s = cgi_get(args[0]);
if(s)
- return sink_write(output,
- cgi_sgmlquote(s)) < 0 ? -1 : 0;
+ return sink_writes(output,
+ cgi_sgmlquote(s)) < 0 ? -1 : 0;
else
return 0;
}
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- const char *u;
+ const char *user;
- if(client && (u = disorder_user(client)))
- return sink_write(output, cgi_sgmlquote(u)) < 0 ? -1 : 0;
+ if(dcgi_client && (user = disorder_user(dcgi_client)))
+ return sink_writes(output, cgi_sgmlquote(user)) < 0 ? -1 : 0;
return 0;
}
else
return 0;
}
- if(client
- && !disorder_get(client, &s, track,
- !strcmp(context, "short") ? "display" : context,
- part))
- return sink_write(output, cgi_sgmlquote(s)) < 0 ? -1 : 0;
+ if(dcgi_client
+ && !disorder_part(dcgi_client, &s,
+ track,
+ !strcmp(context, "short") ? "display" : context,
+ part))
+ return sink_writes(output, cgi_sgmlquote(s)) < 0 ? -1 : 0;
return 0;
}
char **args,
struct sink *output,
void attribute((unused)) *u) {
- return sink_write(output, cgi_sgmlquote(args[0])) < 0 ? -1 : 0;
+ return sink_writes(output, cgi_sgmlquote(args[0])) < 0 ? -1 : 0;
}
/* @who{ID}
struct queue_entry *q = findtrack(args[0]);
if(q && q->submitter)
- return sink_write(output, cgi_sgmlquote(q->submitter)) < 0 ? -1 : 0;
+ return sink_writes(output, cgi_sgmlquote(q->submitter)) < 0 ? -1 : 0;
return 0;
}
if(w)
return sink_printf(output, "%d:%02d", w->tm_hour, w->tm_min) < 0 ? -1 : 0;
}
- return sink_write(output, " ") < 0 ? -1 : 0;
+ return sink_writes(output, " ") < 0 ? -1 : 0;
}
/* @length{ID|TRACK}
/* Track identified by queue ID */
if(!(q = findtrack(args[0])))
return 0;
- if(q->state == play_start || q->state == playing_paused)
+ if(q->state == playing_started || q->state == playing_paused)
if(sink_printf(output, "%ld:%02ld/", q->sofar / 60, q->sofar % 60) < 0)
return -1;
name = q->track;
}
- if(client && disorder_length(client, name, &length))
+ if(dcgi_client && disorder_length(dcgi_client, name, &length))
return sink_printf(output, "%ld:%02ld",
length / 60, length % 60) < 0 ? -1 : 0;
- return sink_write(output, " ") < 0 ? -1 : 0;
+ return sink_writes(output, " ") < 0 ? -1 : 0;
}
/* @removable{ID}
struct queue_entry *q = findtrack(args[0]);
/* TODO would be better to reject recent */
- if(!q || !client)
+ if(!q || !dcgi_client)
return mx_bool_result(output, 0);
- lookup(DC_RIGHTS);
+ dcgi_lookup(DCGI_RIGHTS);
return mx_bool_result(output,
- (q == playing ? right_scratchable : right_removable)
- (rights, disorder_user(client), q));
+ (q == dcgi_playing ? right_scratchable : right_removable)
+ (dcgi_rights, disorder_user(dcgi_client), q));
}
/* @movable{ID}
struct queue_entry *q = findtrack(args[0]);
/* TODO would be better to recent playing/recent */
- if(!q || !client)
+ if(!q || !dcgi_client)
return mx_bool_result(output, 0);
- lookup(DC_RIGHTS);
+ dcgi_lookup(DCGI_RIGHTS);
return mx_bool_result(output,
- right_movable(rights, disorder_user(client), q));
+ right_movable(dcgi_rights, disorder_user(dcgi_client), q));
}
/* @playing{TEMPLATE}
static int exp_playing(int nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
- lookup(DC_PLAYING);
- if(!playing)
+ void *u) {
+ dcgi_lookup(DCGI_PLAYING);
+ if(!dcgi_playing)
return 0;
if(!nargs)
- return sink_write(output, playing->id) < 0 ? -1 : 0;
- return mx_rewritel(args[0],
- "id", playing->id,
- "track", playing->track,
- (char *)0);
+ return sink_writes(output, dcgi_playing->id) < 0 ? -1 : 0;
+ return mx_expand(mx_rewritel(args[0],
+ "id", dcgi_playing->id,
+ "track", dcgi_playing->track,
+ (char *)0),
+ output, u);
}
/* @queue{TEMPLATE}
static int exp_queue(int attribute((unused)) nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
+ void *u) {
struct queue_entry *q;
int rc, i;
- lookup(DC_QUEUE);
- for(q = queue, i = 0; q; q = q->next, ++i)
- if((rc = mx_rewritel(args[0],
- "id", q->id,
- "track", q->track,
- "index", make_index(i),
- "parity", i % 2 ? "odd" : "even",
- "first", q == queue ? "true" : "false",
- "last", q->next ? "false" : "true",
- (char *)0)))
+ dcgi_lookup(DCGI_QUEUE);
+ for(q = dcgi_queue, i = 0; q; q = q->next, ++i)
+ if((rc = mx_expand(mx_rewritel(args[0],
+ "id", q->id,
+ "track", q->track,
+ "index", make_index(i),
+ "parity", i % 2 ? "odd" : "even",
+ "first", q == dcgi_queue ? "true" : "false",
+ "last", q->next ? "false" : "true",
+ (char *)0),
+ output, u)))
return rc;
return 0;
}
static int exp_recent(int attribute((unused)) nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
+ void *u) {
struct queue_entry *q;
int rc, i;
- lookup(DC_RECENT);
- for(q = recent, i = 0; q; q = q->next, ++i)
- if((rc = mx_rewritel(args[0],
- "id", q->id,
- "track", q->track,
- "index", make_index(i),
- "parity", i % 2 ? "odd" : "even",
- "first", q == recent ? "true" : "false",
- "last", q->next ? "false" : "true",
- (char *)0)))
+ dcgi_lookup(DCGI_RECENT);
+ for(q = dcgi_recent, i = 0; q; q = q->next, ++i)
+ if((rc = mx_expand(mx_rewritel(args[0],
+ "id", q->id,
+ "track", q->track,
+ "index", make_index(i),
+ "parity", i % 2 ? "odd" : "even",
+ "first", q == dcgi_recent ? "true" : "false",
+ "last", q->next ? "false" : "true",
+ (char *)0),
+ output, u)))
return rc;
return 0;
}
static int exp_new(int attribute((unused)) nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
- struct queue_entry *q;
+ void *u) {
int rc, i;
- lookup(DC_NEW);
+ dcgi_lookup(DCGI_NEW);
/* TODO perhaps we should generate an ID value for tracks in the new list */
- for(i = 0; i < nnew; ++i)
- if((rc = mx_rewritel(args[0],
- "track", new[i],
- "index", make_index(i),
- "parity", i % 2 ? "odd" : "even",
- "first", i == 0 ? "true" : "false",
- "last", i == nnew - 1 ? "false" : "true",
- (char *)0)))
+ for(i = 0; i < dcgi_nnew; ++i)
+ if((rc = mx_expand(mx_rewritel(args[0],
+ "track", dcgi_new[i],
+ "index", make_index(i),
+ "parity", i % 2 ? "odd" : "even",
+ "first", i == 0 ? "true" : "false",
+ "last", i == dcgi_nnew - 1 ? "false" : "true",
+ (char *)0),
+ output, u)))
return rc;
return 0;
}
char **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_VOLUME);
- return sink_write(output, "%d",
- !strcmp(args[0], "left")
- ? volume_left : volume_right) < 0 ? -1 : 0;
+ dcgi_lookup(DCGI_VOLUME);
+ return sink_printf(output, "%d",
+ !strcmp(args[0], "left")
+ ? dcgi_volume_left : dcgi_volume_right) < 0 ? -1 : 0;
}
/* @isplaying
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_PLAYING);
- return mx_bool_result(output, !!playing);
+ dcgi_lookup(DCGI_PLAYING);
+ return mx_bool_result(output, !!dcgi_playing);
}
/* @isqueue
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_QUEUE);
- return mx_bool_result(output, !!queue);
+ dcgi_lookup(DCGI_QUEUE);
+ return mx_bool_result(output, !!dcgi_queue);
}
/* @isrecent@
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_RECENT);
- return mx_bool_result(output, !!recent);
+ dcgi_lookup(DCGI_RECENT);
+ return mx_bool_result(output, !!dcgi_recent);
}
/* @isnew
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_NEW);
- return mx_bool_result(output, !!nnew);
+ dcgi_lookup(DCGI_NEW);
+ return mx_bool_result(output, !!dcgi_nnew);
}
/* @pref{TRACK}{KEY}
void attribute((unused)) *u) {
char *value;
- if(client && !disorder_get(client, args[0], args[1], &value))
- return sink_write(output, cgi_sgmlquote(value)) < 0 ? -1 : 0;
+ if(dcgi_client && !disorder_get(dcgi_client, args[0], args[1], &value))
+ return sink_writes(output, cgi_sgmlquote(value)) < 0 ? -1 : 0;
+ return 0;
}
/* @prefs{TRACK}{TEMPLATE}
static int exp_prefs(int attribute((unused)) nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
+ void *u) {
int rc, i;
struct kvp *k, *head;
char *track;
if((rc = mx_expandstr(args[0], &track, u, "argument #0 (TRACK)")))
return rc;
- if(!client || disorder_prefs(client, track, &head))
+ if(!dcgi_client || disorder_prefs(dcgi_client, track, &head))
return 0;
for(k = head, i = 0; k; k = k->next, ++i)
- if((rc = mx_rewritel(args[1],
- "index", make_index(i),
- "parity", i % 2 ? "odd" : "even",
- "name", k->name,
- "value", k->value,
- "first", k == head ? "true" : "false",
- "last", k->next ? "false" : "true",
- (char *)0)))
+ if((rc = mx_expand(mx_rewritel(args[1],
+ "index", make_index(i),
+ "parity", i % 2 ? "odd" : "even",
+ "name", k->name,
+ "value", k->value,
+ "first", k == head ? "true" : "false",
+ "last", k->next ? "false" : "true",
+ (char *)0),
+ output, u)))
return rc;
return 0;
}
struct sink *output,
void attribute((unused)) *u) {
const char *t = trackname_transform(args[1], args[0],
- (nargs > 2 ? args[2] : "display")));
- return sink_write(output, cgi_sgmlquote(t)) < 0 ? -1 : 0;
+ (nargs > 2 ? args[2] : "display"));
+ return sink_writes(output, cgi_sgmlquote(t)) < 0 ? -1 : 0;
}
/* @enabled@
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- int enabled = 0;
+ int e = 0;
- if(client)
- disorder_enabled(client, &enabled);
- return mx_bool_result(output, enabled);
+ if(dcgi_client)
+ disorder_enabled(dcgi_client, &e);
+ return mx_bool_result(output, e);
}
/* @random-enabled
*
* Expands to "true" if random play is enabled, otherwise "false".
*/
-static int exp_enabled(int attribute((unused)) nargs,
- char attribute((unused)) **args,
- struct sink *output,
- void attribute((unused)) *u) {
- int enabled = 0;
+static int exp_random_enabled(int attribute((unused)) nargs,
+ char attribute((unused)) **args,
+ struct sink *output,
+ void attribute((unused)) *u) {
+ int e = 0;
- if(client)
- disorder_random_enabled(client, &enabled);
- return mx_bool_result(output, enabled);
+ if(dcgi_client)
+ disorder_random_enabled(dcgi_client, &e);
+ return mx_bool_result(output, e);
}
/* @trackstate{TRACK}
char *track;
struct queue_entry *q;
- if(!client)
+ if(!dcgi_client)
return 0;
- if(disorder_resolve(client, &track, args[0]))
+ if(disorder_resolve(dcgi_client, &track, args[0]))
return 0;
- lookup(DC_PLAYING);
- if(playing && !strcmp(track, playing->track))
- return sink_write(output, "playing") < 0 ? -1 : 0;
- lookup(DC_QUEUE);
- for(q = queue; q; q = q->next)
+ dcgi_lookup(DCGI_PLAYING);
+ if(dcgi_playing && !strcmp(track, dcgi_playing->track))
+ return sink_writes(output, "playing") < 0 ? -1 : 0;
+ dcgi_lookup(DCGI_QUEUE);
+ for(q = dcgi_queue; q; q = q->next)
if(!strcmp(track, q->track))
- return sink_write(output, "queued") < 0 ? -1 : 0;
+ return sink_writes(output, "queued") < 0 ? -1 : 0;
return 0;
}
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- return cgi_thisurl(config->url);
+ return sink_writes(output, cgi_thisurl(config->url)) < 0 ? -1 : 0;
}
/* @resolve{TRACK}
void attribute((unused)) *u) {
char *r;
- if(client && !disorder_resolve(client, &r, args[0]))
- return sink_write(output, r) < 0 ? -1 : 0;
+ if(dcgi_client && !disorder_resolve(dcgi_client, &r, args[0]))
+ return sink_writes(output, r) < 0 ? -1 : 0;
return 0;
}
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- lookup(DC_PLAYING);
- return mx_bool_result(output, playing && playing->state == playing_paused);
+ dcgi_lookup(DCGI_PLAYING);
+ return mx_bool_result(output, (dcgi_playing
+ && dcgi_playing->state == playing_paused));
}
/* @state{ID}@
struct queue_entry *q = findtrack(args[0]);
if(q)
- return sink_write(output, playing_states[q->state]) < 0 ? -1 : 0;
+ return sink_writes(output, playing_states[q->state]) < 0 ? -1 : 0;
return 0;
}
static int exp_right(int nargs,
const struct mx_node **args,
struct sink *output,
- void attribute((unused)) *u) {
+ void *u) {
char *right;
rights_type r;
+ int rc;
- if(!client)
+ if(!dcgi_client)
return 0;
- lookup(DC_RIGHTS);
- if((rc = mx_expandstr(args[0], &rightname, u, "argument #0 (RIGHT)")))
+ dcgi_lookup(DCGI_RIGHTS);
+ if((rc = mx_expandstr(args[0], &right, u, "argument #0 (RIGHT)")))
return rc;
if(parse_rights(right, &r, 1/*report*/))
return 0;
/* Single-argument form */
if(nargs == 1)
- return mx_bool_result(output, !!(r & rights));
+ return mx_bool_result(output, !!(r & dcgi_rights));
/* Multiple argument form */
- if(r & rights)
- return mx_expandl(args[1], (char *)0);
+ if(r & dcgi_rights)
+ return mx_expand(args[1], output, u);
if(nargs == 3)
- return mx_expandl(args[2], (char *)0);
+ return mx_expand(args[2], output, u);
return 0;
}
void attribute((unused)) *u) {
char *v;
- if(client && !disorder_userinfo(client, disorder_user(client), args[0], &v))
- return sink_write(output, v) < 0 ? -1 : 0;
+ if(dcgi_client
+ && !disorder_userinfo(dcgi_client, disorder_user(dcgi_client),
+ args[0], &v))
+ return sink_writes(output, v) < 0 ? -1 : 0;
return 0;
}
char attribute((unused)) **args,
struct sink *output,
void attribute((unused)) *u) {
- return sink_write(output, cgi_sgmlquote(error_string)) < 0 ? -1 : 0;
+ return sink_writes(output, cgi_sgmlquote(dcgi_error_string)) < 0 ? -1 : 0;
}
-/* @userinfo{PROPERTY}@
- *
/** @brief Register DisOrder-specific expansions */
-void register_disorder_expansions(void) {
- mx_register(exp_arg, 1, 1, "arg");
- mx_register(exp_enabled, 0, 0, "enabled");
- mx_register(exp_error, 0, 0, "error");
- mx_register(exp_isnew, 0, 0, "isnew");
- mx_register(exp_isplaying, 0, 0, "isplaying");
- mx_register(exp_isqueue, 0, 0, "isplaying");
- mx_register(exp_isrecent, 0, 0, "isrecent");
- mx_register(exp_length, 1, 1, "length");
- mx_register(exp_movable, 1, 1, "movable");
- mx_register(exp_part, 2, 3, "part");
- mx_register(exp_pref, 2, 2, "pref");
- mx_register(exp_quote, 1, 1, "quote");
- mx_register(exp_random_enabled, 0, 0, "random-enabled");
- mx_register(exp_removable, 1, 1, "removable");
- mx_register(exp_resolve, 1, 1, "resolve");
- mx_register(exp_right, 1, 3, "right");
- mx_register(exp_server_version, 0, 0, "server-version");
- mx_register(exp_state, 1, 1, "state");
- mx_register(exp_thisurl, 0, 0, "thisurl");
- mx_register(exp_trackstate, 1, 1, "trackstate");
- mx_register(exp_transform, 2, 3, "transform");
- mx_register(exp_url, 0, 0, "url");
- mx_register(exp_user, 0, 0, "user");
- mx_register(exp_userinfo, 1, 1, "userinfo");
- mx_register(exp_version, 0, 0, "version");
- mx_register(exp_volume, 1, 1, "volume");
- mx_register(exp_when, 1, 1, "when");
- mx_register(exp_who, 1, 1, "who");
- mx_register_magic(exp_new, 1, 1, "new");
- mx_register_magic(exp_playing, 0, 1, "playing");
- mx_register_magic(exp_prefs, 2, 2, "prefs");
- mx_register_magic(exp_queue, 1, 1, "queue");
- mx_register_magic(exp_recent, 1, 1, "recent");
-}
-
-void disorder_macros_reset(void) {
- /* Junk the old connection if there is one */
- if(client)
- disorder_close(client);
- /* Create a new connection */
- client = disorder_new(0);
- /* Forget everything we knew */
- flags = 0;
+void dcgi_expansions(void) {
+ mx_register("arg", 1, 1, exp_arg);
+ mx_register("enabled", 0, 0, exp_enabled);
+ mx_register("error", 0, 0, exp_error);
+ mx_register("isnew", 0, 0, exp_isnew);
+ mx_register("isplaying", 0, 0, exp_isplaying);
+ mx_register("isplaying", 0, 0, exp_isqueue);
+ mx_register("isrecent", 0, 0, exp_isrecent);
+ mx_register("length", 1, 1, exp_length);
+ mx_register("movable", 1, 1, exp_movable);
+ mx_register("part", 2, 3, exp_part);
+ mx_register("paused", 0, 0, exp_paused);
+ mx_register("pref", 2, 2, exp_pref);
+ mx_register("quote", 1, 1, exp_quote);
+ mx_register("random-enabled", 0, 0, exp_random_enabled);
+ mx_register("removable", 1, 1, exp_removable);
+ mx_register("resolve", 1, 1, exp_resolve);
+ mx_register("server-version", 0, 0, exp_server_version);
+ mx_register("state", 1, 1, exp_state);
+ mx_register("thisurl", 0, 0, exp_thisurl);
+ mx_register("trackstate", 1, 1, exp_trackstate);
+ mx_register("transform", 2, 3, exp_transform);
+ mx_register("url", 0, 0, exp_url);
+ mx_register("user", 0, 0, exp_user);
+ mx_register("userinfo", 1, 1, exp_userinfo);
+ mx_register("version", 0, 0, exp_version);
+ mx_register("volume", 1, 1, exp_volume);
+ mx_register("when", 1, 1, exp_when);
+ mx_register("who", 1, 1, exp_who);
+ mx_register_magic("new", 1, 1, exp_new);
+ mx_register_magic("playing", 0, 1, exp_playing);
+ mx_register_magic("prefs", 2, 2, exp_prefs);
+ mx_register_magic("queue", 1, 1, exp_queue);
+ mx_register_magic("recent", 1, 1, exp_recent);
+ mx_register_magic("right", 1, 3, exp_right);
}
/*
~mdw / disorder / blobdiff