From 433b9f9a1bfbbc7c796bd765562d43bbf2b96e0e Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Thu, 8 Oct 2020 16:47:02 +0200
Subject: [PATCH] Remove folder creation in DataImportFromFiles
---
arkindex/dataimport/api.py | 14 --------------
arkindex/dataimport/tests/test_imports.py | 4 +++-
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/arkindex/dataimport/api.py b/arkindex/dataimport/api.py
index d7ba1b1fcc..f87c0d4a28 100644
--- a/arkindex/dataimport/api.py
+++ b/arkindex/dataimport/api.py
@@ -35,10 +35,8 @@ from arkindex.project.fields import ArrayRemove
from arkindex_common.ml_tool import MLToolType
from arkindex_common.enums import DataImportMode
from ponos.models import State, STATES_ORDERING
-from datetime import datetime
from uuid import UUID
import logging
-import os.path
logger = logging.getLogger(__name__)
@@ -286,18 +284,6 @@ class DataImportFromFiles(CreateAPIView):
# The files' corpus is already validated as writable
raise ValidationError('Element and files are in different corpora')
- if not folder and mode != DataImportMode.IIIF:
- if mode == DataImportMode.PDF:
- suffix = os.path.splitext(files[0].name)[0]
- else:
- suffix = datetime.today().strftime('%Y-%m-%d %H:%M')
-
- # TODO: Remove this step and let the file/IIIF import create its own folder when needed
- folder = corpus.elements.create(
- name=f'Import {mode.value} {suffix}',
- type=folder_type,
- )
-
# Start a dataimport with thumbnails generation
self.dataimport = corpus.imports.create(
creator=self.request.user,
diff --git a/arkindex/dataimport/tests/test_imports.py b/arkindex/dataimport/tests/test_imports.py
index 217b1ccd3b..5e6520b352 100644
--- a/arkindex/dataimport/tests/test_imports.py
+++ b/arkindex/dataimport/tests/test_imports.py
@@ -663,6 +663,7 @@ class TestImports(FixtureAPITestCase):
self.assertListEqual(list(dataimport.files.all()), [self.img_df])
self.assertEqual(dataimport.folder_type.slug, 'volume')
self.assertEqual(dataimport.element_type.slug, 'page')
+ self.assertIsNone(dataimport.element)
def test_from_files_pdf(self):
self.client.force_login(self.user)
@@ -677,7 +678,7 @@ class TestImports(FixtureAPITestCase):
dataimport = DataImport.objects.get(id=data['id'])
self.assertEqual(dataimport.mode, DataImportMode.PDF)
self.assertListEqual(list(dataimport.files.all()), [self.pdf_df])
- self.assertEqual(dataimport.element.name, 'Import pdf test')
+ self.assertIsNone(dataimport.element)
def test_from_files_iiif(self):
self.client.force_login(self.user)
@@ -694,6 +695,7 @@ class TestImports(FixtureAPITestCase):
self.assertListEqual(list(dataimport.files.all()), [self.iiif_df])
self.assertEqual(dataimport.folder_type.slug, 'volume')
self.assertEqual(dataimport.element_type.slug, 'page')
+ self.assertIsNone(dataimport.element)
def test_from_files_iiif_requires_folder_type(self):
self.client.force_login(self.user)
--
GitLab