Make sure to only search for whole path components

Author: ArthurBrussee

crates/brush-dataset/src/formats/colmap.rs

@@ -22,6 +22,11 @@ use std::collections::HashMap;
 fn find_mask_and_img(vfs: &BrushVfs, name: &str) -> Option<(PathBuf, Option<PathBuf>)> {
     // Colmap only specifies an image name, not a full path. We brute force
     // search for the image in the archive.
+    //
+    // Make sure this path doesn't start with a '/' as the files_ending_in expects
+    // things in that format (like a "filename with slashes").
+    let name = name.strip_prefix('/').unwrap_or(name);
+
     let paths: Vec<_> = vfs.files_ending_in(name).collect();
 
     let mut path_masks = HashMap::new();

crates/brush-vfs/src/lib.rs

@@ -54,12 +54,18 @@ struct PathKey(String);
 
 impl PathKey {
     fn from_path(path: &Path) -> Self {
-        Self(
-            path.clean()
-                .to_str()
-                .expect("Path is not valid ascii")
-                .to_lowercase(),
-        )
+        let key = path
+            .clean()
+            .to_str()
+            .expect("Path is not valid ascii")
+            .to_lowercase()
+            .replace('\\', "/");
+        let key = if key.starts_with('/') {
+            key
+        } else {
+            '/'.to_string() + &key
+        };
+        Self(key)
     }
 }
 
@@ -250,11 +256,12 @@ impl BrushVfs {
     }
 
     pub fn files_ending_in<'a>(&'a self, end_path: &'a str) -> impl Iterator<Item = PathBuf> + 'a {
-        let end_path = end_path.to_lowercase().replace('\\', "/");
-        self.lookup.values().filter_map(move |path| {
-            let full_path = path.to_str()?.to_lowercase().replace('\\', "/");
-            full_path.ends_with(&end_path).then(|| path.clone())
-        })
+        let end_keyed = PathKey::from_path(Path::new(end_path)).0;
+
+        self.lookup
+            .iter()
+            .filter(move |kv| kv.0.0.ends_with(&end_keyed))
+            .map(|kv| kv.1.clone())
     }
 
     pub fn files_with_stem<'a>(&'a self, filestem: &'a str) -> impl Iterator<Item = PathBuf> + 'a {