X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0d047a120ff50d000dce22d7cc8b141a24ce8de9..refs/tags/5.1:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 5f5ee4d..7966dbc 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2009 Richard Kettlewell + * Copyright (C) 2004-2012 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 @@ -52,7 +52,6 @@ #include "vector.h" #include "version.h" #include "dateparse.h" -#include "trackdb.h" #include "inputline.h" static disorder_client *client; @@ -67,7 +66,6 @@ static const struct option options[] = { { "help-commands", no_argument, 0, 'H' }, { "user", required_argument, 0, 'u' }, { "password", required_argument, 0, 'p' }, - { "wait-for-root", no_argument, 0, 'W' }, { 0, 0, 0, 0 } }; @@ -138,8 +136,9 @@ static void cf_playing(char attribute((unused)) **argv) { } static void cf_play(char **argv) { + char *id; while(*argv) - if(disorder_play(getclient(), *argv++)) exit(EXIT_FAILURE); + if(disorder_play(getclient(), *argv++, &id)) exit(EXIT_FAILURE); } static void cf_remove(char **argv) { @@ -244,7 +243,7 @@ static int isarg_regexp(const char *s) { } static void cf_dirs(char **argv) { - cf_somelist(argv, disorder_directories); + cf_somelist(argv, disorder_dirs); } static void cf_files(char **argv) { @@ -294,6 +293,7 @@ static void cf_search(char **argv) { if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE); for(n = 0; n < nresults; ++n) xprintf("%s\n", nullcheck(utf82mb(results[n]))); + free_strings(nresults, results); } static void cf_random_disable(char attribute((unused)) **argv) { @@ -306,17 +306,19 @@ static void cf_random_enable(char attribute((unused)) **argv) { static void cf_stats(char attribute((unused)) **argv) { char **vec; + int nvec; - if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE); + for(int n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } static void cf_get_volume(char attribute((unused)) **argv) { - int l, r; + long l, r; if(disorder_get_volume(getclient(), &l, &r)) exit(EXIT_FAILURE); - xprintf("%d %d\n", l, r); + xprintf("%ld %ld\n", l, r); } static void cf_set_volume(char **argv) { @@ -341,7 +343,7 @@ static void cf_move(char **argv) { static void cf_part(char **argv) { char *s; - if(disorder_part(getclient(), &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE); + if(disorder_part(getclient(), argv[0], argv[1], argv[2], &s)) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb_f(s))); } @@ -356,7 +358,7 @@ static void cf_authorize(char **argv) { static void cf_resolve(char **argv) { char *track; - if(disorder_resolve(getclient(), &track, argv[0])) exit(EXIT_FAILURE); + if(disorder_resolve(getclient(), argv[0], &track)) exit(EXIT_FAILURE); xprintf("%s\n", nullcheck(utf82mb_f(track))); } @@ -412,7 +414,7 @@ static int isarg_integer(const char *s) { static void cf_new(char **argv) { char **vec; - if(disorder_new_tracks(getclient(), &vec, 0, argv[0] ? atoi(argv[0]) : 0)) + if(disorder_new_tracks(getclient(), argv[0] ? atol(argv[0]) : 0, &vec, 0)) exit(EXIT_FAILURE); while(*vec) xprintf("%s\n", nullcheck(utf82mb(*vec++))); @@ -501,9 +503,15 @@ static void cf_setup_guest(char **argv) { exit(EXIT_FAILURE); } +/** @brief A scheduled event read from the server */ struct scheduled_event { + /** @brief When event should occur */ time_t when; + + /** @brief Details of action */ struct kvp *actiondata; + + /** @brief Event ID */ char *id; }; @@ -577,31 +585,27 @@ static void cf_schedule_del(char **argv) { } static void cf_schedule_play(char **argv) { - if(disorder_schedule_add(getclient(), - dateparse(argv[0]), - argv[1], - "play", - argv[2])) + if(disorder_schedule_add_play(getclient(), + dateparse(argv[0]), + argv[1], + argv[2])) exit(EXIT_FAILURE); } static void cf_schedule_set_global(char **argv) { - if(disorder_schedule_add(getclient(), - dateparse(argv[0]), - argv[1], - "set-global", - argv[2], - argv[3])) + if(disorder_schedule_add_set_global(getclient(), + dateparse(argv[0]), + argv[1], + argv[2], + argv[3])) exit(EXIT_FAILURE); } static void cf_schedule_unset_global(char **argv) { - if(disorder_schedule_add(getclient(), - dateparse(argv[0]), - argv[1], - "set-global", - argv[2], - (char *)0)) + if(disorder_schedule_add_unset_global(getclient(), + dateparse(argv[0]), + argv[1], + argv[2])) exit(EXIT_FAILURE); } @@ -612,11 +616,13 @@ static void cf_adopt(char **argv) { static void cf_playlists(char attribute((unused)) **argv) { char **vec; + int nvec; - if(disorder_playlists(getclient(), &vec, 0)) + if(disorder_playlists(getclient(), &vec, &nvec)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + for(int n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } static void cf_playlist_del(char **argv) { @@ -626,11 +632,13 @@ static void cf_playlist_del(char **argv) { static void cf_playlist_get(char **argv) { char **vec; + int nvec; - if(disorder_playlist_get(getclient(), argv[0], &vec, 0)) + if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec)) exit(EXIT_FAILURE); - while(*vec) - xprintf("%s\n", nullcheck(utf82mb(*vec++))); + for(int n = 0; n < nvec; ++n) + xprintf("%s\n", nullcheck(utf82mb(vec[n]))); + free_strings(nvec, vec); } static void cf_playlist_set(char **argv) { @@ -665,12 +673,28 @@ static void cf_playlist_set(char **argv) { exit(EXIT_FAILURE); } -static const struct command { +/** @brief Command-line client's definition of a command */ +static const struct client_command { + /** @brief Command name */ const char *name; - int min, max; + + /** @brief Minimum number of argument */ + int min; + + /** @brief Maximum number of argument */ + int max; + + /** @brief Pointer to function implementing command */ void (*fn)(char **); + + /** @brief Function to recognize a valid argument, or NULL */ int (*isarg)(const char *); - const char *argstr, *desc; + + /** @brief Summary of arguments */ + const char *argstr; + + /** @brief Description */ + const char *desc; } commands[] = { { "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]", "Create a new user" }, @@ -818,28 +842,8 @@ static void help_commands(void) { exit(0); } -static void wait_for_root(void) { - const char *password; - - while(!trackdb_readable()) { - disorder_info("waiting for trackdb..."); - sleep(1); - } - trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE); - for(;;) { - trackdb_open(TRACKDB_READ_ONLY); - password = trackdb_get_password("root"); - trackdb_close(); - if(password) - break; - disorder_info("waiting for root user to be created..."); - sleep(1); - } - trackdb_deinit(NULL); -} - int main(int argc, char **argv) { - int n, i, j, local = 0, wfr = 0; + int n, i, j, local = 0; int status = 0; struct vector args; const char *user = 0, *password = 0; @@ -850,7 +854,7 @@ int main(int argc, char **argv) { pcre_free = xfree; if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale"); if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) { + while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); @@ -861,7 +865,6 @@ int main(int argc, char **argv) { case 'N': config_per_user = 0; break; case 'u': user = optarg; break; case 'p': password = optarg; break; - case 'W': wfr = 1; break; default: disorder_fatal(0, "invalid option"); } } @@ -877,8 +880,6 @@ int main(int argc, char **argv) { } if(local) config->connect.af = -1; - if(wfr) - wait_for_root(); n = optind; optind = 1; /* for subsequent getopt calls */ /* gcrypt initialization */