LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Export: protect originals imported through differently named symlinks
storybored3792c94b7fa1f4d
diff --git a/crates/engine/src/originals.rs b/crates/engine/src/originals.rsindex 59a5f6a20..d20d2fe8e 100644--- a/crates/engine/src/originals.rs+++ b/crates/engine/src/originals.rs@@ -58,6 +58,17 @@ impl OriginalGuard {}}}+ // An imported symlink can have a different name from its original. A write to+ // that original would change what the library reads through the link. Only do+ // this fallback for existing targets that the name index did not protect.+ for (p, what) in self.by_name.values().flatten() {+ if std::fs::read_link(p).is_ok() && same_file(p, target) {+ return Err(format!(+ "{} is {what} in the library: LightCraft never writes over an original (choose another folder or file name)",+ target.display()+ ));+ }+ }Ok(())}}diff --git a/crates/engine/src/tests_export.rs b/crates/engine/src/tests_export.rsindex dcd74cb4b..422601338 100644--- a/crates/engine/src/tests_export.rs+++ b/crates/engine/src/tests_export.rs@@ -323,3 +323,29 @@ fn a_failed_export_write_keeps_the_previous_file() {assert_ne!(std::fs::read(&prev).unwrap(), b"last week's export");let _ = std::fs::remove_dir_all(&dir);}++#[cfg(unix)]+#[test]+fn export_protects_the_target_of_an_imported_symlink() {+ use crate::export::{Conflict, Destination};+ let (original_session, _, dir, src, original) = library_with_jpeg("export-symlink-original");+ drop(original_session);+ let alias = dir.join("alias.jpg");+ std::os::unix::fs::symlink(&src, &alias).unwrap();+ let sidecar = dir.join("metadata.xmp");+ std::fs::write(&sidecar, b"<x/>").unwrap();+ std::os::unix::fs::symlink(&sidecar, alias.with_extension("xmp")).unwrap();+ let mut s = Session::new().with_fs();+ s.execute("library.import", &json!({"paths": [alias.to_string_lossy()]})).unwrap();+ let id = s.catalog.photos().next().unwrap().id;+ s.execute("develop.set", &json!({"ids": [id.0], "control": "light.exposure", "value": 1.0})).unwrap();+ let o = ExportOptions { conflict: Conflict::Overwrite, ..Default::default() };+ let to = Destination { dir: String::new(), exact: Some(src.to_string_lossy().to_string()) };+ let result = disk_batch(&mut s, id, &o, &to);+ assert!(result.is_err(), "export replaced the original through its imported alias: {result:?}");+ assert_eq!(std::fs::read(&src).unwrap(), original);+ assert!(s.execute("export.checkTarget", &json!({"path": src.to_string_lossy()})).is_err());+ assert!(s.execute("export.checkTarget", &json!({"path": sidecar.to_string_lossy()})).is_err());+ assert_eq!(std::fs::read(&sidecar).unwrap(), b"<x/>");+ let _ = std::fs::remove_dir_all(&dir);+}