X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e9e8a16d359c900f114853eb0e407a8064e4350c..319d7107dfbed2e6248f61ad463fa6ac55ebe178:/lib/client.c diff --git a/lib/client.c b/lib/client.c index ccbdf6d..ba1477a 100644 --- a/lib/client.c +++ b/lib/client.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,24 +24,19 @@ * implementation. */ -#include -#include "types.h" +#include "common.h" #include #include #include #include -#include -#include #include #include #include -#include #include #include "log.h" #include "mem.h" -#include "configuration.h" #include "queue.h" #include "client.h" #include "charset.h" @@ -58,6 +53,7 @@ #include "client-common.h" #include "rights.h" #include "trackdb.h" +#include "kvp.h" /** @brief Client handle contents */ struct disorder_client { @@ -251,6 +247,7 @@ static int dequote(int rc, char **rp) { } /** @brief Generic connection routine + * @param conf Configuration to follow * @param c Client * @param username Username to log in with or NULL * @param password Password to log in with or NULL @@ -261,10 +258,11 @@ static int dequote(int rc, char **rp) { * username must not be. If @p username is not NULL then nor may @p * password be. */ -static int disorder_connect_generic(disorder_client *c, - const char *username, - const char *password, - const char *cookie) { +int disorder_connect_generic(struct config *conf, + disorder_client *c, + const char *username, + const char *password, + const char *cookie) { int fd = -1, fd2 = -1, nrvec, rc; unsigned char *nonce; size_t nl; @@ -274,7 +272,7 @@ static int disorder_connect_generic(disorder_client *c, struct sockaddr *sa; socklen_t salen; - if((salen = find_server(&sa, &c->ident)) == (socklen_t)-1) + if((salen = find_server(conf, &sa, &c->ident)) == (socklen_t)-1) return -1; c->fpin = c->fpout = 0; if((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) { @@ -366,7 +364,8 @@ error_rc: int disorder_connect_user(disorder_client *c, const char *username, const char *password) { - return disorder_connect_generic(c, + return disorder_connect_generic(config, + c, username, password, 0); @@ -389,9 +388,8 @@ int disorder_connect(disorder_client *c) { return -1; } password = config->password; - if(!password) { - /* Maybe we can read the database */ - /* TODO failure to open the database should not be fatal */ + /* Maybe we can read the database */ + if(!password && trackdb_readable()) { trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE); trackdb_open(TRACKDB_READ_ONLY); password = trackdb_get_password(username); @@ -403,7 +401,8 @@ int disorder_connect(disorder_client *c) { error(0, "no password configured"); return -1; } - return disorder_connect_generic(c, + return disorder_connect_generic(config, + c, username, password, 0); @@ -420,7 +419,8 @@ int disorder_connect(disorder_client *c) { */ int disorder_connect_cookie(disorder_client *c, const char *cookie) { - return disorder_connect_generic(c, + return disorder_connect_generic(config, + c, "guest", "", cookie); @@ -1216,6 +1216,94 @@ int disorder_reminder(disorder_client *c, const char *user) { return disorder_simple(c, 0, "reminder", user, (char *)0); } +/** @brief List scheduled events + * @param c Client + * @param idsp Where to put list of event IDs + * @param nidsp Where to put count of event IDs, or NULL + * @return 0 on success, non-0 on error + */ +int disorder_schedule_list(disorder_client *c, char ***idsp, int *nidsp) { + return disorder_simple_list(c, idsp, nidsp, "schedule-list", (char *)0); +} + +/** @brief Delete a scheduled event + * @param c Client + * @param id Event ID to delete + * @return 0 on success, non-0 on error + */ +int disorder_schedule_del(disorder_client *c, const char *id) { + return disorder_simple(c, 0, "schedule-del", id, (char *)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))) { + error(0, "invalid schedule-get reply: cannot split line"); + return -1; + } + if(nbits != 2) { + 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 + * @param priority Event priority ("normal" or "junk") + * @param action What action to perform + * @param ... Action-specific arguments + * @return 0 on success, non-0 on error + * + * For action @c "play" the next argument is the track. + * + * For action @c "set-global" next argument is the global preference name + * and the final argument the value to set it to, or (char *)0 to unset it. + */ +int disorder_schedule_add(disorder_client *c, + time_t when, + const char *priority, + const char *action, + ...) { + va_list ap; + char when_str[64]; + int rc; + + snprintf(when_str, sizeof when_str, "%lld", (long long)when); + va_start(ap, action); + if(!strcmp(action, "play")) + rc = disorder_simple(c, 0, "schedule-add", when_str, priority, + action, va_arg(ap, char *), + (char *)0); + else if(!strcmp(action, "set-global")) { + const char *key = va_arg(ap, char *); + const char *value = va_arg(ap, char *); + rc = disorder_simple(c, 0,"schedule-add", when_str, priority, + action, key, value, + (char *)0); + } else + fatal(0, "unknown action '%s'", action); + va_end(ap); + return rc; +} + /* Local Variables: c-basic-offset:2