diff --git a/crates/psd/src/resources.rs b/crates/psd/src/resources.rs index 75b52b199..d0ac3e83f 100644 --- a/crates/psd/src/resources.rs +++ b/crates/psd/src/resources.rs @@ -369,6 +369,22 @@ fn layer_selection_ids(data: &[u8]) -> Result> { (0..count).map(|_| r.u32()).collect() } +/// Read the unique EXIF and XMP image resources, rejecting duplicates and invalid XMP UTF-8. +/// EXIF bytes retain any optional container prefix; trailing XMP NULs are removed. +pub fn unique_exif_xmp(resources: &[ImageResource]) -> Option<(Option<&[u8]>, Option<&str>)> { + let (mut exif, mut xmp) = (None, None); + for resource in resources { + match resource.id { + ids::EXIF if exif.is_some() => return None, + ids::EXIF => exif = Some(resource.data.as_slice()), + ids::XMP if xmp.is_some() => return None, + ids::XMP => xmp = Some(std::str::from_utf8(&resource.data).ok()?.trim_end_matches('\0')), + _ => {} + } + } + Some((exif, xmp)) +} + impl ImageResource { /// A new `8BIM` resource with an empty name. pub fn new(id: u16, data: Vec) -> Self { diff --git a/crates/psd/tests/metadata_resources.rs b/crates/psd/tests/metadata_resources.rs new file mode 100644 index 000000000..28df6e93c --- /dev/null +++ b/crates/psd/tests/metadata_resources.rs @@ -0,0 +1,14 @@ +use craft_psd::ImageResource; +use craft_psd::resources::{ids, unique_exif_xmp}; + +#[test] +fn metadata_resources_reject_duplicates_and_invalid_xmp() { + let exif = ImageResource::new(ids::EXIF, b"Exif\0\0II*\0".to_vec()); + let xmp = ImageResource::new(ids::XMP, b"\0".to_vec()); + let resources = [exif.clone(), xmp.clone()]; + assert_eq!(unique_exif_xmp(&resources), Some((Some(b"Exif\0\0II*\0".as_slice()), Some("")))); + assert!(unique_exif_xmp(&[exif.clone(), exif]).is_none()); + assert!(unique_exif_xmp(&[xmp.clone(), xmp]).is_none()); + assert!(unique_exif_xmp(&[ImageResource::new(ids::XMP, vec![255])]).is_none()); + assert_eq!(unique_exif_xmp(&[]), Some((None, None))); +}