-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(rust): Make parse_url work on windows with object_store #15191
Merged
ritchie46
merged 7 commits into
pola-rs:main
from
mickvangelderen:make-parse-url-work-on-windows-with-object-store
Mar 21, 2024
Merged
fix(rust): Make parse_url work on windows with object_store #15191
ritchie46
merged 7 commits into
pola-rs:main
from
mickvangelderen:make-parse-url-work-on-windows-with-object-store
Mar 21, 2024
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
mickvangelderen
requested review from
ritchie46,
stinodego,
c-peters,
alexander-beedie,
MarcoGorelli and
orlp
as code owners
March 20, 2024 15:14
This works on windows, need to see what happens on non windows. fn parse_path(input: &str) -> Result<Url, url::ParseError> {
match input.split_once("://") {
Some(("file", path)) => Url::options()
.base_url(
Path::new(path)
.is_relative()
.then(|| Url::from_file_path(std::env::current_dir().unwrap()).unwrap())
.as_ref(),
)
.parse(path),
Some((_, _)) => Url::parse(input),
None => {
let path = Path::new(input);
let mut tmp;
Ok(Url::from_file_path(if path.is_relative() {
tmp = std::env::current_dir().unwrap();
tmp.push(path);
tmp.as_path()
} else {
path
})
.unwrap())
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_parse_path() {
assert_eq!(
parse_path(r"http://Users/Jane Doe/data.csv")
.unwrap()
.as_str(),
"http://users/Jane%20Doe/data.csv"
);
assert_eq!(
parse_path(r"http://Users/Jane Doe/data.csv")
.unwrap()
.as_str(),
"http://users/Jane%20Doe/data.csv"
);
assert_eq!(
parse_path(r"file:///c:/Users/Jane Doe/data.csv")
.unwrap()
.as_str(),
"file:///c:/Users/Jane%20Doe/data.csv"
);
assert_eq!(
parse_path(r"file://\c:\Users\Jane Doe\data.csv")
.unwrap()
.as_str(),
"file:///c:/Users/Jane%20Doe/data.csv"
);
assert_eq!(
parse_path(r"c:\Users\Jane Doe\data.csv").unwrap().as_str(),
"file:///C:/Users/Jane%20Doe/data.csv"
);
assert_eq!(
parse_path(r"\Users\Jane Doe\data.csv").unwrap().as_str(),
Url::from_file_path(std::env::current_dir().unwrap())
.unwrap()
.join("/Users/Jane%20Doe/data.csv")
.unwrap()
.as_str()
);
}
} |
ritchie46
approved these changes
Mar 21, 2024
mickvangelderen
deleted the
make-parse-url-work-on-windows-with-object-store
branch
March 21, 2024 12:14
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.
No description provided.