0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

profile is a function now

Browse source
This commit is contained in:
j 2014-04-02 12:33:49 +02:00
parent 3e9e53172f
commit fe7d0c7415
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora_client/server.py
View file

@ -73,7 +73,7 @@ class Server(Resource):
return os.path.join( return os.path.join(
self.client.media_cache(), self.client.media_cache(),
os.path.join(*hash_prefix(oshash)), os.path.join(*hash_prefix(oshash)),
self.client.profile self.client.profile(self.client.info(oshash))
) )
def render_json(self, request, response): def render_json(self, request, response):
@ -134,8 +134,8 @@ class Server(Resource):
if os.path.exists(f): if os.path.exists(f):
response['oshash'] = oshash response['oshash'] = oshash
url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash) url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash)
output = '/tmp/%s.%s' % (oshash, self.client.profile) output = '/tmp/%s.%s' % (oshash, self.client.profile(info))
response['cmd'] = extract.video_cmd(url, output, self.client.profile, info) response['cmd'] = extract.video_cmd(url, output, self.client.profile(info), info)
response['cmd'][0] = 'ffmpeg' response['cmd'][0] = 'ffmpeg'
response['output'] = output response['output'] = output
self.update_status(oshash, 'active') self.update_status(oshash, 'active')