fix: absolute url for windows #655
Merged
Conversation
This file contains 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
|
CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅ |
|
I have read the CLA Document and I hereby sign the CLA |
nitisht
added a commit
to parseablehq/.github
that referenced
this pull request
Feb 7, 2024
|
recheck |
|
PS: This is my first time writing Rust code so would love code review. |
Delta456
commented
Feb 7, 2024
server/src/storage/localfs.rs
Outdated
| "{}", | ||
| self.root.join(RelativePath::new(prefix).as_str()).display() | ||
| )) | ||
| object_store::path::Path::parse(format!("{}", self.root.join(prefix.as_str()).display()).trim_start_matches(std::path::MAIN_SEPARATOR), |
There was a problem hiding this comment.
I rechecked and std::path::MAIN_SEPARATOR seems like a better solution here.
Delta456
commented
Feb 7, 2024
| @@ -212,7 +212,8 @@ impl ObjectStorage for LocalFS { | |||
|
|
|||
| fn absolute_url(&self, prefix: &RelativePath) -> object_store::path::Path { | |||
| object_store::path::Path::parse( | |||
| format!("{}", self.root.join(prefix.as_str()).display()).trim_start_matches('/'), | |||
| format!("{}", self.root.join(prefix.as_str()).display()) | |||
| .trim_start_matches(std::path::MAIN_SEPARATOR), | |||
There was a problem hiding this comment.
Using std::path::MAIN_SEPARATOR is a better solution as it handles slashes accordingly.
|
@Delta456 do you have windows machine / have you tested this ? |
Yes, I have tested this on my Windows machine.
|
nitisht
approved these changes
Feb 16, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #650
Description
Fixes #650.
UsesRelativePath::newfunction for platform independent relative paths.EDIT: Uses
std::path::MAIN_SEPARATORinstead of hardcore/which handles slashes accordingly.This PR has: