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

Don't clobber existing files when creating skeleton

Browse source
This commit is contained in:
Nick Pegg 2025-04-29 08:04:34 -07:00
parent 40af4997b0
commit 71659d2a91
1 changed files with 44 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/skel.rs
View file

@ -1,49 +1,56 @@
use std::collections::HashMap;
use std::fs; use std::fs;
use std::io; use std::io;
use std::path::Path; use std::path::{Path, PathBuf};
use thiserror::Error; use thiserror::Error;
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum InitError { pub enum InitError {
#[error("Album directory already initialized - contains a photojawn.conf.yml")] #[error("Album directory already initialized - contains a {0}")]
AlreadyInitialized, AlreadyInitialized(PathBuf),
#[error(transparent)] #[error(transparent)]
IoError(#[from] io::Error), IoError(#[from] io::Error),
} }
/// Creates a new album directory and creates basic versions
pub fn make_skeleton(album_path: &Path) -> Result<(), InitError> { pub fn make_skeleton(album_path: &Path) -> Result<(), InitError> {
let cfg_path = album_path.join("photojawn.conf.yml"); let files: HashMap<PathBuf, Vec<u8>> = HashMap::from([
if cfg_path.exists() { (
return Err(InitError::AlreadyInitialized); album_path.join("photojawn.conf.yml"),
Vec::from(include_bytes!("../resources/skel/photojawn.conf.yml")),
),
(
album_path.join("static/index.css"),
Vec::from(include_bytes!("../resources/skel/static/index.css")),
),
(
album_path.join("_templates/base.html"),
Vec::from(include_bytes!("../resources/skel/_templates/base.html")),
),
(
album_path.join("_templates/album.html"),
Vec::from(include_bytes!("../resources/skel/_templates/album.html")),
),
(
album_path.join("_templates/photo.html"),
Vec::from(include_bytes!("../resources/skel/_templates/photo.html")),
),
]);
// Bail if any of the files we would create exist
for path in files.keys() {
if path.exists() {
return Err(InitError::AlreadyInitialized(path.to_path_buf()));
}
} }
fs::create_dir_all(album_path)?; fs::create_dir_all(album_path)?;
fs::write( for (path, contents) in files.iter() {
cfg_path, if let Some(parent) = path.parent() {
include_bytes!("../resources/skel/photojawn.conf.yml"), fs::create_dir_all(parent)?;
)?; }
fs::write(path, contents)?;
let static_path = album_path.join("static"); }
fs::create_dir_all(&static_path)?;
fs::write(
static_path.join("index.css"),
include_bytes!("../resources/skel/static/index.css"),
)?;
let tmpl_path = album_path.join("_templates");
fs::create_dir_all(&tmpl_path)?;
fs::write(
tmpl_path.join("base.html"),
include_bytes!("../resources/skel/_templates/base.html"),
)?;
fs::write(
tmpl_path.join("album.html"),
include_bytes!("../resources/skel/_templates/album.html"),
)?;
fs::write(
tmpl_path.join("photo.html"),
include_bytes!("../resources/skel/_templates/photo.html"),
)?;
Ok(()) Ok(())
} }
@ -75,9 +82,12 @@ mod tests {
let tmpdir = Temp::new_dir().unwrap(); let tmpdir = Temp::new_dir().unwrap();
fs::create_dir(tmpdir.join("_templates")).unwrap(); fs::create_dir(tmpdir.join("_templates")).unwrap();
fs::write(tmpdir.join("_templates/base.html"), "some template").unwrap(); fs::write(tmpdir.join("_templates/base.html"), "some template").unwrap();
make_skeleton(&tmpdir).unwrap(); let res = make_skeleton(&tmpdir);
let err = InitError::AlreadyInitialized(tmpdir.join("_templates/base.html"));
assert!(res.is_err());
// Make sure it didn't clobber our template
let contents = fs::read(tmpdir.join("_templates/base.html")).unwrap(); let contents = fs::read(tmpdir.join("_templates/base.html")).unwrap();
assert_ne!(contents, "some template".as_bytes()); assert_eq!(contents, "some template".as_bytes());
} }
} }