X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/448d3570a4b73f0056c4bb61c5d80e4778a5e0bd..3d7dbffd65f31f6a3f235045180bc0fbc4dc3a18:/server/actions.c

diff --git a/server/actions.c b/server/actions.c
index 2fa3f8a..c0a8cb4 100644
--- a/server/actions.c
+++ b/server/actions.c
@@ -17,15 +17,35 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+/** @file server/actions.c
+ * @brief DisOrder web actions
+ *
+ * Actions are anything that the web interface does beyond passive template
+ * expansion and inspection of state recieved from the server.  This means
+ * playing tracks, editing prefs etc but also setting extra headers e.g. to
+ * auto-refresh the playing list.
+ */
 
-#include <config.h>
-#include "types.h"
-
-#include "actions.h"
-#include "lookups.h"
+#include "disorder-cgi.h"
 
-/** @brief Login cookie */
-char *login_cookie;
+/** @brief Redirect to some other action or URL */
+static void redirect(const char *url) {
+  /* By default use the 'back' argument */
+  if(!url)
+    url = cgi_get("back");
+  if(url) {
+    if(!strncmp(url, "http", 4))
+      /* If the target is not a full URL assume it's the action */
+      url = cgi_makeurl(config->url, "action", url, (char *)0);
+  } else {
+    /* If back= is not set just go back to the front page */
+    url = config->url;
+  }
+  if(printf("Location: %s\n"
+            "%s\n"
+            "\n", url, dcgi_cookie_header()) < 0)
+    fatal(errno, "error writing to stdout");
+}
 
 /* 'playing' and 'manage' just add a Refresh: header */
 static void act_playing(void) {
@@ -33,29 +53,30 @@ static void act_playing(void) {
   long length;
   time_t now, fin;
   char *url;
+  const char *action;
 
-  lookups(DC_PLAYING|DC_QUEUE|DC_ENABLED|DC_RANDOM_ENABLED);
-  if(playing
-     && playing->state == playing_started /* i.e. not paused */
-     && !disorder_length(client, playing->track, &length)
+  dcgi_lookup(DCGI_PLAYING|DCGI_QUEUE|DCGI_ENABLED|DCGI_RANDOM_ENABLED);
+  if(dcgi_playing
+     && dcgi_playing->state == playing_started /* i.e. not paused */
+     && !disorder_length(dcgi_client, dcgi_playing->track, &length)
      && length
-     && playing->sofar >= 0) {
+     && dcgi_playing->sofar >= 0) {
     /* Try to put the next refresh at the start of the next track. */
     time(&now);
-    fin = now + length - playing->sofar + config->gap;
+    fin = now + length - dcgi_playing->sofar + config->gap;
     if(now + refresh > fin)
       refresh = fin - now;
   }
-  if(queue && queue->state == playing_isscratch) {
+  if(dcgi_queue && dcgi_queue->state == playing_isscratch) {
     /* next track is a scratch, don't leave more than the inter-track gap */
     if(refresh > config->gap)
       refresh = config->gap;
   }
-  if(!playing
-     && ((queue
-          && queue->state != playing_random)
-         || random_enabled)
-     && enabled) {
+  if(!dcgi_playing
+     && ((dcgi_queue
+          && dcgi_queue->state != playing_random)
+         || dcgi_random_enabled)
+     && dcgi_enabled) {
     /* no track playing but playing is enabled and there is something coming
      * up, must be in a gap */
     if(refresh > config->gap)
@@ -67,11 +88,66 @@ static void act_playing(void) {
     url = config->url;
   if(printf("Content-Type: text/html\n"
             "Refresh: %ld;url=%s\n"
-            /* TODO cookie */
+            "%s\n"
             "\n",
-            refresh, url) < 0)
+            refresh, url, dcgi_cookie_header()) < 0)
     fatal(errno, "error writing to stdout");
-  disorder_cgi_expand(action ? action : "playing");
+  dcgi_expand("playing");
+}
+
+static void act_disable(void) {
+  if(dcgi_client)
+    disorder_disable(dcgi_client);
+  redirect(0);
+}
+
+static void act_enable(void) {
+  if(dcgi_client)
+    disorder_enable(dcgi_client);
+  redirect(0);
+}
+
+static void act_random_disable(void) {
+  if(dcgi_client)
+    disorder_random_disable(dcgi_client);
+  redirect(0);
+}
+
+static void act_random_enable(void) {
+  if(dcgi_client)
+    disorder_random_enable(dcgi_client);
+  redirect(0);
+}
+
+static void act_remove(void) {
+  const char *id;
+  struct queue_entry *q;
+
+  if(dcgi_client) {
+    if(!(id = cgi_get("id")))
+      error(0, "missing 'id' argument");
+    else if(!(q = dcgi_findtrack(id)))
+      error(0, "unknown queue id %s", id);
+    else switch(q->state) {
+    case playing_isscratch:
+    case playing_failed:
+    case playing_no_player:
+    case playing_ok:
+    case playing_quitting:
+    case playing_scratched:
+      error(0, "does not make sense to scratch %s", id);
+      break;
+    case playing_paused:                /* started but paused */
+    case playing_started:               /* started to play */
+      disorder_scratch(dcgi_client, id);
+      break;
+    case playing_random:                /* unplayed randomly chosen track */
+    case playing_unplayed:              /* haven't played this track yet */
+      disorder_remove(dcgi_client, id);
+      break;
+    }
+  }
+  redirect(0);
 }
 
 /** @brief Table of actions */
@@ -81,41 +157,30 @@ static const struct action {
   /** @brief Action handler */
   void (*handler)(void);
 } actions[] = {
-  { "confirm", act_confirm },
   { "disable", act_disable },
-  { "edituser", act_edituser },
   { "enable", act_enable },
-  { "login", act_login },
-  { "logout", act_logout },
   { "manage", act_playing },
-  { "move", act_move },
-  { "pause", act_pause },
-  { "play", act_play },
   { "playing", act_playing },
-  { "prefs", act_prefs },
-  { "random-disable", act_random_disable },
-  { "random-enable", act_random_enable },
-  { "register", act_register },
-  { "reminder", act_reminder },
+  { "randomdisable", act_random_disable },
+  { "randomenable", act_random_enable },
   { "remove", act_remove },
-  { "resume", act_resume },
-  { "scratch", act_scratch },
-  { "volume", act_volume },
 };
 
 /** @brief Expand a template
  * @param name Base name of template, or NULL to consult CGI args
  */
-void disorder_cgi_expand(const char *name) {
+void dcgi_expand(const char *name) {
   const char *p;
-  
+
+  /* Parse macros first */
+  mx_expand_file("macros.tmpl", sink_discard(), 0);
   /* For unknown actions check that they aren't evil */
   for(p = name; *p && isalnum((unsigned char)*p); ++p)
     ;
   if(*p)
-    fatal(0, "invalid action name '%s'", action);
-  byte_xasprintf((char **)&p, "%s.tmpl", action);
-  if(mx_expand_file(p, sink_stdio(stdout), 0) == -1
+    fatal(0, "invalid action name '%s'", name);
+  byte_xasprintf((char **)&p, "%s.tmpl", name);
+  if(mx_expand_file(p, sink_stdio("stdout", stdout), 0) == -1
      || fflush(stdout) < 0)
     fatal(errno, "error writing to stdout");
 }
@@ -125,9 +190,8 @@ void disorder_cgi_expand(const char *name) {
  *
  * If no recognized action is specified then 'playing' is assumed.
  */
-void disorder_cgi_action(const char *action) {
+void dcgi_action(const char *action) {
   int n;
-  char *s;
 
   /* Consult CGI args if caller had no view */
   if(!action)
@@ -141,6 +205,8 @@ void disorder_cgi_action(const char *action) {
       action = "confirm";
     else
       action = "playing";
+    /* Make sure 'action' is always set */
+    cgi_set("action", action);
   }
   if((n = TABLE_FIND(actions, struct action, name, action)) >= 0)
     /* Its a known action */
@@ -148,35 +214,17 @@ void disorder_cgi_action(const char *action) {
   else {
     /* Just expand the template */
     if(printf("Content-Type: text/html\n"
-              /* TODO cookie */
-              "\n") < 0)
+              "%s\n"
+              "\n", dcgi_cookie_header()) < 0)
       fatal(errno, "error writing to stdout");
-    disorder_cgi_expand(action);
+    dcgi_expand(action);
   }
 }
 
 /** @brief Generate an error page */
-void disorder_cgi_error(const char *msg, ...) {
-  va_list ap;
-
-  va_start(ap, msg);
-  byte_xvasprintf(&error_string, msg, ap);
-  va_end(ap);
-  disorder_cgi_expand("error");
-}
-
-/** @brief Log in as the current user or guest if none */
-void disorder_cgi_login(dcgi_state *ds, struct sink *output) {
-  /* Junk old data */
-  disorder_macros_reset();
-  /* Reconnect */
-  if(disorder_connect_cookie(client, login_cookie)) {
-    disorder_cgi_error("Cannot connect to server");
-    exit(0);
-  }
-  /* If there was a cookie but it went bad, we forget it */
-  if(login_cookie && !strcmp(disorder_user(>client), "guest"))
-    login_cookie = 0;
+void dcgi_error(const char *key) {
+  dcgi_error_string = xstrdup(key);
+  dcgi_expand("error");
 }
 
 /*