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

fix relative path stuff

Browse source
This commit is contained in:
Nick Pegg 2025-05-05 18:26:21 -07:00
parent 5d5c988ba4
commit f1c007845a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/generate/album_dir.rs
View file

@ -1,11 +1,12 @@
use anyhow::anyhow; use anyhow::anyhow;
use image::ImageReader; use image::ImageReader;
use serde::Serialize;
use std::fs; use std::fs;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::slice::Iter; use std::slice::Iter;
/// An album directory, which has images and possibly child albums /// An album directory, which has images and possibly child albums
#[derive(Clone)] #[derive(Clone, Serialize)]
pub struct AlbumDir { pub struct AlbumDir {
pub path: PathBuf, pub path: PathBuf,
pub images: Vec<Image>, pub images: Vec<Image>,
@ -30,8 +31,7 @@ impl AlbumDir {
let mut description = String::new(); let mut description = String::new();
for entry in p.read_dir()? { for entry in p.read_dir()? {
// use strip_prefix() to make the path relative to the root directory let entry_path = entry?.path().to_path_buf();
let entry_path = entry?.path().strip_prefix(root)?.to_path_buf();
if entry_path.is_file() { if entry_path.is_file() {
if let Some(filename) = entry_path.file_name() { if let Some(filename) = entry_path.file_name() {
@ -57,7 +57,7 @@ impl AlbumDir {
} }
images.push(Image { images.push(Image {
path: entry_path, path: entry_path.strip_prefix(&root)?.to_path_buf(),
description, description,
}); });
} }
@ -73,7 +73,7 @@ impl AlbumDir {
continue; continue;
} }
children.push(AlbumDir::try_from(&entry_path)?); children.push(AlbumDir::from_path(&entry_path, &root)?);
} }
} }
} }
@ -134,7 +134,7 @@ impl<'a> Iterator for AlbumIter<'a> {
} }
} }
#[derive(Clone, Hash, PartialEq, Eq)] #[derive(Clone, Hash, PartialEq, Eq, Serialize)]
pub struct Image { pub struct Image {
/// Path to the image, relative to the root album /// Path to the image, relative to the root album
pub path: PathBuf, pub path: PathBuf,
@ -155,7 +155,6 @@ impl Image {
/// Returns the path to the file in the slides dir with the given extention insert, e.g. /// Returns the path to the file in the slides dir with the given extention insert, e.g.
/// "thumb" or "display" /// "thumb" or "display"
fn slide_path(&self, ext: &str) -> anyhow::Result<PathBuf> { fn slide_path(&self, ext: &str) -> anyhow::Result<PathBuf> {
// TODO: Return path relative to the output dir?
let new_ext = match self.path.extension() { let new_ext = match self.path.extension() {
Some(e) => { Some(e) => {
ext.to_string() ext.to_string()