0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

return utf-8 filenames

Browse source
This commit is contained in:
j 2012-01-24 15:29:04 +05:30
parent 425c7a874a
commit 8895e99063
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/views.py
View file

@ -768,7 +768,7 @@ def video(request, id, resolution, format, index=None):
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]:
response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type) response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type)
filename = "Clip of %s - %s-%s - %s %s%s" % ( filename = u"Clip of %s - %s-%s - %s %s%s" % (
item.get('title'), item.get('title'),
ox.formatDuration(t[0] * 1000).replace(':', '.')[:-4], ox.formatDuration(t[0] * 1000).replace(':', '.')[:-4],
ox.formatDuration(t[1] * 1000).replace(':', '.')[:-4], ox.formatDuration(t[1] * 1000).replace(':', '.')[:-4],
@ -776,6 +776,7 @@ def video(request, id, resolution, format, index=None):
item.itemId, item.itemId,
ext ext
) )
filename = filename.encode('utf8')
response['Content-Disposition'] = 'attachment; filename="%s"' % filename response['Content-Disposition'] = 'attachment; filename="%s"' % filename
return response return response
else: else:
@ -786,6 +787,7 @@ def video(request, id, resolution, format, index=None):
ext ext
) )
response = HttpFileResponse(path, content_type=content_type) response = HttpFileResponse(path, content_type=content_type)
filename = filename.encode('utf8')
response['Content-Disposition'] = 'attachment; filename="%s"' % filename response['Content-Disposition'] = 'attachment; filename="%s"' % filename
return response return response
if not settings.XSENDFILE and not settings.XACCELREDIRECT: if not settings.XSENDFILE and not settings.XACCELREDIRECT: