Merge pull request #1499 from pierotofy/upcheck

Add file size check on upload

app/api/tasks.py

@@ -208,14 +208,14 @@ def upload(self, request, pk=None, project_pk=None):
         if len(files) == 0:
             raise exceptions.ValidationError(detail=_("No files uploaded"))
 
-        task.handle_images_upload(files)
+        uploaded = task.handle_images_upload(files)
         task.images_count = len(task.scan_images())
         # Update other parameters such as processing node, task name, etc.
         serializer = TaskSerializer(task, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
-        return Response({'success': True}, status=status.HTTP_200_OK)
+        return Response({'success': True, 'uploaded': uploaded}, status=status.HTTP_200_OK)
 
     @action(detail=True, methods=['post'])
     def duplicate(self, request, pk=None, project_pk=None):

app/models/task.py

@@ -1163,6 +1163,7 @@ def get_image_path(self, filename):
         return path_traversal_check(p, self.task_path())
 
     def handle_images_upload(self, files):
+        uploaded = {}
         for file in files:
             name = file.name
             if name is None:
@@ -1181,6 +1182,9 @@ def handle_images_upload(self, files):
                 else:
                     with open(file.temporary_file_path(), 'rb') as f:
                         shutil.copyfileobj(f, fd)
+
+            uploaded[name] = os.path.getsize(dst_path)
+        return uploaded
 
     def update_size(self, commit=False):
         try:

app/static/app/js/components/ProjectListItem.jsx

@@ -231,7 +231,7 @@ class ProjectListItem extends React.Component {
                 }else{
                     // Check response
                     let response = JSON.parse(file.xhr.response);
-                    if (response.success){
+                    if (response.success && response.uploaded && response.uploaded[file.name] === file.size){
                         // Update progress by removing the tracked progress and 
                         // use the file size as the true number of bytes
                         let totalBytesSent = this.state.upload.totalBytesSent + file.size;