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

perf: Fast handling for separator-free paths

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

38
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, MAIN_SEPARATOR, Path}; use std::path::{Component, Path, MAIN_SEPARATOR};
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,18 +217,17 @@ 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 mut recreate = MAIN_SEPARATOR != '/'; let mut maybe_original = None;
let original = if !recreate { if let Some(original) = path.as_ref().to_str() {
match path.as_ref().to_str() { if MAIN_SEPARATOR == '/' || !original[1..].contains(MAIN_SEPARATOR) {
Some(original) => Some(original), if original.starts_with(MAIN_SEPARATOR) {
None => { maybe_original = Some(&original[1..]);
recreate = true; } else {
None maybe_original = Some(original);
} }
} }
} else { }
None let mut recreate = maybe_original.is_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
@ -236,16 +235,13 @@ pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
for component in path.as_ref().components() { for component in path.as_ref().components() {
match component { match component {
Component::Normal(os_str) => { Component::Normal(os_str) => match os_str.to_str() {
match os_str.to_str() { Some(valid_str) => normalized_components.push(Cow::Borrowed(valid_str)),
Some(valid_str) => normalized_components.push(Cow::Borrowed(valid_str)), None => {
None => { recreate = true;
recreate = true; normalized_components.push(os_str.to_string_lossy());
normalized_components.push(os_str.to_string_lossy());
}
} }
},
}
Component::ParentDir => { Component::ParentDir => {
recreate = true; recreate = true;
if normalized_components.len() > 1 { if normalized_components.len() > 1 {
@ -261,7 +257,7 @@ pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
normalized_components.join("/") normalized_components.join("/")
} else { } else {
drop(normalized_components); drop(normalized_components);
let original = original.unwrap(); let original = maybe_original.unwrap();
if !original.starts_with('/') { if !original.starts_with('/') {
let mut slash_original = String::with_capacity(original.len() + 1); let mut slash_original = String::with_capacity(original.len() + 1);
slash_original.push('/'); slash_original.push('/');