Merge tag 'branchpoint-5.1' into release

[disorder] / clients / disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index a55a6e8369c78d9a684dca3a69e2f1ddcfabb2f9..7966dbc7eda6a18fd2073397e7d391b01026c8bf 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * 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
  *
  * 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 "vector.h"
 #include "version.h"
 #include "dateparse.h"

-#include "trackdb.h"

 #include "inputline.h"
 
 static disorder_client *client;
 #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' },
   { "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 }
 };
 
   { 0, 0, 0, 0 }
 };
 


@@ -138,8 +136,9 @@ static void cf_playing(char attribute((unused)) **argv) {
 }
 
 static void cf_play(char **argv) {
 }
 
 static void cf_play(char **argv) {

+  char *id;

   while(*argv)
   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) {
 }
 
 static void cf_remove(char **argv) {


@@ -244,7 +243,7 @@ static int isarg_regexp(const char *s) {
 }
 
 static void cf_dirs(char **argv) {
 }
 
 static void cf_dirs(char **argv) {

-  cf_somelist(argv, disorder_directories);
+  cf_somelist(argv, disorder_dirs);

 }
 
 static void cf_files(char **argv) {
 }
 
 static void cf_files(char **argv) {


@@ -316,10 +315,10 @@ static void cf_stats(char attribute((unused)) **argv) {
 }
 
 static void cf_get_volume(char attribute((unused)) **argv) {
 }
 
 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);
 
   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) {
 }
 
 static void cf_set_volume(char **argv) {


@@ -415,7 +414,7 @@ static int isarg_integer(const char *s) {
 static void cf_new(char **argv) {
   char **vec;
 
 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++)));
     exit(EXIT_FAILURE);
   while(*vec)
     xprintf("%s\n", nullcheck(utf82mb(*vec++)));


@@ -504,9 +503,15 @@ static void cf_setup_guest(char **argv) {
     exit(EXIT_FAILURE);
 }
 
     exit(EXIT_FAILURE);
 }
 

+/** @brief A scheduled event read from the server */

 struct scheduled_event {
 struct scheduled_event {

+  /** @brief When event should occur */

   time_t when;
   time_t when;

+
+  /** @brief Details of action */

   struct kvp *actiondata;
   struct kvp *actiondata;

+
+  /** @brief Event ID */

   char *id;
 };
 
   char *id;
 };
 


@@ -580,31 +585,27 @@ static void cf_schedule_del(char **argv) {
 }
 
 static void cf_schedule_play(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) {
     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) {
     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);
 }
 
     exit(EXIT_FAILURE);
 }
 


@@ -672,12 +673,28 @@ static void cf_playlist_set(char **argv) {
     exit(EXIT_FAILURE);
 }
 
     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;
   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 **);
   void (*fn)(char **);

+
+  /** @brief Function to recognize a valid argument, or NULL */

   int (*isarg)(const char *);
   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" },
 } commands[] = {
   { "adduser",        2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]",
                       "Create a new user" },


@@ -825,28 +842,8 @@ static void help_commands(void) {
   exit(0);
 }
 
   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 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;
   int status = 0;
   struct vector args;
   const char *user = 0, *password = 0;


@@ -857,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");
   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();
     switch(n) {
     case 'h': help();
     case 'H': help_commands();


@@ -868,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 '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");
     }
   }
     default: disorder_fatal(0, "invalid option");
     }
   }


@@ -884,8 +880,6 @@ int main(int argc, char **argv) {
   }
   if(local)
     config->connect.af = -1;
   }
   if(local)
     config->connect.af = -1;

-  if(wfr)
-    wait_for_root();

   n = optind;
   optind = 1;                          /* for subsequent getopt calls */
   /* gcrypt initialization */
   n = optind;
   optind = 1;                          /* for subsequent getopt calls */
   /* gcrypt initialization */