Skip to content

fix: absolute url for windows #655

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.

Sign up for GitHub

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

Merged
nitisht merged 5 commits into from
Feb 16, 2024
Merged

fix: absolute url for windows #655

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dc5e51
fix: absolute url for windows
Delta456 Feb 7, 2024
fde8a8e
fmt
Delta456 Feb 7, 2024
5600b16
Merge branch 'main' into fix_abs_url
Delta456 Feb 7, 2024
c0bd43a
use `std::path::MAIN_SEPARATOR` instead
Delta456 Feb 7, 2024
e5ccdcb
use `fmt
Delta456 Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/storage/localfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ 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('/'),
object_store::path::Path::parse(format!("{}", self.root.join(prefix.as_str()).display()).trim_start_matches(std::path::MAIN_SEPARATOR),
Copy link
Contributor Author

@Delta456 Delta456 Feb 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rechecked and std::path::MAIN_SEPARATOR seems like a better solution here.

)
.unwrap()
}
Expand Down