Skip to content

CIRCLE / storagedriver

Go to a project
Commit a7bfdfd6 by Guba Sándor
Options

download: refactored abort check

parent 4427422b
Showing with 9 additions and 6 deletions
disk.py
...@@ -121,6 +121,8 @@ class Disk(object): ...@@ -121,6 +121,8 @@ class Disk(object):
if r.status_code == 200: if r.status_code == 200:
class AbortException(Exception): class AbortException(Exception):
pass pass
if task.is_aborted():
raise AbortException()
if parent_id is None: if parent_id is None:
parent_id = task.request.id parent_id = task.request.id
chunk_size = 256 * 1024 chunk_size = 256 * 1024
...@@ -135,8 +137,6 @@ class Disk(object): ...@@ -135,8 +137,6 @@ class Disk(object):
try: try:
with open(disk_path, 'wb') as f: with open(disk_path, 'wb') as f:
for chunk in r.iter_content(chunk_size=chunk_size): for chunk in r.iter_content(chunk_size=chunk_size):
if task.is_aborted():
raise AbortException()
if ext in ('gz', 'bz'): if ext in ('gz', 'bz'):
chunk = decompressor.decompress(chunk) chunk = decompressor.decompress(chunk)
f.write(chunk) f.write(chunk)
...@@ -144,10 +144,13 @@ class Disk(object): ...@@ -144,10 +144,13 @@ class Disk(object):
new_percent = min(100, round(actsize * 100.0 / clen)) new_percent = min(100, round(actsize * 100.0 / clen))
if new_percent > percent: if new_percent > percent:
percent = new_percent percent = new_percent
task.update_state( if not task.is_aborted():
task_id=parent_id, task.update_state(
state=task.AsyncResult(parent_id).state, task_id=parent_id,
meta={'size': actsize, 'percent': percent}) state=task.AsyncResult(parent_id).state,
meta={'size': actsize, 'percent': percent})
else:
raise AbortException()
if ext == 'gz': if ext == 'gz':
f.write(decompressor.flush()) f.write(decompressor.flush())
f.flush() f.flush()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment