From fe7d0c7415db9055cc386a24910dae0d61a2e338 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 2 Apr 2014 12:33:49 +0200 Subject: [PATCH] profile is a function now --- pandora_client/server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_client/server.py b/pandora_client/server.py index 895630f..6d14cb7 100644 --- a/pandora_client/server.py +++ b/pandora_client/server.py @@ -73,7 +73,7 @@ class Server(Resource): return os.path.join( self.client.media_cache(), os.path.join(*hash_prefix(oshash)), - self.client.profile + self.client.profile(self.client.info(oshash)) ) def render_json(self, request, response): @@ -134,8 +134,8 @@ class Server(Resource): if os.path.exists(f): response['oshash'] = oshash url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash) - output = '/tmp/%s.%s' % (oshash, self.client.profile) - response['cmd'] = extract.video_cmd(url, output, self.client.profile, info) + output = '/tmp/%s.%s' % (oshash, self.client.profile(info)) + response['cmd'] = extract.video_cmd(url, output, self.client.profile(info), info) response['cmd'][0] = 'ffmpeg' response['output'] = output self.update_status(oshash, 'active')