disorder-choose rejects tracks in queue/recent list

diff --git a/server/Makefile.am b/server/Makefile.am
index 72dcc3607f25257885cb39e4c196397b9b220597..78497a542b94542dcd89a9c1df87c4b297ffb3dd 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -75,6 +75,7 @@ disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_choose_SOURCES=choose.c                        \
+       server-queue.c server-queue.h                   \
         api.c api-server.c                              \
         exports.c                                      \
        ../lib/memgc.c

diff --git a/server/choose.c b/server/choose.c
index f22bf6fa1878a6583702d2f798c4f24c96f83b36..d5bc52ebe9e63e9ac9d19af700bda8665cf723e3 100644 (file)
--- a/server/choose.c
+++ b/server/choose.c
@@ -53,6 +53,8 @@
 #include "trackdb-int.h"
 #include "version.h"
 #include "trackname.h"
+#include "queue.h"
+#include "server-queue.h"
 
 static DB_TXN *global_tid;
 
@@ -106,6 +108,16 @@ static long ntracks;
 static char **required_tags;
 static char **prohibited_tags;
 
+static int queue_contains(const struct queue_entry *head,
+                          const char *track) {
+  const struct queue_entry *q;
+
+  for(q = head->next; q != head; q = q->next)
+    if(!strcmp(q->track, track))
+      return 1;
+  return 0;
+}
+
 /** @brief Compute the weight of a track
  * @param track Track name (UTF-8)
  * @param data Track data
@@ -145,6 +157,11 @@ static unsigned long compute_weight(const char *track,
       return 0;
   }
 
+  /* Reject tracks currently in the queue or in the recent list */
+  if(queue_contains(&qhead, track)
+     || queue_contains(&phead, track))
+    return 0;
+
   /* We'll need tags for a number of things */
   track_tags = parsetags(kvp_get(prefs, "tags"));
 
@@ -237,6 +254,9 @@ int main(int argc, char **argv) {
     log_default = &log_syslog;
   }
   if(config_read(0)) fatal(0, "cannot read configuration");
+  /* Find out current queue/recent list */
+  queue_read();
+  recent_read();
   /* Generate the candidate track list */
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE|TRACKDB_READ_ONLY);