ver: return dict with multiple parameters

storagedriver.py

@@ -36,7 +36,8 @@ class download(AbortableTask):
         parent_id = kwargs.get("parent_id", None)
         parent_id = kwargs.get("parent_id", None)
         disk = Disk.deserialize(disk_desc)
         disk = Disk.deserialize(disk_desc)
         disk.download(self, url, parent_id)
         disk.download(self, url, parent_id)
-        return disk.size
+        return {'size': disk.size,
+                'type': disk.format}
 
 
 
 
 @celery.task()
 @celery.task()
@@ -89,7 +90,7 @@ def move_to_trash(datastore, disk_name):
     disk_path = path.join(datastore, disk_name)
     disk_path = path.join(datastore, disk_name)
     if not path.isdir(trash_path):
     if not path.isdir(trash_path):
         mkdir(trash_path)
         mkdir(trash_path)
-    #TODO: trash dir configurable?
+    # TODO: trash dir configurable?
     move(disk_path, trash_path)
     move(disk_path, trash_path)