From e28a17667e5d6b63500211295ae09a0fa2c1135e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 29 Nov 2023 16:27:38 +0100 Subject: 🐛 import GIS: fix number of line evaluation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/models_imports.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ishtar_common/models_imports.py') diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 8033d7c45..4ab37e8d5 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -2153,9 +2153,10 @@ class Import(BaseImport): def get_number_of_lines(self): if self.number_of_line: return self.number_of_line - if self.importer_type.type == "gis": - return imported_values = self.get_imported_values() + if (not imported_values or not imported_values.path or not imported_values.path.endswith(".csv")) \ + and self.importer_type.type == "gis": + return self._data_table_gis(get_number_only=True) if not imported_values or not imported_values.path: return filename = imported_values.path @@ -2325,7 +2326,7 @@ class Import(BaseImport): def get_gis_attr(self): return self._data_table_gis(get_gis_attr=True) - def _data_table_gis(self, get_gis_attr=False): + def _data_table_gis(self, get_gis_attr=False, get_number_only=False): self.gis_attr = None imported_values = self.get_imported_values().path tmp_dir = None @@ -2407,9 +2408,11 @@ class Import(BaseImport): # Warning: RuntimeWarning: Sequential read of iterator was interrupted. # Resetting iterator. # not relevant -> bug in fiona 1.8.18 (fixed in 1.8.19) - if not self.number_of_line: + if not self.number_of_line or get_number_only: self.number_of_line = len(collection) self.save() + if get_number_only: + return self.number_of_line for idx, feature in enumerate(collection): try: line = [ -- cgit v1.2.3