Merge branch 'export_import_fixes' into 'master'

Export import fixes

See merge request !20

disk.py

@@ -278,14 +278,14 @@ class Disk(object):
                     f.write(chunk)
                     current_size = f.tell()
                     new_percent = current_size * 100 / clen
+                    if new_percent > percent:
                         if task.is_aborted():
                             raise AbortException()
-                    if new_percent > percent:
                         percent = new_percent
                         task.update_state(
                             task_id=parent_id,
                             state=task.AsyncResult(parent_id).state,
-                            meta={'percent': percent}
+                            meta={'size': current_size, 'percent': percent}
                         )
 
             with magic.Magic() as m:
@@ -337,14 +337,14 @@ class Disk(object):
 
         def update_state(monitor):
             new_percent = monitor.bytes_read * 100 / size
+            if new_percent > percent[0]:
                 if task.is_aborted():
                     raise AbortException()
-            if new_percent > percent[0]:
                 percent[0] = new_percent
                 task.update_state(
                     task_id=parent_id,
                     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: