Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Code cleanup in file responses (#1769)

Browse Source 
* Code cleanup in file responses.

* Lint
This commit is contained in:
L. Kärkkäinen 2020-01-27 08:08:34 +02:00 committed by 7
parent bffdb3b5c2
commit dac0514441
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sanic/response.py
View File

@ -293,22 +293,20 @@ async def file(
headers = headers or {} headers = headers or {}
if filename: if filename:
headers.setdefault( headers.setdefault(
"Content-Disposition", 'attachment; filename="{}"'.format(filename) "Content-Disposition", f'attachment; filename="{filename}"'
) )
filename = filename or path.split(location)[-1] filename = filename or path.split(location)[-1]
async with await open_async(location, mode="rb") as _file: async with await open_async(location, mode="rb") as f:
if _range: if _range:
await _file.seek(_range.start) await f.seek(_range.start)
out_stream = await _file.read(_range.size) out_stream = await f.read(_range.size)
headers["Content-Range"] = "bytes %s-%s/%s" % ( headers[
_range.start, "Content-Range"
_range.end, ] = "bytes {0.start}-{0.end}/{0.total}".format(_range)
_range.total,
)
status = 206 status = 206
else: else:
out_stream = await _file.read() out_stream = await f.read()
mime_type = mime_type or guess_type(filename)[0] or "text/plain" mime_type = mime_type or guess_type(filename)[0] or "text/plain"
return HTTPResponse( return HTTPResponse(
@ -342,44 +340,34 @@ async def file_stream(
headers = headers or {} headers = headers or {}
if filename: if filename:
headers.setdefault( headers.setdefault(
"Content-Disposition", 'attachment; filename="{}"'.format(filename) "Content-Disposition", f'attachment; filename="{filename}"'
) )
filename = filename or path.split(location)[-1] filename = filename or path.split(location)[-1]
mime_type = mime_type or guess_type(filename)[0] or "text/plain"
_filectx = await open_async(location, mode="rb") if _range:
_file = await _filectx.__aenter__() # Will be exited by _streaming_fn headers["Content-Range"] = "bytes {0.start}-{0.end}/{0.total}".format(
_range
)
status = 206
async def _streaming_fn(response): async def _streaming_fn(response):
nonlocal _file, chunk_size async with await open_async(location, mode="rb") as f:
try:
if _range: if _range:
chunk_size = min((_range.size, chunk_size)) await f.seek(_range.start)
await _file.seek(_range.start)
to_send = _range.size to_send = _range.size
while to_send > 0: while to_send > 0:
content = await _file.read(chunk_size) content = await f.read(min((_range.size, chunk_size)))
if len(content) < 1: if len(content) < 1:
break break
to_send -= len(content) to_send -= len(content)
await response.write(content) await response.write(content)
else: else:
while True: while True:
content = await _file.read(chunk_size) content = await f.read(chunk_size)
if len(content) < 1: if len(content) < 1:
break break
await response.write(content) await response.write(content)
finally:
await _filectx.__aexit__(None, None, None)
return # Returning from this fn closes the stream
mime_type = mime_type or guess_type(filename)[0] or "text/plain"
if _range:
headers["Content-Range"] = "bytes %s-%s/%s" % (
_range.start,
_range.end,
_range.total,
)
status = 206
return StreamingHTTPResponse( return StreamingHTTPResponse(
streaming_fn=_streaming_fn, streaming_fn=_streaming_fn,
status=status, status=status,