Allow for unnormalized path prefixes like /vsitar/ #208
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schwehr
reviewed
Oct 27, 2020
tests/test_utils.py
Outdated
| def test_make_absolute_href_on_vsitar(self): | ||
| cat_path = '/vsitar//tmp/catalog.tar/catalog.json' | ||
| rel_path = 'some/item.json' | ||
| result = make_absolute_href(rel_path, cat_path) |
There was a problem hiding this comment.
Minor suggestion for clarity:
rel_path = 'some/item.json'
cat_path = '/vsitar//tmp/catalog.tar/catalog.json'
expected = '/vsitar//tmp/catalog.tar/some/item.json'
self.assertEqual(expected, make_absolute_href(rel_path, cat_path))
There was a problem hiding this comment.
Ok, thanks. That is minor, but I made the change.
Can you mark PRs that have minor suggestions as approved, and use 'request changes' if there's specific changes or discussion left? Thanks!
I believe this falls into the former category, so I'll merge once CI passes.
The logic in make_absolute_href uses os.path.abspath, which normalizes paths. This lets us translate joined paths like /home/user/../catalog.json into proper paths. However, normalizing the path will also modify the root path being joined to in ways that may not be desirable. Specifically in the case of a /vsitar/ prefix, the double slashes that are required for proper GDAL reading are removed by normalization. This commit modifies the logic in make_absolute_href to detect when the original start path is modified by a call to abspath, and if so replaces the modified version with the original version. Fixes #180
Codecov Report
@@ Coverage Diff @@
## develop #208 +/- ##
===========================================
+ Coverage 92.32% 92.36% +0.03%
===========================================
Files 28 28
Lines 3349 3351 +2
===========================================
+ Hits 3092 3095 +3
+ Misses 257 256 -1
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The logic in make_absolute_href uses os.path.abspath, which normalizes paths. This lets us translate joined paths like /home/user/../catalog.json into proper paths. However, normalizing the path will also modify the root path being joined to in ways that may not be desirable. Specifically in the case of a /vsitar/ prefix, the double slashes that are required for proper GDAL reading are removed by normalization. This commit modifies the logic in make_absolute_href to detect when the original start path is modified by a call to abspath, and if so replaces the modified version with the original version.
Fixes #180