nick/photojawn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix warnings, fmt
Some checks failed
Rust / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Nick Pegg 2025-09-25 15:13:16 -07:00
parent 39d449889d
commit 35cb7949fd
3 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/generate/album_dir.rs
View file

@ -19,7 +19,7 @@ pub struct AlbumDir {
impl AlbumDir {
/// Returns an iterator over all images in the album and subalbums
pub fn iter_all_images(&self) -> AlbumImageIter {
pub fn iter_all_images(&self) -> AlbumImageIter<'_> {
AlbumImageIter::new(self)
}
@ -79,20 +79,20 @@ impl AlbumDir {
}
}
}
} else if entry_path.is_dir() {
if let Some(dirname) = entry_path.file_name().and_then(|n| n.to_str()) {
if dirname.starts_with("_") {
// Likely a templates or static dir
continue;
} else if dirname == "site" {
// Is a generated site dir, don't descend into it
continue;
} else if dirname == "slides" {
continue;
}
children.push(AlbumDir::from_path(&entry_path, root)?);
} else if entry_path.is_dir()
&& let Some(dirname) = entry_path.file_name().and_then(|n| n.to_str())
{
if dirname.starts_with("_") {
// Likely a templates or static dir
continue;
} else if dirname == "site" {
// Is a generated site dir, don't descend into it
continue;
} else if dirname == "slides" {
continue;
}
children.push(AlbumDir::from_path(&entry_path, root)?);
}
}