queue() now uses the resolved name if available. This is looked up in

the usual lookup.c way, so it raises a lookup-completed event on
completion and therefore causes the choose screen to be updated using
the correct name for the track.

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 33cd9ad4ecd7d3930dc787ae6ce328748a52d370..f709a27fb31e4cbfb269fb54f1ea1df6525cf0fb 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -216,6 +216,7 @@ const char *namepart(const char *track,
                      const char *context,
                      const char *part);
 long namepart_length(const char *track);
                      const char *context,
                      const char *part);
 long namepart_length(const char *track);

+char *namepart_resolve(const char *track);

 
 void namepart_update(const char *track,
                      const char *context,
 
 void namepart_update(const char *track,
                      const char *context,

diff --git a/disobedience/lookup.c b/disobedience/lookup.c
index 2052b30743483db5eca694a6f122533538ac080f..51c06bfbe1ee899761dea928ac1f20d43ad7a494 100644 (file)
--- a/disobedience/lookup.c
+++ b/disobedience/lookup.c
@@ -71,7 +71,6 @@ static void namepart_fill(const char *track,
                           const char *part,
                           const char *key) {
   D(("namepart_fill %s %s %s %s", track, context, part, key));
                           const char *part,
                           const char *key) {
   D(("namepart_fill %s %s %s %s", track, context, part, key));

-  /* We limit the total number of lookups in flight */

   ++namepart_lookups_outstanding;
   D(("namepart_lookups_outstanding -> %d\n", namepart_lookups_outstanding));
   disorder_eclient_namepart(client, namepart_completed,
   ++namepart_lookups_outstanding;
   D(("namepart_lookups_outstanding -> %d\n", namepart_lookups_outstanding));
   disorder_eclient_namepart(client, namepart_completed,


@@ -137,6 +136,25 @@ long namepart_length(const char *track) {
   return -1;
 }
 
   return -1;
 }
 

+/** @brief Resolve a track name
+ *
+ * Returns the supplied track name if it doesn't have the answer yet.
+ */
+char *namepart_resolve(const char *track) {
+  char *key;
+
+  byte_xasprintf(&key, "resolve track=%s", track);
+  const char *value = cache_get(&cachetype_string, key);
+  if(!value) {
+    D(("deferring..."));
+    ++namepart_lookups_outstanding;
+    D(("namepart_lookups_outstanding -> %d\n", namepart_lookups_outstanding));
+    disorder_eclient_resolve(client, namepart_completed,
+                             track, (void *)key);
+    value = track;
+  }
+  return xstrdup(value);
+}

 
 /*
 Local Variables:
 
 /*
 Local Variables:

diff --git a/disobedience/queue.c b/disobedience/queue.c
index fe9e707386be63ccf8ba1534c746d00af5ae5fcd..f298b1f71b0b9f0a816e17c87f6955125788dbf8 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -345,6 +345,8 @@ int queued(const char *track) {
   struct queue_entry *q;
 
   D(("queued %s", track));
   struct queue_entry *q;
 
   D(("queued %s", track));

+  /* Queue will contain resolved name */
+  track = namepart_resolve(track);

   for(q = ql_queue.q; q; q = q->next)
     if(!strcmp(q->track, track))
       return 1;
   for(q = ql_queue.q; q; q = q->next)
     if(!strcmp(q->track, track))
       return 1;