Fill in some missing actions

diff --git a/server/actions.c b/server/actions.c
index a504ed54647bf0045d80eb9bdab615574f8fb245..59d6bccfac67b3e147373583ad883f44d2e0a598 100644 (file)
--- a/server/actions.c
+++ b/server/actions.c
@@ -119,6 +119,18 @@ static void act_random_enable(void) {
   redirect(0);
 }
 
   redirect(0);
 }
 

+static void act_pause(void) {
+  if(dcgi_client)
+    disorder_pause(dcgi_client);
+  redirect(0);
+}
+
+static void act_resume(void) {
+  if(dcgi_client)
+    disorder_resume(dcgi_client);
+  redirect(0);
+}
+

 static void act_remove(void) {
   const char *id;
   struct queue_entry *q;
 static void act_remove(void) {
   const char *id;
   struct queue_entry *q;


@@ -150,6 +162,81 @@ static void act_remove(void) {
   redirect(0);
 }
 
   redirect(0);
 }
 

+static void act_move(void) {
+  const char *id, *delta;
+  struct queue_entry *q;
+
+  if(dcgi_client) {
+    if(!(id = cgi_get("id")))
+      error(0, "missing 'id' argument");
+    else if(!(delta = cgi_get("delta")))
+      error(0, "missing 'delta' argument");
+    else if(!(q = dcgi_findtrack(id)))
+      error(0, "unknown queue id %s", id);
+    else switch(q->state) {
+    case playing_random:                /* unplayed randomly chosen track */
+    case playing_unplayed:              /* haven't played this track yet */
+      disorder_move(dcgi_client, id, atol(delta));
+      break;
+    default:
+      error(0, "does not make sense to scratch %s", id);
+      break;
+    }
+  }
+  redirect(0);
+}
+
+static void act_play(void) {
+  const char *track, *dir;
+  char **tracks;
+  int ntracks, n;
+  struct dcgi_entry *e;
+  
+  if(dcgi_client) {
+    if((track = cgi_get("file"))) {
+      disorder_play(dcgi_client, track);
+    } else if((dir = cgi_get("dir"))) {
+      if(disorder_files(dcgi_client, dir, 0, &tracks, &ntracks))
+        ntracks = 0;
+      e = xmalloc(ntracks * sizeof (struct dcgi_entry));
+      for(n = 0; n < ntracks; ++n) {
+        e[n].track = tracks[n];
+        e[n].sort = trackname_transform("track", tracks[n], "sort");
+        e[n].display = trackname_transform("track", tracks[n], "display");
+      }
+      qsort(e, ntracks, sizeof (struct dcgi_entry), dcgi_compare_entry);
+      for(n = 0; n < ntracks; ++n)
+        disorder_play(dcgi_client, e[n].track);
+    }
+  }
+  redirect(0);
+}
+
+static int clamp(int n, int min, int max) {
+  if(n < min)
+    return min;
+  if(n > max)
+    return max;
+  return n;
+}
+
+static void act_volume(void) {
+  const char *l, *r, *d;
+  int nd;
+
+  if(dcgi_client) {
+    if((d = cgi_get("delta"))) {
+      dcgi_lookup(DCGI_VOLUME);
+      nd = clamp(atoi(d), -255, 255);
+      disorder_set_volume(dcgi_client,
+                          clamp(dcgi_volume_left + nd, 0, 255),
+                          clamp(dcgi_volume_right + nd, 0, 255));
+    } else if((l = cgi_get("left")) && (r = cgi_get("right")))
+      disorder_set_volume(dcgi_client, atoi(l), atoi(r));
+  }
+  redirect(0);
+}
+

 /** @brief Table of actions */
 static const struct action {
   /** @brief Action name */
 /** @brief Table of actions */
 static const struct action {
   /** @brief Action name */


@@ -160,10 +247,15 @@ static const struct action {
   { "disable", act_disable },
   { "enable", act_enable },
   { "manage", act_playing },
   { "disable", act_disable },
   { "enable", act_enable },
   { "manage", act_playing },

+  { "move", act_move },
+  { "pause", act_pause },
+  { "play", act_play },

   { "playing", act_playing },
   { "randomdisable", act_random_disable },
   { "randomenable", act_random_enable },
   { "remove", act_remove },
   { "playing", act_playing },
   { "randomdisable", act_random_disable },
   { "randomenable", act_random_enable },
   { "remove", act_remove },

+  { "resume", act_resume },
+  { "volume", act_volume },

 };
 
 /** @brief Check that an action name is valid
 };
 
 /** @brief Check that an action name is valid

diff --git a/server/dcgi.c b/server/dcgi.c
index 20372822ea4f6f3d9f6cd915ff0937f5c4340e6e..c38ee6c1e383d77fd76752434670d13cde8cc09f 100644 (file)
--- a/server/dcgi.c
+++ b/server/dcgi.c
@@ -82,134 +82,6 @@ static void expand_template(dcgi_state *ds, cgi_sink *output,
 
 /* actions ********************************************************************/
 
 
 /* actions ********************************************************************/
 

-static void act_disable(cgi_sink *output,
-                       dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_disable(ds->g->client);
-  redirect(output->sink);
-}
-
-static void act_enable(cgi_sink *output,
-                             dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_enable(ds->g->client);
-  redirect(output->sink);
-}
-
-static void act_random_disable(cgi_sink *output,
-                              dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_random_disable(ds->g->client);
-  redirect(output->sink);
-}
-
-static void act_random_enable(cgi_sink *output,
-                             dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_random_enable(ds->g->client);
-  redirect(output->sink);
-}
-
-static void act_remove(cgi_sink *output,
-                      dcgi_state *ds) {
-  const char *id;
-
-  if(!(id = cgi_get("id"))) fatal(0, "missing id argument");
-  if(ds->g->client)
-    disorder_remove(ds->g->client, id);
-  redirect(output->sink);
-}
-
-static void act_move(cgi_sink *output,
-                    dcgi_state *ds) {
-  const char *id, *delta;
-
-  if(!(id = cgi_get("id"))) fatal(0, "missing id argument");
-  if(!(delta = cgi_get("delta"))) fatal(0, "missing delta argument");
-  if(ds->g->client)
-    disorder_move(ds->g->client, id, atoi(delta));
-  redirect(output->sink);
-}
-
-static void act_scratch(cgi_sink *output,
-                       dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_scratch(ds->g->client, cgi_get("id"));
-  redirect(output->sink);
-}
-
-static void act_play(cgi_sink *output,
-                    dcgi_state *ds) {
-  const char *track, *dir;
-  char **tracks;
-  int ntracks, n;
-  struct entry *e;
-
-  if((track = cgi_get("file"))) {
-    disorder_play(ds->g->client, track);
-  } else if((dir = cgi_get("directory"))) {
-    if(disorder_files(ds->g->client, dir, 0, &tracks, &ntracks)) ntracks = 0;
-    if(ntracks) {
-      e = xmalloc(ntracks * sizeof (struct entry));
-      for(n = 0; n < ntracks; ++n) {
-       e[n].path = tracks[n];
-       e[n].sort = trackname_transform("track", tracks[n], "sort");
-       e[n].display = trackname_transform("track", tracks[n], "display");
-      }
-      qsort(e, ntracks, sizeof (struct entry), compare_entry);
-      for(n = 0; n < ntracks; ++n)
-       disorder_play(ds->g->client, e[n].path);
-    }
-  }
-  /* XXX error handling */
-  redirect(output->sink);
-}
-
-static int clamp(int n, int min, int max) {
-  if(n < min)
-    return min;
-  if(n > max)
-    return max;
-  return n;
-}
-
-static const char *volume_url(void) {
-  char *url;
-  
-  byte_xasprintf(&url, "%s?action=volume", config->url);
-  return url;
-}
-
-static void act_volume(cgi_sink *output, dcgi_state *ds) {
-  const char *l, *r, *d, *back;
-  int nd, changed = 0;;
-
-  if((d = cgi_get("delta"))) {
-    lookups(ds, DC_VOLUME);
-    nd = clamp(atoi(d), -255, 255);
-    disorder_set_volume(ds->g->client,
-                       clamp(ds->g->volume_left + nd, 0, 255),
-                       clamp(ds->g->volume_right + nd, 0, 255));
-    changed = 1;
-  } else if((l = cgi_get("left")) && (r = cgi_get("right"))) {
-    disorder_set_volume(ds->g->client, atoi(l), atoi(r));
-    changed = 1;
-  }
-  if(changed) {
-    /* redirect back to ourselves (but without the volume-changing bits in the
-     * URL) */
-    cgi_header(output->sink, "Location",
-              (back = cgi_get("back")) ? back : volume_url());
-    header_cookie(output->sink);
-    cgi_body(output->sink);
-  } else {
-    cgi_header(output->sink, "Content-Type", "text/html");
-    header_cookie(output->sink);
-    cgi_body(output->sink);
-    expand(output, "volume", ds);
-  }
-}
-

 static void act_prefs_errors(const char *msg,
                             void attribute((unused)) *u) {
   fatal(0, "error splitting parts list: %s", msg);
 static void act_prefs_errors(const char *msg,
                             void attribute((unused)) *u) {
   fatal(0, "error splitting parts list: %s", msg);


@@ -288,20 +160,6 @@ static void act_prefs(cgi_sink *output, dcgi_state *ds) {
   expand(output, "prefs", ds);
 }
 
   expand(output, "prefs", ds);
 }
 

-static void act_pause(cgi_sink *output,
-                     dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_pause(ds->g->client);
-  redirect(output->sink);
-}
-
-static void act_resume(cgi_sink *output,
-                      dcgi_state *ds) {
-  if(ds->g->client)
-    disorder_resume(ds->g->client);
-  redirect(output->sink);
-}
-

 static void act_login(cgi_sink *output,
                      dcgi_state *ds) {
   const char *username, *password, *back;
 static void act_login(cgi_sink *output,
                      dcgi_state *ds) {
   const char *username, *password, *back;

diff --git a/server/disorder-cgi.h b/server/disorder-cgi.h
index b3aa4aaebb180f2834ff5364f24d759e58416b07..93e4e2fe1c5c9e4f8c06f491506d8295c813a3c1 100644 (file)
--- a/server/disorder-cgi.h
+++ b/server/disorder-cgi.h
@@ -60,6 +60,19 @@ extern disorder_client *dcgi_client;
 extern char *dcgi_cookie;
 extern char *dcgi_error_string;
 
 extern char *dcgi_cookie;
 extern char *dcgi_error_string;
 

+/** @brief Entry in a list of tracks or directories */
+struct dcgi_entry {
+  /** @brief Track name */
+  const char *track;
+  /** @brief Sort key */
+  const char *sort;
+  /** @brief Display key */
+  const char *display;
+};
+
+/** @brief Compare two @ref entry objects */
+int dcgi_compare_entry(const void *a, const void *b);
+

 void dcgi_expand(const char *name);
 void dcgi_action(const char *action);
 void dcgi_error(const char *key);
 void dcgi_expand(const char *name);
 void dcgi_action(const char *action);
 void dcgi_error(const char *key);


@@ -81,10 +94,6 @@ char **option_columns(const char *name, int *ncolumns);
 #define DCGI_PLAYING 0x0002
 #define DCGI_RECENT 0x0004
 #define DCGI_VOLUME 0x0008
 #define DCGI_PLAYING 0x0002
 #define DCGI_RECENT 0x0004
 #define DCGI_VOLUME 0x0008

-#if 0
-#define DCGI_DIRS 0x0010
-#define DCGI_FILES 0x0020
-#endif

 #define DCGI_NEW 0x0040
 #define DCGI_RIGHTS 0x0080
 #define DCGI_ENABLED 0x0100
 #define DCGI_NEW 0x0040
 #define DCGI_RIGHTS 0x0080
 #define DCGI_ENABLED 0x0100

diff --git a/server/lookup.c b/server/lookup.c
index 75680e7718a150b83fd930cccb03a15895140f0e..6dc254cdee33c30d96f4c16b8a27409e18f9c737 100644 (file)
--- a/server/lookup.c
+++ b/server/lookup.c
@@ -57,9 +57,6 @@ static void queuemap_add(struct queue_entry *q) {
 void dcgi_lookup(unsigned want) {
   unsigned need = want ^ (flags & want);
   struct queue_entry *r, *rnext;
 void dcgi_lookup(unsigned want) {
   unsigned need = want ^ (flags & want);
   struct queue_entry *r, *rnext;

-#if 0
-  const char *dir, *re;
-#endif

   char *rs;
 
   if(!dcgi_client || !need)
   char *rs;
 
   if(!dcgi_client || !need)


@@ -88,22 +85,6 @@ void dcgi_lookup(unsigned want) {
   if(need & DCGI_VOLUME)
     disorder_get_volume(dcgi_client,
                         &dcgi_volume_left, &dcgi_volume_right);
   if(need & DCGI_VOLUME)
     disorder_get_volume(dcgi_client,
                         &dcgi_volume_left, &dcgi_volume_right);

-#if 0
-  /* DCGI_FILES and DCGI_DIRS are looking obsolete now */
-  if(need & (DCGI_FILES|DCGI_DIRS)) {
-    if(!(dir = cgi_get("directory")))
-      dir = "";
-    re = cgi_get("regexp");
-    if(need & DCGI_DIRS)
-      if(disorder_directories(dcgi_client, dir, re,
-                              &dirs, &ndirs))
-        ndirs = 0;
-    if(need & DCGI_FILES)
-      if(disorder_files(dcgi_client, dir, re,
-                        &files, &nfiles))
-        nfiles = 0;
-  }
-#endif

   if(need & DCGI_RIGHTS) {
     dcgi_rights = RIGHT_READ;  /* fail-safe */
     if(!disorder_userinfo(dcgi_client, disorder_user(dcgi_client),
   if(need & DCGI_RIGHTS) {
     dcgi_rights = RIGHT_READ;  /* fail-safe */
     if(!disorder_userinfo(dcgi_client, disorder_user(dcgi_client),

diff --git a/server/macros-disorder.c b/server/macros-disorder.c
index cec504c93340b681ed18088f6431222dc3b6283c..a08f0ed767a77ff34c0f2f99d43362da318e44a8 100644 (file)
--- a/server/macros-disorder.c
+++ b/server/macros-disorder.c
@@ -810,19 +810,9 @@ static int exp_image(int attribute((unused)) nargs,
   return sink_writes(output, cgi_sgmlquote(url)) < 0 ? -1 : 0;
 }
 
   return sink_writes(output, cgi_sgmlquote(url)) < 0 ? -1 : 0;
 }
 

-/** @brief Entry in a list of tracks or directories */
-struct entry {
-  /** @brief Track name */
-  const char *track;
-  /** @brief Sort key */
-  const char *sort;
-  /** @brief Display key */
-  const char *display;
-};
-

 /** @brief Compare two @ref entry objects */
 /** @brief Compare two @ref entry objects */

-static int compare_entry(const void *a, const void *b) {
-  const struct entry *ea = a, *eb = b;
+int dcgi_compare_entry(const void *a, const void *b) {
+  const struct dcgi_entry *ea = a, *eb = b;

 
   return compare_tracks(ea->sort, eb->sort,
                        ea->display, eb->display,
 
   return compare_tracks(ea->sort, eb->sort,
                        ea->display, eb->display,


@@ -843,7 +833,7 @@ static int exp__files_dirs(int nargs,
   char **tracks, *dir, *re;
   int n, ntracks, rc;
   const struct mx_node *m;
   char **tracks, *dir, *re;
   int n, ntracks, rc;
   const struct mx_node *m;

-  struct entry *e;
+  struct dcgi_entry *e;

 
   if((rc = mx_expandstr(args[0], &dir, u, "argument #0 (DIR)")))
     return rc;
 
   if((rc = mx_expandstr(args[0], &dir, u, "argument #0 (DIR)")))
     return rc;


@@ -868,7 +858,7 @@ static int exp__files_dirs(int nargs,
     e[n].sort = trackname_transform(type, tracks[n], "sort");
     e[n].display = trackname_transform(type, tracks[n], "display");
   }
     e[n].sort = trackname_transform(type, tracks[n], "sort");
     e[n].display = trackname_transform(type, tracks[n], "display");
   }

-  qsort(e, ntracks, sizeof (struct entry), compare_entry);
+  qsort(e, ntracks, sizeof (struct dcgi_entry), dcgi_compare_entry);

   /* Expand the subsiduary templates.  We chuck in @sort and @display because
    * it is particularly easy to do so. */
   for(n = 0; n < ntracks; ++n)
   /* Expand the subsiduary templates.  We chuck in @sort and @display because
    * it is particularly easy to do so. */
   for(n = 0; n < ntracks; ++n)