reivilibre/mirror-zola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make asset colocation find assets which have no extension (as opposed to ignoring them) (#1734)

Browse Source
This commit is contained in:
Teddy Heinen 2022-01-13 14:44:04 -07:00 committed by Vincent Prouillet
parent 37b31cb61f
commit ef3a16f3a8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/library/src/content/mod.rs
View File

@ -48,7 +48,7 @@ pub fn find_related_assets(path: &Path, config: &Config, recursive: bool) -> Vec
Some("md") => continue, Some("md") => continue,
_ => assets.push(entry_path.to_path_buf()), _ => assets.push(entry_path.to_path_buf()),
}, },
None => continue, None => assets.push(entry_path.to_path_buf()),
} }
} }
} }
@ -82,15 +82,16 @@ mod tests {
File::create(path.join("example.js")).unwrap(); File::create(path.join("example.js")).unwrap();
File::create(path.join("graph.jpg")).unwrap(); File::create(path.join("graph.jpg")).unwrap();
File::create(path.join("fail.png")).unwrap(); File::create(path.join("fail.png")).unwrap();
File::create(path.join("extensionless")).unwrap();
create_dir(path.join("subdir")).expect("create subdir temp dir"); create_dir(path.join("subdir")).expect("create subdir temp dir");
File::create(path.join("subdir").join("index.md")).unwrap(); File::create(path.join("subdir").join("index.md")).unwrap();
File::create(path.join("subdir").join("example.js")).unwrap(); File::create(path.join("subdir").join("example.js")).unwrap();
let assets = find_related_assets(path, &Config::default(), true); let assets = find_related_assets(path, &Config::default(), true);
assert_eq!(assets.len(), 4); assert_eq!(assets.len(), 5);
assert_eq!(assets.iter().filter(|p| p.extension().unwrap() != "md").count(), 4); assert_eq!(assets.iter().filter(|p| p.extension().unwrap_or("".as_ref()) != "md").count(), 5);
for asset in vec!["example.js", "graph.jpg", "fail.png", "subdir/example.js"] { for asset in vec!["example.js", "graph.jpg", "fail.png", "subdir/example.js", "extensionless"] {
assert!(assets assert!(assets
.iter() .iter()
.find(|p| p.strip_prefix(path).unwrap() == Path::new(asset)) .find(|p| p.strip_prefix(path).unwrap() == Path::new(asset))
@ -106,15 +107,15 @@ mod tests {
File::create(path.join("example.js")).unwrap(); File::create(path.join("example.js")).unwrap();
File::create(path.join("graph.jpg")).unwrap(); File::create(path.join("graph.jpg")).unwrap();
File::create(path.join("fail.png")).unwrap(); File::create(path.join("fail.png")).unwrap();
File::create(path.join("extensionless")).unwrap();
create_dir(path.join("subdir")).expect("create subdir temp dir"); create_dir(path.join("subdir")).expect("create subdir temp dir");
File::create(path.join("subdir").join("index.md")).unwrap(); File::create(path.join("subdir").join("index.md")).unwrap();
File::create(path.join("subdir").join("example.js")).unwrap(); File::create(path.join("subdir").join("example.js")).unwrap();
let assets = find_related_assets(path, &Config::default(), false); let assets = find_related_assets(path, &Config::default(), false);
assert_eq!(assets.len(), 3); assert_eq!(assets.len(), 4);
assert_eq!(assets.iter().filter(|p| p.extension().unwrap() != "md").count(), 3); assert_eq!(assets.iter().filter(|p| p.extension().unwrap_or("".as_ref()) != "md").count(), 4);
for asset in vec!["example.js", "graph.jpg", "fail.png"] { for asset in vec!["example.js", "graph.jpg", "fail.png", "extensionless"] {
assert!(assets assert!(assets
.iter() .iter()
.find(|p| p.strip_prefix(path).unwrap() == Path::new(asset)) .find(|p| p.strip_prefix(path).unwrap() == Path::new(asset))