Merge pull request #1339 from pierotofy/singlefix

Allow single file upload
OpenDroneMap · May 4, 2023 · a8f852c · a8f852c
2 parents 473b435 + 0fc5387
commit a8f852c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/app/api/tasks.py b/app/api/tasks.py
@@ -181,8 +181,8 @@ def commit(self, request, pk=None, project_pk=None):
         task.partial = False
         task.images_count = len(task.scan_images())
 
-        if task.images_count < 2:
-            raise exceptions.ValidationError(detail=_("You need to upload at least 2 images before commit"))
+        if task.images_count < 1:
+            raise exceptions.ValidationError(detail=_("You need to upload at least 1 file before commit"))
 
         task.save()
         worker_tasks.process_task.delay(task.id)

diff --git a/app/tests/test_api_task.py b/app/tests/test_api_task.py
@@ -114,13 +114,6 @@ def test_task(self):
             }, format="multipart")
             self.assertTrue(res.status_code == status.HTTP_400_BAD_REQUEST)
 
-            # Cannot create a task with just 1 image
-            res = client.post("/api/projects/{}/tasks/".format(project.id), {
-                'images': image1
-            }, format="multipart")
-            self.assertTrue(res.status_code == status.HTTP_400_BAD_REQUEST)
-            image1.seek(0)
-
             # Normal case with images[], name and processing node parameter
             res = client.post("/api/projects/{}/tasks/".format(project.id), {
                 'images': [image1, image2],
@@ -1118,10 +1111,6 @@ def test_task_chunked_uploads(self):
             self.assertEqual(res.data['success'], True)
             image1.seek(0)
 
-            # Cannot commit with a single image
-            res = client.post("/api/projects/{}/tasks/{}/commit/".format(project.id, task.id))
-            self.assertEqual(res.status_code, status.HTTP_400_BAD_REQUEST)
-
             # And second image
             res = client.post("/api/projects/{}/tasks/{}/upload/".format(project.id, task.id), {
                 'images': [image2],

diff --git a/nodeodm/models.py b/nodeodm/models.py
@@ -114,7 +114,7 @@ def process_new_task(self, images, name=None, options=[], progress_callback=None
 
         :returns UUID of the newly created task
         """
-        if len(images) < 2: raise exceptions.NodeServerError("Need at least 2 images")
+        if len(images) < 1: raise exceptions.NodeServerError("Need at least 1 file")
 
         api_client = self.api_client()