diff --git a/src/date_resolver.rs b/src/date_resolver.rs index 8498cb8..f8b156c 100644 --- a/src/date_resolver.rs +++ b/src/date_resolver.rs @@ -230,12 +230,21 @@ fn exiftool_available() -> bool { /// One-file exiftool invocation. Used by the upload + GPS-write paths, /// which deal with one file at a time. The batch path uses /// `exiftool_dates_batch` so we don't pay subprocess startup per row. +/// +/// Notably absent: `-fast` / `-fast2`. For QuickTime/MP4 files whose +/// `moov` atom sits at the end (non-faststart, common for Snapchat +/// exports and any MP4 muxed without `-movflags +faststart`), `-fast2` +/// causes exiftool to skip the trailer and return no `CreateDate` / +/// `MediaCreateDate`, dropping us to the `fs_time` fallback for files +/// that actually have a real capture date. We pre-filter to files that +/// kamadak-exif couldn't read, so the JPEG fast-path is already covered +/// — paying full-scan cost on the residual is the right trade. fn exiftool_date_single(path: &Path) -> Option { if !exiftool_available() { return None; } let mut cmd = Command::new("exiftool"); - cmd.arg("-j").arg("-q").arg("-d").arg("%s").arg("-fast2"); + cmd.arg("-j").arg("-q").arg("-d").arg("%s"); for tag in EXIFTOOL_DATE_TAGS { cmd.arg(format!("-{}", tag)); } @@ -261,7 +270,10 @@ fn exiftool_dates_batch(paths: &[&Path]) -> HashMap { } let mut cmd = Command::new("exiftool"); - cmd.arg("-j").arg("-q").arg("-d").arg("%s").arg("-fast2"); + // No `-fast2` — see exiftool_date_single for the rationale (QuickTime + // moov-at-end files miss CreateDate / MediaCreateDate when the trailer + // is skipped). + cmd.arg("-j").arg("-q").arg("-d").arg("%s"); for tag in EXIFTOOL_DATE_TAGS { cmd.arg(format!("-{}", tag)); }