From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 26 Jun 2008 19:40:01 +0000 (+0100)
Subject: New tracks list can no longer contains dupes
X-Git-Tag: 4.1~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/049dec8733c7a5df431c709890a7be00625fc534

New tracks list can no longer contains dupes
---

diff --git a/lib/trackdb.c b/lib/trackdb.c
index b4036f7..718970a 100644
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -2422,13 +2422,17 @@ static char **trackdb_new_tid(int *ntracksp,
   DBT k, d;
   int err = 0;
   struct vector tracks[1];
+  hash *h = hash_new(1);
 
   vector_init(tracks);
   c = trackdb_opencursor(trackdb_noticeddb, tid);
   while((maxtracks <= 0 || tracks->nvec < maxtracks)
         && !(err = c->c_get(c, prepare_data(&k), prepare_data(&d), DB_PREV))) {
-    /* See if the track still exists */
     char *const track = xstrndup(d.data, d.size);
+    /* Don't add any track more than once */
+    if(hash_add(h, track, "", HASH_INSERT))
+      continue;
+    /* See if the track still exists */
     err = trackdb_getdata(trackdb_tracksdb, track, NULL/*kp*/, tid);
     if(err == DB_NOTFOUND)
       continue;                         /* It doesn't, skip it */