Skip to content

Commit

Permalink
Added "container" parameter to MercuryRequest, fixes issue loading co…
Browse files Browse the repository at this point in the history
…llection
  • Loading branch information
fuzeman committed Aug 4, 2014
1 parent cc14a20 commit 239c0d9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion spotify/components/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def get(self, uris, callback=None):
}, {
'method': 'GET',
'uri': 'hm:https://metadata/%ss' % h_type
}, multi=multi)
}, container='objects', multi=multi)

return self.request_wrapper(request, callback)

Expand Down
5 changes: 3 additions & 2 deletions spotify/hermes/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@


class HermesRequest(MercuryRequest):
def __init__(self, sp, requests, schema, header=None, defaults=None, multi=None):
def __init__(self, sp, requests, schema, header=None, defaults=None, container=None, multi=None):
super(HermesRequest, self).__init__(
sp, 'sp/hm_b64',
requests, schema,
header, defaults, multi
header, defaults,
container, multi
)

def cached_response(self, request):
Expand Down
10 changes: 8 additions & 2 deletions spotify/mercury/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


class MercuryRequest(Request):
def __init__(self, sp, name, requests, schema, header=None, defaults=None, multi=None):
def __init__(self, sp, name, requests, schema, header=None, defaults=None, container=None, multi=None):
"""
:type sp: spotify.client.Spotify
:type name: str
Expand All @@ -34,6 +34,7 @@ def __init__(self, sp, name, requests, schema, header=None, defaults=None, multi

self.request = None
self.request_payload = None
self.container = container
self.multi = multi

self.response = OrderedDict()
Expand Down Expand Up @@ -114,8 +115,13 @@ def reply(self, header, data):
uris = []

for x, (content_type, internal) in enumerate(items):
request = None

if self.container == 'objects' and x < len(self.prepared_requests):
request = self.prepared_requests[x]

uri = self.update_response(
self.prepared_requests[x], header,
request, header,
content_type, internal
)

Expand Down

0 comments on commit 239c0d9

Please sign in to comment.