Skip to content

fix: windows build issues #169

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
merged 2 commits into from
Aug 1, 2022
Merged

fix: windows build issues #169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93abfe4
feat: bytes from component function
Aug 1, 2022
dc1cb91
fix: drop support for non utf-8 strings
Aug 1, 2022
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
37 changes: 3 additions & 34 deletions src/utils/url_encode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
use percent_encoding::{
percent_decode, percent_encode, utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC,
};
use percent_encoding::{percent_decode, utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
use std::path::{Path, PathBuf};

#[cfg(unix)]
use std::os::unix::ffi::OsStrExt;

#[cfg(windows)]
use std::os::windows::ffi::OsStrExt;

pub const PERCENT_ENCODE_SET: &AsciiSet = &NON_ALPHANUMERIC
.remove(b'-')
.remove(b'_')
Expand All @@ -21,31 +13,8 @@ pub fn encode_uri(file_path: &Path) -> String {
file_path
.iter()
.flat_map(|component| {
let segment = match component.to_str() {
Some(component) => utf8_percent_encode(component, PERCENT_ENCODE_SET),
None => {
let bytes = {
#[cfg(windows)]
{
let mut bytes = Vec::with_capacity(component.len() * 2);

for wc in component.encode_wide() {
let wc = wc.to_be_bytes();

bytes.push(wc[0]);
bytes.push(wc[1]);
}

&bytes
}

#[cfg(not(windows))]
component.as_bytes()
};

percent_encode(bytes, PERCENT_ENCODE_SET)
}
};
let component = component.to_str().unwrap();
let segment = utf8_percent_encode(component, PERCENT_ENCODE_SET);

std::iter::once("/").chain(segment)
})
Expand Down