Skip to content

CIRCLE / storagedriver

Go to a project
Commit b2bea118 by Szeberényi Imre
Options

Merge branch 'export_import_fixes' into 'master' 

Export import fixes

See merge request !20
parents 899f5736 0f93a752
Showing with 6 additions and 6 deletions
disk.py
...@@ -278,14 +278,14 @@ class Disk(object): ...@@ -278,14 +278,14 @@ class Disk(object):
f.write(chunk) f.write(chunk)
current_size = f.tell() current_size = f.tell()
new_percent = current_size * 100 / clen new_percent = current_size * 100 / clen
if task.is_aborted():
raise AbortException()
if new_percent > percent: if new_percent > percent:
if task.is_aborted():
raise AbortException()
percent = new_percent percent = new_percent
task.update_state( task.update_state(
task_id=parent_id, task_id=parent_id,
state=task.AsyncResult(parent_id).state, state=task.AsyncResult(parent_id).state,
meta={'percent': percent} meta={'size': current_size, 'percent': percent}
) )
with magic.Magic() as m: with magic.Magic() as m:
...@@ -337,14 +337,14 @@ class Disk(object): ...@@ -337,14 +337,14 @@ class Disk(object):
def update_state(monitor): def update_state(monitor):
new_percent = monitor.bytes_read * 100 / size new_percent = monitor.bytes_read * 100 / size
if task.is_aborted():
raise AbortException()
if new_percent > percent[0]: if new_percent > percent[0]:
if task.is_aborted():
raise AbortException()
percent[0] = new_percent percent[0] = new_percent
task.update_state( task.update_state(
task_id=parent_id, task_id=parent_id,
state=task.AsyncResult(parent_id).state, state=task.AsyncResult(parent_id).state,
meta={'percent': percent[0]} meta={'size': monitor.bytes_read, 'percent': percent[0]}
) )
with open(exported_path, 'rb') as exported_disk: with open(exported_path, 'rb') as exported_disk:
......
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