DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf: Speed up logic if main separator isn't '/'

Browse source
This commit is contained in:
Chris Hennick 2024-05-03 14:11:03 -07:00
parent 22e8fdbf58
commit 6184232e19
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/spec.rs
View file

@ -3,7 +3,7 @@ use crate::unstable::{LittleEndianReadExt, LittleEndianWriteExt};
use std::borrow::Cow; use std::borrow::Cow;
use std::io; use std::io;
use std::io::prelude::*; use std::io::prelude::*;
use std::path::{Component, Path}; use std::path::{Component, MAIN_SEPARATOR, Path};
pub const LOCAL_FILE_HEADER_SIGNATURE: u32 = 0x04034b50; pub const LOCAL_FILE_HEADER_SIGNATURE: u32 = 0x04034b50;
pub const CENTRAL_DIRECTORY_HEADER_SIGNATURE: u32 = 0x02014b50; pub const CENTRAL_DIRECTORY_HEADER_SIGNATURE: u32 = 0x02014b50;
@ -217,8 +217,18 @@ impl Zip64CentralDirectoryEnd {
/// Converts a path to the ZIP format (forward-slash-delimited and normalized). /// Converts a path to the ZIP format (forward-slash-delimited and normalized).
pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String { pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
let original = path.as_ref().to_str(); let mut recreate = MAIN_SEPARATOR != '/';
let mut recreate = original.is_none(); let original = if !recreate {
match path.as_ref().to_str() {
Some(original) => Some(original),
None => {
recreate = true;
None
}
}
} else {
None
};
let mut normalized_components = Vec::new(); let mut normalized_components = Vec::new();
// Empty element ensures the path has a leading slash, with no extra allocation after the join // Empty element ensures the path has a leading slash, with no extra allocation after the join