Use base-output-filename for example transform outputs

Author: avillar

ogc/bblocks/transform.py

@@ -10,6 +10,7 @@
 from ogc.bblocks import mimetypes
 from ogc.bblocks.models import BuildingBlock, TransformMetadata, BuildingBlockError
 from ogc.bblocks.transformers import transformers
+from ogc.bblocks.util import sanitize_filename
 
 
 def apply_transforms(bblock: BuildingBlock,
@@ -78,8 +79,12 @@ def apply_transforms(bblock: BuildingBlock,
                 if snippet_mime_type not in supported_input_media_types:
                     continue
 
-                output_fn = output_dir / (f"example_{example_id + 1}_{snippet_id + 1}"
-                                          f".{transform['id']}{default_suffix}")
+                if base_output_filename := example.get('base-output-filename'):
+                    output_fn = output_dir / sanitize_filename(base_output_filename)
+                    output_fn = output_fn.with_name(f"{output_fn.stem}.{transform['id']}{default_suffix}")
+                else:
+                    output_fn = output_dir / (f"example_{example_id + 1}_{snippet_id + 1}"
+                                              f".{transform['id']}{default_suffix}")
 
                 metadata = transform.get('metadata', {})
                 metadata['_prefixes'] = example_prefixes

ogc/bblocks/validate.py

@@ -316,10 +316,10 @@ def validate_test_resources(bblock: BuildingBlock,
                     add_snippets_formats = []
 
                 extension = FORMAT_ALIASES.get(snippet['language'], snippet['language']).replace('/', '.')
-                fn = bblock.files_path / (f"example_{example_id + 1}_{snippet_id + 1}"
-                                          f".{extension}")
+                fn = bblock.files_path / f"example_{example_id + 1}_{snippet_id + 1}"
 
-                output_fn = output_dir / sanitize_filename(example.get('base-output-filename', fn.name))
+                output_fn = (output_dir.joinpath(sanitize_filename(example.get('base-output-filename', fn.name)))
+                             .with_suffix(f'.{extension}'))
                 i = 0
                 while output_fn.stem in output_base_filenames:
                     i += 1