X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/132a5a4a47f9dbc7c52ee15234d70258c59ccf8e..19007e89957054b4af8667f85c0ec8d95f2001d6:/clients/disorder.c diff --git a/clients/disorder.c b/clients/disorder.c index 6ac27bc..48bef78 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include "configuration.h" #include "syscalls.h" @@ -50,6 +52,8 @@ #include "vector.h" #include "version.h" #include "dateparse.h" +#include "trackdb.h" +#include "inputline.h" static disorder_client *client; @@ -63,6 +67,7 @@ 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 } }; @@ -99,8 +104,17 @@ static void cf_version(char attribute((unused)) **argv) { static void print_queue_entry(const struct queue_entry *q) { if(q->track) xprintf("track %s\n", nullcheck(utf82mb(q->track))); if(q->id) xprintf(" id %s\n", nullcheck(utf82mb(q->id))); - if(q->submitter) xprintf(" submitted by %s at %s", - nullcheck(utf82mb(q->submitter)), ctime(&q->when)); + switch(q->origin) { + case origin_adopted: + case origin_picked: + case origin_scheduled: + xprintf(" %s by %s at %s", + track_origins[q->origin], + nullcheck(utf82mb(q->submitter)), ctime(&q->when)); + break; + default: + break; + } if(q->played) xprintf(" played at %s", ctime(&q->played)); if(q->state == playing_started || q->state == playing_paused) xprintf(" %lds so far", q->sofar); @@ -148,7 +162,7 @@ static void cf_shutdown(char attribute((unused)) **argv) { static void cf_reconfigure(char attribute((unused)) **argv) { /* Re-check configuration for server */ - if(config_read(1)) fatal(0, "cannot read configuration"); + if(config_read(1, NULL)) fatal(0, "cannot read configuration"); if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE); } @@ -176,15 +190,34 @@ static void cf_queue(char attribute((unused)) **argv) { } static void cf_quack(char attribute((unused)) **argv) { - xprintf("\n" - " .------------------.\n" - " | Naath is a babe! |\n" - " `---------+--------'\n" - " \\\n" - " >0\n" - " (<)'\n" - "~~~~~~~~~~~~~~~~~~~~~~\n" - "\n"); + if(!strcasecmp(nl_langinfo(CODESET), "utf-8")) { +#define TL "\xE2\x95\xAD" +#define TR "\xE2\x95\xAE" +#define BR "\xE2\x95\xAF" +#define BL "\xE2\x95\xB0" +#define H "\xE2\x94\x80" +#define V "\xE2\x94\x82" +#define T "\xE2\x94\xAC" + xprintf("\n" + " "TL H H H H H H H H H H H H H H H H H H TR"\n" + " "V" Naath is a babe! "V"\n" + " "BL H H H H H H H H H T H H H H H H H H BR"\n" + " \\\n" + " >0\n" + " (<)'\n" + "~~~~~~~~~~~~~~~~~~~~~~\n" + "\n"); + } else { + xprintf("\n" + " .------------------.\n" + " | Naath is a babe! |\n" + " `---------+--------'\n" + " \\\n" + " >0\n" + " (<)'\n" + "~~~~~~~~~~~~~~~~~~~~~~\n" + "\n"); + } } static void cf_somelist(char **argv, @@ -568,6 +601,66 @@ static void cf_schedule_unset_global(char **argv) { exit(EXIT_FAILURE); } +static void cf_adopt(char **argv) { + if(disorder_adopt(getclient(), argv[0])) + exit(EXIT_FAILURE); +} + +static void cf_playlists(char attribute((unused)) **argv) { + char **vec; + + if(disorder_playlists(getclient(), &vec, 0)) + exit(EXIT_FAILURE); + while(*vec) + xprintf("%s\n", nullcheck(utf82mb(*vec++))); +} + +static void cf_playlist_del(char **argv) { + if(disorder_playlist_delete(getclient(), argv[0])) + exit(EXIT_FAILURE); +} + +static void cf_playlist_get(char **argv) { + char **vec; + + if(disorder_playlist_get(getclient(), argv[0], &vec, 0)) + exit(EXIT_FAILURE); + while(*vec) + xprintf("%s\n", nullcheck(utf82mb(*vec++))); +} + +static void cf_playlist_set(char **argv) { + struct vector v[1]; + FILE *input; + const char *tag; + char *l; + + if(argv[1]) { + // Read track list from file + if(!(input = fopen(argv[1], "r"))) + fatal(errno, "opening %s", argv[1]); + tag = argv[1]; + } else { + // Read track list from standard input + input = stdin; + tag = "stdin"; + } + vector_init(v); + while(!inputline(tag, input, &l, '\n')) { + if(!strcmp(l, ".")) + break; + vector_append(v, l); + } + if(ferror(input)) + fatal(errno, "reading %s", tag); + if(input != stdin) + fclose(input); + if(disorder_playlist_lock(getclient(), argv[0]) + || disorder_playlist_set(getclient(), argv[0], v->vec, v->nvec) + || disorder_playlist_unlock(getclient())) + exit(EXIT_FAILURE); +} + static const struct command { const char *name; int min, max; @@ -577,6 +670,8 @@ static const struct command { } commands[] = { { "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]", "Create a new user" }, + { "adopt", 1, 1, cf_adopt, 0, "ID", + "Adopt a randomly picked track" }, { "allfiles", 1, 2, cf_allfiles, isarg_regexp, "DIR [~REGEXP]", "List all files and directories in DIR" }, { "authorize", 1, 2, cf_authorize, isarg_rights, "USERNAME [RIGHTS]", @@ -619,6 +714,14 @@ static const struct command { "Add TRACKS to the end of the queue" }, { "playing", 0, 0, cf_playing, 0, "", "Report the playing track" }, + { "playlist-del", 1, 1, cf_playlist_del, 0, "PLAYLIST", + "Delete a playlist" }, + { "playlist-get", 1, 1, cf_playlist_get, 0, "PLAYLIST", + "Get the contents of a playlist" }, + { "playlist-set", 1, 2, cf_playlist_set, isarg_filename, "PLAYLIST [PATH]", + "Set the contents of a playlist" }, + { "playlists", 0, 0, cf_playlists, 0, "", + "List playlists" }, { "prefs", 1, 1, cf_prefs, 0, "TRACK", "Display all the preferences for TRACK" }, { "quack", 0, 0, cf_quack, 0, 0, 0 }, @@ -711,8 +814,28 @@ static void help_commands(void) { exit(0); } +static void wait_for_root(void) { + const char *password; + + while(!trackdb_readable()) { + 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; + 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; + int n, i, j, local = 0, wfr = 0; int status = 0; struct vector args; const char *user = 0, *password = 0; @@ -723,7 +846,7 @@ int main(int argc, char **argv) { pcre_free = xfree; if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) { + while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) { switch(n) { case 'h': help(); case 'H': help_commands(); @@ -734,10 +857,11 @@ 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: fatal(0, "invalid option"); } } - if(config_read(0)) fatal(0, "cannot read configuration"); + if(config_read(0, NULL)) fatal(0, "cannot read configuration"); if(user) { config->username = user; config->password = 0; @@ -745,9 +869,16 @@ int main(int argc, char **argv) { if(password) config->password = password; if(local) - config->connect.n = 0; + config->connect.af = -1; + if(wfr) + wait_for_root(); n = optind; optind = 1; /* for subsequent getopt calls */ + /* gcrypt initialization */ + if(!gcry_check_version(NULL)) + disorder_fatal(0, "gcry_check_version failed"); + gcry_control(GCRYCTL_INIT_SECMEM, 0); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); /* accumulate command args */ while(n < argc) { if((i = TABLE_FIND(commands, name, argv[n])) < 0)