disorder-choose now supports everything that the old track picker does.

diff --git a/lib/trackdb-int.h b/lib/trackdb-int.h
index 2528c675e5ac7b9b62ce1049d0b1f9bda0af2d65..ac2d3eae95c7e7630db605011d9341bc51d3707c 100644 (file)
--- a/lib/trackdb-int.h
+++ b/lib/trackdb-int.h
@@ -145,6 +145,9 @@ int trackdb_get_global_tid(const char *name,
                            DB_TXN *tid,
                            const char **rp);
 
                            DB_TXN *tid,
                            const char **rp);
 

+char **parsetags(const char *s);
+int tag_intersection(char **a, char **b);
+

 #endif /* TRACKDB_INT_H */
 
 /*
 #endif /* TRACKDB_INT_H */
 
 /*

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 1b29740f94927d59ab4b52db2bf07eed8f0cb900..ce00d1a23780ae8aab66477772aca4c8cf685129 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -839,7 +839,7 @@ static int tagchar(int c) {
 }
 
 /* Parse and de-dupe a tag list.  If S=0 then assumes "". */
 }
 
 /* Parse and de-dupe a tag list.  If S=0 then assumes "". */

-static char **parsetags(const char *s) {
+char **parsetags(const char *s) {

   const char *t;
   struct vector v;
 
   const char *t;
   struct vector v;
 


@@ -1577,7 +1577,7 @@ int trackdb_listkeys(DB *db, struct vector *v, DB_TXN *tid) {
 }
 
 /* return 1 iff sorted tag lists A and B have at least one member in common */
 }
 
 /* return 1 iff sorted tag lists A and B have at least one member in common */

-static int tag_intersection(char **a, char **b) {
+int tag_intersection(char **a, char **b) {

   int cmp;
 
   /* Same sort of logic as trackdb_set() above */
   int cmp;
 
   /* Same sort of logic as trackdb_set() above */

diff --git a/server/choose.c b/server/choose.c
index fa424ee42066b219d1283d0e5eef06d0eb6c7f5a..f22bf6fa1878a6583702d2f798c4f24c96f83b36 100644 (file)
--- a/server/choose.c
+++ b/server/choose.c
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <string.h>
 #include <fcntl.h>
 #include <syslog.h>

+#include <time.h>

 
 #include "configuration.h"
 #include "log.h"
 
 #include "configuration.h"
 #include "log.h"


@@ -51,6 +52,7 @@
 #include "trackdb.h"
 #include "trackdb-int.h"
 #include "version.h"
 #include "trackdb.h"
 #include "trackdb-int.h"
 #include "version.h"

+#include "trackname.h"

 
 static DB_TXN *global_tid;
 
 
 static DB_TXN *global_tid;
 


@@ -101,6 +103,9 @@ static unsigned long long total_weight;
 /** @brief Count of tracks */
 static long ntracks;
 
 /** @brief Count of tracks */
 static long ntracks;
 

+static char **required_tags;
+static char **prohibited_tags;
+

 /** @brief Compute the weight of a track
  * @param track Track name (UTF-8)
  * @param data Track data
 /** @brief Compute the weight of a track
  * @param track Track name (UTF-8)
  * @param data Track data


@@ -109,16 +114,48 @@ static long ntracks;
  *
  * Tracks to be excluded entirely are given a weight of 0.
  */
  *
  * Tracks to be excluded entirely are given a weight of 0.
  */

-static unsigned long compute_weight(const char attribute((unused)) *track,
-                                    struct kvp attribute((unused)) *data,
+static unsigned long compute_weight(const char *track,
+                                    struct kvp *data,

                                     struct kvp *prefs) {
   const char *s;
                                     struct kvp *prefs) {
   const char *s;

+  char **track_tags;
+  time_t last, now;
+
+  /* Reject tracks not in any collection (race between edit config and
+   * rescan) */
+  if(!find_track_root(track)) {
+    info("found track not in any collection: %s", track);
+    return 0;
+  }

 
 

-  /* Firstly, tracks with random play disabled always have weight 0 and that's
-   * that */
+  /* Reject aliases to avoid giving aliased tracks extra weight */
+  if(kvp_get(data, "_alias_for"))
+    return 0;
+  
+  /* Reject tracks with random play disabled */

   if((s = kvp_get(prefs, "pick_at_random"))
      && !strcmp(s, "0"))
     return 0;
   if((s = kvp_get(prefs, "pick_at_random"))
      && !strcmp(s, "0"))
     return 0;

+
+  /* Reject tracks played within the last 8 hours */
+  if((s = kvp_get(prefs, "played_time"))) {
+    last = atoll(s);
+    now = time(0);
+    if(now < last + 8 * 3600)       /* TODO configurable */
+      return 0;
+  }
+
+  /* We'll need tags for a number of things */
+  track_tags = parsetags(kvp_get(prefs, "tags"));
+
+  /* Reject tracks with prohibited tags */
+  if(prohibited_tags && tag_intersection(track_tags, prohibited_tags))
+    return 0;
+
+  /* Reject tracks that lack required tags */
+  if(*required_tags && !tag_intersection(track_tags, required_tags))
+    return 0;
+

   return 90000;
 }
 
   return 90000;
 }
 


@@ -177,7 +214,8 @@ static void pick_track(void) {
 }
 
 int main(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {

-  int n, logsyslog = !isatty(2);
+  int n, logsyslog = !isatty(2), err;
+  const char *tags;

   
   set_progname(argv);
   mem_init();
   
   set_progname(argv);
   mem_init();


@@ -203,6 +241,12 @@ int main(int argc, char **argv) {
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE|TRACKDB_READ_ONLY);
   global_tid = trackdb_begin_transaction();
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE|TRACKDB_READ_ONLY);
   global_tid = trackdb_begin_transaction();

+  if((err = trackdb_get_global_tid("required-tags", global_tid, &tags)))
+    fatal(0, "error getting required-tags: %s", db_strerror(err));
+  required_tags = parsetags(tags);
+  if((err = trackdb_get_global_tid("prohibited-tags", global_tid, &tags)))
+    fatal(0, "error getting prohibited-tags: %s", db_strerror(err));
+  prohibited_tags = parsetags(tags);

   if(trackdb_scan(0, collect_tracks_callback, 0, global_tid))
     exit(1);
   trackdb_commit_transaction(global_tid);
   if(trackdb_scan(0, collect_tracks_callback, 0, global_tid))
     exit(1);
   trackdb_commit_transaction(global_tid);