Restructure the mercury/hermes request/response system (assume return…

…ed items match request)

spotify/hermes/request.py

@@ -27,18 +27,16 @@ def cached_response(self, request):
 
  return True
 
- def update_response(self, index, header, content_type, internal):
+ def update_response(self, request, header, content_type, internal):
  uri = None
 
- if type(internal) is dict:
+ if request and request.uri:
+ uri = request.uri
+ elif type(internal) is dict:
  uri = internal.get('uri')
  else:
  uri = cache.get_object_uri(content_type, internal)
 
- if uri is None and index < len(self.prepared_requests):
- # Fallback to original request uri
- uri = self.prepared_requests[index].uri
-
  if not uri:
  # URI doesn't look valid
  raise NotImplementedError()
@@ -48,3 +46,5 @@ def update_response(self, index, header, content_type, internal):
 
  # Store in cache for later use
  cache.store(header, content_type, internal)
+
+ return uri

spotify/mercury/request.py

@@ -112,7 +112,10 @@ def reply(self, header, data):
  items = self.reply_mercury(header.content_type, data)
 
  for x, (content_type, internal) in enumerate(items):
- self.update_response(x, header, content_type, internal)
+ uri = self.update_response(
+ self.prepared_requests[x], header,
+ content_type, internal
+ )
 
  self.respond()
 
@@ -264,8 +267,9 @@ def parse_request(request):
  def cached_response(self, request):
  return False
 
- def update_response(self, index, header, content_type, internal):
- self.response[internal.gid] = (content_type, internal)
+ def update_response(self, request, header, content_type, internal):
+ self.response[request.uri] = (content_type, internal)
+ return request.uri
 
  def __repr__(self):
  return "<%s uris: %s>" % (