decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

allow formated time for clip extraction too

Browse source
This commit is contained in:
j 2012-09-23 10:32:35 +02:00
parent 20d1119b75
commit f39b2ddf3f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora/item/views.py
View file

@ -796,7 +796,11 @@ def video(request, id, resolution, format, index=None):
#FIXME: this needs to join segments if needed #FIXME: this needs to join segments if needed
t = request.GET.get('t') t = request.GET.get('t')
if t: if t:
t = map(float, t.split(',')) def parse_timestamp(s):
if ':' in s:
s = ox.time2ms(s) / 1000
return float(s)
t = map(parse_timestamp, t.split(','))
ext = '.%s' % format ext = '.%s' % format
content_type = mimetypes.guess_type(path)[0] content_type = mimetypes.guess_type(path)[0]
if len(t) == 2 and t[1] > t[0] and stream.info['duration']>=t[1]: if len(t) == 2 and t[1] > t[0] and stream.info['duration']>=t[1]: