andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Don't build almost the same dict twice

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-11 19:13:15 +01:00
parent 90ca6a786a
commit 0fc0b4b1ef
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mopidy/frontends/http/api.py
View File

@ -40,31 +40,21 @@ class PlayerResource(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
def GET(self): def GET(self):
futures = { properties = {
'state': self.core.playback.state, 'state': self.core.playback.state,
'current_track': self.core.playback.current_track, 'currentTrack': self.core.playback.current_track,
'consume': self.core.playback.consume, 'consume': self.core.playback.consume,
'random': self.core.playback.random, 'random': self.core.playback.random,
'repeat': self.core.playback.repeat, 'repeat': self.core.playback.repeat,
'single': self.core.playback.single, 'single': self.core.playback.single,
'volume': self.core.playback.volume, 'volume': self.core.playback.volume,
'time_position': self.core.playback.time_position, 'timePosition': self.core.playback.time_position,
}
current_track = futures['current_track'].get()
if current_track:
current_track = current_track.serialize()
return {
'properties': {
'state': futures['state'].get(),
'currentTrack': current_track,
'consume': futures['consume'].get(),
'random': futures['random'].get(),
'repeat': futures['repeat'].get(),
'single': futures['single'].get(),
'volume': futures['volume'].get(),
'timePosition': futures['time_position'].get(),
}
} }
for key, value in properties.items():
properties[key] = value.get()
if properties['currentTrack']:
properties['currentTrack'] = properties['currentTrack'].serialize()
return {'properties': properties}
class TrackListResource(object): class TrackListResource(object):
@ -75,17 +65,14 @@ class TrackListResource(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
def GET(self): def GET(self):
futures = { cp_tracks_future = self.core.current_playlist.cp_tracks
'cp_tracks': self.core.current_playlist.cp_tracks, current_cp_track_future = self.core.playback.current_cp_track
'current_cp_track': self.core.playback.current_cp_track,
}
cp_tracks = futures['cp_tracks'].get()
tracks = [] tracks = []
for cp_track in cp_tracks: for cp_track in cp_tracks_future.get():
track = cp_track.track.serialize() track = cp_track.track.serialize()
track['cpid'] = cp_track.cpid track['cpid'] = cp_track.cpid
tracks.append(track) tracks.append(track)
current_cp_track = futures['current_cp_track'].get() current_cp_track = current_cp_track_future.get()
return { return {
'currentTrackCpid': current_cp_track and current_cp_track.cpid, 'currentTrackCpid': current_cp_track and current_cp_track.cpid,
'tracks': tracks, 'tracks': tracks,