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

quick by default

Browse source
This commit is contained in:
Nick Pegg 2025-05-07 20:51:54 -07:00
parent 5c1e1feb17
commit 396b434b39
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/generate.rs
View file

@ -119,7 +119,11 @@ struct SlideContext {
next_image: Option<Image>,
}
pub fn generate(root_path: &PathBuf, quick: bool) -> anyhow::Result<PathBuf> {
/// Generate an album
///
/// `root_path` is a path to the root directory of the album. `full` if true will regenerate
/// everything, including images that already exist.
pub fn generate(root_path: &PathBuf, full: bool) -> anyhow::Result<PathBuf> {
log::debug!("Generating album in {}", root_path.display());
let config = Config::from_album(root_path.to_path_buf())?;
let orig_path = env::current_dir()?;
@ -130,7 +134,7 @@ pub fn generate(root_path: &PathBuf, quick: bool) -> anyhow::Result<PathBuf> {
fs::create_dir_all(&config.output_dir)?;
copy_static(&config)?;
generate_images(&config, &album, quick)?;
generate_images(&config, &album, full)?;
generate_html(&config, &album)?;
env::set_current_dir(orig_path)?;
@ -150,7 +154,7 @@ fn copy_static(config: &Config) -> anyhow::Result<()> {
Ok(())
}
fn generate_images(config: &Config, album: &AlbumDir, quick: bool) -> anyhow::Result<()> {
fn generate_images(config: &Config, album: &AlbumDir, full: bool) -> anyhow::Result<()> {
let output_path = album.path.join(&config.output_dir);
// TODO: progress bar ?
let mut all_images: Vec<&Image> = album.iter_all_images().collect();
@ -159,12 +163,9 @@ fn generate_images(config: &Config, album: &AlbumDir, quick: bool) -> anyhow::Re
all_images.push(&album.cover);
all_images.par_iter().try_for_each(|img| {
// TODO: If orig_path is the same as the original image, and quick mode is on, skip to next
// image
//
// TODO: Hard-link if it's supported, to save on hard drive space
let full_size_path = output_path.join(&img.path);
if quick
if !full
&& full_size_path.exists()
&& fs::read(&full_size_path)? == fs::read(&full_size_path)?
{

9
src/main.rs
View file

@ -14,8 +14,8 @@ fn main() -> anyhow::Result<()> {
make_skeleton(album_path)?;
println!("Album created in {}", album_path.display());
}
Commands::Generate { quick } => {
let path = generate(&album_path.to_path_buf(), quick)?;
Commands::Generate { full } => {
let path = generate(&album_path.to_path_buf(), full)?;
println!("Album site generated in {}", path.display());
}
}
@ -40,9 +40,8 @@ enum Commands {
Init {},
/// Generates a photo album
Generate {
/// Don't re-generate things that already exist (thumbnails, etc.)
/// Regenerate everything, including images that have already been generated
#[arg(long)]
// TODO: Invert this to be a --full flag and default to quick?
quick: bool,
full: bool,
},
}