[Fixes #8551] raster uploads require sending the same file twice (#8586…

…) (#8594) * [Fixes #8551] raster uploads require sending the same file twice * [Fixes #8551] raster uploads require sending the same file twice Co-authored-by: Alessio Fabiani <[email protected]>
GeoNode · Jan 13, 2022 · 5899d51 · 5899d51
1 parent 7ddf753
commit 5899d51
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/geonode/tests/utils.py b/geonode/tests/utils.py
@@ -247,9 +247,6 @@ def upload_file(self, _file, perms=None):
                 # allow for that
                 if os.path.exists(file_path):
                     params[spatial_file] = open(file_path, 'rb')
-        elif ext.lower() == '.tif':
-            file_path = base + ext
-            params['tif_file'] = open(file_path, 'rb')
 
         with open(_file, 'rb') as base_file:
             params['base_file'] = base_file
@@ -264,9 +261,6 @@ def upload_file(self, _file, perms=None):
             if isinstance(params.get(spatial_file), IOBase):
                 params[spatial_file].close()
 
-        if isinstance(params.get("tif_file"), IOBase):
-            params['tif_file'].close()
-
         try:
             return resp, resp.json()
         except ValueError:

diff --git a/geonode/upload/api/tests.py b/geonode/upload/api/tests.py
@@ -212,9 +212,6 @@ def live_upload_file(self, _file):
                 # allow for that
                 if os.path.exists(file_path):
                     params[spatial_file] = open(file_path, 'rb')
-        elif ext.lower() == '.tif':
-            file_path = base + ext
-            params['tif_file'] = open(file_path, 'rb')
 
         with open(_file, 'rb') as base_file:
             params['base_file'] = base_file
@@ -240,9 +237,6 @@ def live_upload_file(self, _file):
             if isinstance(params.get(spatial_file), IOBase):
                 params[spatial_file].close()
 
-        if isinstance(params.get("tif_file"), IOBase):
-            params['tif_file'].close()
-
         try:
             logger.error(f" -- response: {response.status_code} / {response.json()}")
             return response, response.json()
@@ -275,9 +269,6 @@ def rest_upload_file(self, _file, username=GEONODE_USER, password=GEONODE_PASSWD
                 # allow for that
                 if os.path.exists(file_path):
                     params[spatial_file] = open(file_path, 'rb')
-        elif ext.lower() == '.tif':
-            file_path = base + ext
-            params['tif_file'] = open(file_path, 'rb')
 
         with open(_file, 'rb') as base_file:
             params['base_file'] = base_file
@@ -295,9 +286,6 @@ def rest_upload_file(self, _file, username=GEONODE_USER, password=GEONODE_PASSWD
             if isinstance(params.get(spatial_file), IOBase):
                 params[spatial_file].close()
 
-        if isinstance(params.get("tif_file"), IOBase):
-            params['tif_file'].close()
-
         try:
             logger.error(f" -- response: {response.status_code} / {response.json()}")
             return response, response.json()

diff --git a/geonode/upload/upload_validators.py b/geonode/upload/upload_validators.py
@@ -106,6 +106,8 @@ def validate_uploaded_files(cleaned, uploaded_files, field_spatial_types):
                 valid_extensions.append(extension)
             except AttributeError:
                 pass
+    if not valid_extensions:
+        valid_extensions = [f"{base_ext.lower()}"]
     return valid_extensions