forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove more usages of PathBuf

Browse Source
This commit is contained in:
lielfr 2025-05-09 03:25:46 +03:00
parent 3d0309771d
commit 4ef08b7df0
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/bevy_asset/src/path.rs
View File

@ -155,6 +155,27 @@ impl<'a> AssetPath<'a> {
}) })
} }
/// Normalizes a string-based path by collapsing all occurrences of '.' and '..' dot-segments where possible
/// as per [RFC 1808](https://datatracker.ietf.org/doc/html/rfc1808)
fn normalize_path<'b>(path: &'b [&'b str]) -> Vec<&'b str> {
let mut result_path = Vec::new();
for &elt in path {
if elt == "." {
// Skip
} else if elt == ".." {
if result_path.is_empty() {
// Preserve ".." if insufficient matches (per RFC 1808).
result_path.push(elt);
} else {
result_path.pop();
}
} else {
result_path.push(elt);
}
}
result_path
}
// Attempts to Parse a &str into an `AssetPath`'s `AssetPath::source`, `AssetPath::path`, and `AssetPath::label` components. // Attempts to Parse a &str into an `AssetPath`'s `AssetPath::source`, `AssetPath::path`, and `AssetPath::label` components.
fn parse_internal( fn parse_internal(
asset_path: &str, asset_path: &str,
@ -454,7 +475,7 @@ impl<'a> AssetPath<'a> {
Ok(self.clone_owned().with_label(label.to_owned())) Ok(self.clone_owned().with_label(label.to_owned()))
} else { } else {
let (source, rpath, rlabel) = AssetPath::parse_internal(path)?; let (source, rpath, rlabel) = AssetPath::parse_internal(path)?;
let mut base_path = PathBuf::from(self.path()); let mut base_path: Vec<_> = self.path_components().filter(|s| !s.is_empty()).collect();
if replace && !self.path.ends_with('/') { if replace && !self.path.ends_with('/') {
// No error if base is empty (per RFC 1808). // No error if base is empty (per RFC 1808).
base_path.pop(); base_path.pop();
@ -473,17 +494,17 @@ impl<'a> AssetPath<'a> {
let mut result_path = if !is_absolute && source.is_none() { let mut result_path = if !is_absolute && source.is_none() {
base_path base_path
} else { } else {
PathBuf::new() Vec::new()
}; };
result_path.push(rpath); result_path.extend(rpath.split("/").filter(|s| !s.is_empty()));
result_path = normalize_path(result_path.as_path()); let result_path = Self::normalize_path(&result_path).join("/");
Ok(AssetPath { Ok(AssetPath {
source: match source { source: match source {
Some(source) => AssetSourceId::Name(CowArc::Owned(source.into())), Some(source) => AssetSourceId::Name(CowArc::Owned(source.into())),
None => self.source.clone_owned(), None => self.source.clone_owned(),
}, },
path: CowArc::new_owned_from_arc(result_path.to_string_lossy()), path: CowArc::new_owned_from_arc(result_path),
label: rlabel.map(|l| CowArc::Owned(l.into())), label: rlabel.map(|l| CowArc::Owned(l.into())),
}) })
} }
@ -720,8 +741,6 @@ pub(crate) fn normalize_path(path: &Path) -> PathBuf {
mod tests { mod tests {
use crate::AssetPath; use crate::AssetPath;
use alloc::string::ToString; use alloc::string::ToString;
use std::path::Path;
#[test] #[test]
fn parse_asset_path() { fn parse_asset_path() {
let result = AssetPath::parse_internal("a/b.test"); let result = AssetPath::parse_internal("a/b.test");