Meta: Strip extraneous slashes from file paths in the WPT importer
Previously attempting to import files with a `src` that had a leading `/` would fail.
This commit is contained in:
parent
b4751826c6
commit
f8dacdaf50
Notes:
github-actions[bot]
2024-12-29 00:51:59 +00:00
Author: https://github.com/tcl3 Commit: https://github.com/LadybirdBrowser/ladybird/commit/f8dacdaf508 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3031 Reviewed-by: https://github.com/LucasChollet
1 changed files with 6 additions and 7 deletions
|
@ -115,18 +115,17 @@ def map_to_path(sources: list[ResourceAndType], is_resource=True, resource_path=
|
|||
base_directory = test_type.input_path if source.type == ResourceType.INPUT else test_type.expected_path
|
||||
|
||||
if source.resource.startswith('/') or not is_resource:
|
||||
file_path = base_directory + '/' + source.resource
|
||||
file_path = Path(base_directory, source.resource.lstrip('/'))
|
||||
else:
|
||||
# Add it as a sibling path if it's a relative resource
|
||||
sibling_location = str(Path(resource_path).parent)
|
||||
parent_directory = base_directory + '/' + sibling_location
|
||||
|
||||
file_path = parent_directory + '/' + source.resource
|
||||
sibling_location = Path(resource_path).parent
|
||||
parent_directory = Path(base_directory, sibling_location)
|
||||
|
||||
file_path = Path(parent_directory, source.resource)
|
||||
# Map to source and destination
|
||||
output_path = wpt_base_url + file_path.replace(base_directory, '')
|
||||
output_path = wpt_base_url + str(file_path).replace(base_directory, '')
|
||||
|
||||
filepaths.append(PathMapping(output_path, Path(file_path).absolute()))
|
||||
filepaths.append(PathMapping(output_path, file_path.absolute()))
|
||||
|
||||
return filepaths
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue