Merge pull request #343 from Open-EO/suffix_to_remove

Suffix to remove

Author: EmileSonneveld

openeo_driver/datacube.py

@@ -578,11 +578,11 @@ def write_assets(
             options = {}
         # TODO: We should treat the directory parameter as an actual directory. (Open-EO/openeo-geopyspark-driver#888)
         filename = str(directory)
-        directory = Path(filename).parent
+        directory_parent = Path(filename).parent
 
         format_info = IOFORMATS.get(format)
         # TODO: check if format can be used for vector data?
-        path = directory / f"vectorcube.{format_info.extension}"
+        path = directory_parent / f"vectorcube.{format_info.extension}"
 
         if format_info.format == "JSON":
             # TODO: eliminate this legacy format?
@@ -607,7 +607,7 @@ def write_assets(
             }}
         else:
             # Multi-file format
-            components = list(directory.glob("vectorcube.*"))
+            components = list(directory_parent.glob("vectorcube.*"))
             if options.get("zip_multi_file"):
                 # TODO: automatically zip shapefile components?
                 zip_path = path.with_suffix(f".{format_info.extension}.zip")

openeo_driver/save_result.py

@@ -205,6 +205,7 @@ def create_flask_response(self) -> Response:
             asset = assets.popitem()[1]
             path = Path(asset["href"])
             mimetype = asset.get("type")
+            assert path.relative_to(tmp_dir)
             return send_from_directory(path.parent, path.name, mimetype=mimetype)