Merge branch 'disk-download-enhancement' into 'master'

Disk Download Enhancement

This branch will solve #176

✅  handle http errors (404)
✅  what do with websites, images, etc
✅  add the url to the result

⚠ needs new storagedriver

circle/storage/models.py

@@ -360,13 +360,14 @@ class Disk(AclBase, TimeStampedModel):
             queue=queue_name)
             queue=queue_name)
         while True:
         while True:
             try:
             try:
-                size = remote.get(timeout=5)
+                result = remote.get(timeout=5)
                 break
                 break
             except TimeoutError:
             except TimeoutError:
                 if task is not None and task.is_aborted():
                 if task is not None and task.is_aborted():
                     AbortableAsyncResult(remote.id).abort()
                     AbortableAsyncResult(remote.id).abort()
                     raise Exception("Download aborted by user.")
                     raise Exception("Download aborted by user.")
-        disk.size = size
+        disk.size = result['size']
+        disk.type = result['type']
         disk.is_ready = True
         disk.is_ready = True
         disk.save()
         disk.save()
         return disk
         return disk

circle/vm/operations.py

@@ -137,7 +137,8 @@ class DownloadDiskOperation(InstanceOperation):
         if self.instance.status not in ['STOPPED', 'PENDING']:
         if self.instance.status not in ['STOPPED', 'PENDING']:
             raise self.instance.WrongStateError(self.instance)
             raise self.instance.WrongStateError(self.instance)
 
 
-    def _operation(self, user, url, task, name=None):
+    def _operation(self, user, url, task, activity, name=None):
+        activity.result = url
         # TODO implement with hot-attach when it'll be available
         # TODO implement with hot-attach when it'll be available
         from storage.models import Disk
         from storage.models import Disk